From c862dab1551859d32385309de4b1cffcd17a3309 Mon Sep 17 00:00:00 2001
From: unknown <brian@zim.(none)>
Date: Fri, 15 Jun 2007 17:22:57 -0700
Subject: [PATCH 001/139] Added a test for pre-statement call, and fixed
 connection/deconnect code so that the rest of bbench can be ran by others.

client/client_priv.h:
  Clean up of options.
client/mysqlslap.c:
  Cleanup of the connection and reconnect code.
mysql-test/r/mysqlslap.result:
  Add of new test.
mysql-test/t/mysqlslap.test:
  Additional test.
---
 client/client_priv.h          |   4 ++
 client/mysqlslap.c            | 109 +++++++++++++++++++++++++++-------
 mysql-test/r/mysqlslap.result |  44 ++++++++++++++
 mysql-test/t/mysqlslap.test   |   2 +
 4 files changed, 136 insertions(+), 23 deletions(-)

diff --git a/client/client_priv.h b/client/client_priv.h
index 25241cc8c59..8bc8ef692de 100644
--- a/client/client_priv.h
+++ b/client/client_priv.h
@@ -73,6 +73,10 @@ enum options_client
   OPT_SLAP_AUTO_GENERATE_UNIQUE_QUERY_NUM,
   OPT_SLAP_PRE_QUERY,
   OPT_SLAP_POST_QUERY,
+  OPT_SLAP_PRE_SYSTEM,
+  OPT_SLAP_POST_SYSTEM,
+  OPT_SLAP_COMMIT,
+  OPT_SLAP_DETACH,
   OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,
   OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
   OPT_DEBUG_INFO, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE, OPT_WRITE_BINLOG,
diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index 546b9dee3f5..aa15141bfdc 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -81,6 +81,7 @@ TODO:
 #define UPDATE_TYPE_REQUIRES_PREFIX 3
 #define CREATE_TABLE_TYPE 4
 #define SELECT_TYPE_REQUIRES_PREFIX 5
+#define DELETE_TYPE_REQUIRES_PREFIX 6
 
 #include "client_priv.h"
 #include <mysqld_error.h>
@@ -122,6 +123,8 @@ static char *host= NULL, *opt_password= NULL, *user= NULL,
             *user_supplied_pre_statements= NULL,
             *user_supplied_post_statements= NULL,
             *default_engine= NULL,
+            *pre_system= NULL,
+            *post_system= NULL,
             *opt_mysql_unix_port= NULL;
 
 const char *delimiter= "\n";
@@ -142,6 +145,8 @@ const char *auto_generate_sql_type= "mixed";
 static unsigned long connect_flags= CLIENT_MULTI_RESULTS;
 
 static int verbose, delimiter_length;
+static uint commit_rate;
+static uint detach_rate;
 const char *num_int_cols_opt;
 const char *num_char_cols_opt;
 /* Yes, we do set defaults here */
@@ -254,6 +259,8 @@ void statement_cleanup(statement *stmt);
 void option_cleanup(option_string *stmt);
 void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr);
 static int run_statements(MYSQL *mysql, statement *stmt);
+int slap_connect(MYSQL *mysql);
+static int run_query(MYSQL *mysql, const char *query, int len);
 
 static const char ALPHANUMERICS[]=
   "0123456789ABCDEFGHIJKLMNOPQRSTWXYZabcdefghijklmnopqrstuvwxyz";
@@ -451,6 +458,16 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr)
     if (auto_generate_sql_autoincrement || auto_generate_sql_guid_primary)
       generate_primary_key_list(mysql, eptr);
 
+    if (commit_rate)
+      run_query(mysql, "SET AUTOCOMMIT=0", strlen("SET AUTOCOMMIT=0"));
+
+    if (pre_system)
+      system(pre_system);
+
+    /* 
+      Pre statements are always run after all other logic so they can 
+      correct/adjust any item that they want. 
+    */
     if (pre_statements)
       run_statements(mysql, pre_statements);
 
@@ -459,6 +476,9 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr)
     if (post_statements)
       run_statements(mysql, post_statements);
 
+    if (post_system)
+      system(post_system);
+
     /* We are finished with this run */
     if (auto_generate_sql_autoincrement || auto_generate_sql_guid_primary)
       drop_primary_key_list();
@@ -527,6 +547,9 @@ static struct my_option my_long_options[] =
     "Number of rows to insert to used in read and write loads (default is 100).\n",
     (uchar**) &auto_generate_sql_number, (uchar**) &auto_generate_sql_number,
     0, GET_ULL, REQUIRED_ARG, 100, 0, 0, 0, 0, 0},
+  {"commit", OPT_SLAP_COMMIT, "Commit records after X number of statements.",
+    (uchar**) &commit_rate, (uchar**) &commit_rate, 0, GET_UINT, REQUIRED_ARG,
+    0, 0, 0, 0, 0, 0},
   {"compress", 'C', "Use compression in server/client protocol.",
     (uchar**) &opt_compress, (uchar**) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
     0, 0, 0},
@@ -550,6 +573,9 @@ static struct my_option my_long_options[] =
     "Delimiter to use in SQL statements supplied in file or command line.",
     (uchar**) &delimiter, (uchar**) &delimiter, 0, GET_STR, REQUIRED_ARG,
     0, 0, 0, 0, 0, 0},
+  {"detach", OPT_SLAP_DETACH, "Detach connections after X number of requests.",
+    (uchar**) &detach_rate, (uchar**) &detach_rate, 0, GET_UINT, REQUIRED_ARG, 
+    0, 0, 0, 0, 0, 0},
   {"engine", 'e', "Storage engine to use for creating the table.",
     (uchar**) &default_engine, (uchar**) &default_engine, 0,
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -589,11 +615,21 @@ static struct my_option my_long_options[] =
     (uchar**) &user_supplied_post_statements, 
     (uchar**) &user_supplied_post_statements,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"post-system", OPT_SLAP_POST_SYSTEM,
+    "System() string to run after the load has completed.",
+    (uchar**) &post_system, 
+    (uchar**) &post_system,
+    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"pre-query", OPT_SLAP_PRE_QUERY, 
     "Query to run or file containing query to run before executing.",
     (uchar**) &user_supplied_pre_statements, 
     (uchar**) &user_supplied_pre_statements,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"pre-system", OPT_SLAP_PRE_SYSTEM, 
+    "System() string to before load has completed.",
+    (uchar**) &pre_system, 
+    (uchar**) &pre_system,
+    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"preserve-schema", OPT_MYSQL_PRESERVE_SCHEMA,
     "Preserve the schema from the mysqlslap run, this happens unless "
       "--auto-generate-sql or --create are used.",
@@ -1715,6 +1751,7 @@ run_scheduler(stats *sptr, statement *stmts, uint concur, ulonglong limit)
 pthread_handler_t run_task(void *p)
 {
   ulonglong counter= 0, queries;
+  ulonglong trans_counter;
   MYSQL *mysql;
   MYSQL_RES *result;
   MYSQL_ROW row;
@@ -1749,38 +1786,28 @@ pthread_handler_t run_task(void *p)
 
   if (!opt_only_print)
   {
-    /* Connect to server */
-    static ulong connection_retry_sleep= 100000; /* Microseconds */
-    int i, connect_error= 1;
-    for (i= 0; i < 10; i++)
-    {
-      if (mysql_real_connect(mysql, host, user, opt_password,
-                             create_schema_string,
-                             opt_mysql_port,
-                             opt_mysql_unix_port,
-                             connect_flags))
-      {
-        /* Connect suceeded */
-        connect_error= 0;
-        break;
-      }
-      my_sleep(connection_retry_sleep);
-    }
-    if (connect_error)
-    {
-      fprintf(stderr,"%s: Error when connecting to server: %d %s\n",
-              my_progname, mysql_errno(mysql), mysql_error(mysql));
+    if (slap_connect(mysql))
       goto end;
-    }
   }
+
   DBUG_PRINT("info", ("connected."));
   if (verbose >= 3)
     printf("connected!\n");
   queries= 0;
 
 limit_not_met:
-    for (ptr= con->stmt; ptr && ptr->length; ptr= ptr->next)
+    for (ptr= con->stmt, trans_counter= 0; 
+         ptr && ptr->length; 
+         ptr= ptr->next, trans_counter++)
     {
+      if (!opt_only_print && detach_rate && !(trans_counter % detach_rate))
+      {
+        mysql_close(mysql);
+
+        if (slap_connect(mysql))
+          goto end;
+      }
+
       /* 
         We have to execute differently based on query type. This should become a function.
       */
@@ -1837,6 +1864,9 @@ limit_not_met:
       }
       queries++;
 
+      if (commit_rate && commit_rate <= trans_counter)
+        run_query(mysql, "COMMIT", strlen("COMMIT"));
+
       if (con->limit && queries == con->limit)
         goto end;
     }
@@ -1845,6 +1875,8 @@ limit_not_met:
       goto limit_not_met;
 
 end:
+  if (commit_rate)
+    run_query(mysql, "COMMIT", strlen("COMMIT"));
 
   if (!opt_only_print) 
     mysql_close(mysql);
@@ -2104,3 +2136,34 @@ statement_cleanup(statement *stmt)
     my_free(ptr, MYF(0));
   }
 }
+
+
+int 
+slap_connect(MYSQL *mysql)
+{
+  /* Connect to server */
+  static ulong connection_retry_sleep= 100000; /* Microseconds */
+  int x, connect_error= 1;
+  for (x= 0; x < 10; x++)
+  {
+    if (mysql_real_connect(mysql, host, user, opt_password,
+                           create_schema_string,
+                           opt_mysql_port,
+                           opt_mysql_unix_port,
+                           connect_flags))
+    {
+      /* Connect suceeded */
+      connect_error= 0;
+      break;
+    }
+    my_sleep(connection_retry_sleep);
+  }
+  if (connect_error)
+  {
+    fprintf(stderr,"%s: Error when connecting to server: %d %s\n",
+            my_progname, mysql_errno(mysql), mysql_error(mysql));
+    return 1;
+  }
+
+  return 0;
+}
diff --git a/mysql-test/r/mysqlslap.result b/mysql-test/r/mysqlslap.result
index bca7919d78c..cc8bc3dac31 100644
--- a/mysql-test/r/mysqlslap.result
+++ b/mysql-test/r/mysqlslap.result
@@ -167,3 +167,47 @@ SHOW TABLES;
 select * from t1;
 SHOW TABLES;
 DROP SCHEMA IF EXISTS `mysqlslap`;
+DROP SCHEMA IF EXISTS `mysqlslap`;
+CREATE SCHEMA `mysqlslap`;
+use mysqlslap;
+set storage_engine=`heap`;
+CREATE TABLE t1 (id int, name varchar(64));
+create table t2(foo1 varchar(32), foo2 varchar(32));
+INSERT INTO t1 VALUES (1, 'This is a test');
+insert into t2 values ('test', 'test2');
+SET AUTOCOMMIT=0;
+SHOW TABLES;
+select * from t1;
+select * from t2;
+COMMIT;
+select * from t1;
+select * from t2;
+COMMIT;
+select * from t1;
+select * from t2;
+COMMIT;
+COMMIT;
+SHOW TABLES;
+DROP SCHEMA IF EXISTS `mysqlslap`;
+DROP SCHEMA IF EXISTS `mysqlslap`;
+CREATE SCHEMA `mysqlslap`;
+use mysqlslap;
+set storage_engine=`myisam`;
+CREATE TABLE t1 (id int, name varchar(64));
+create table t2(foo1 varchar(32), foo2 varchar(32));
+INSERT INTO t1 VALUES (1, 'This is a test');
+insert into t2 values ('test', 'test2');
+SET AUTOCOMMIT=0;
+SHOW TABLES;
+select * from t1;
+select * from t2;
+COMMIT;
+select * from t1;
+select * from t2;
+COMMIT;
+select * from t1;
+select * from t2;
+COMMIT;
+COMMIT;
+SHOW TABLES;
+DROP SCHEMA IF EXISTS `mysqlslap`;
diff --git a/mysql-test/t/mysqlslap.test b/mysql-test/t/mysqlslap.test
index 2a7bbfed932..192aefb0e03 100644
--- a/mysql-test/t/mysqlslap.test
+++ b/mysql-test/t/mysqlslap.test
@@ -36,3 +36,5 @@
 --exec $MYSQL_SLAP --silent --concurrency=5 --iterations=1 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --auto-generate-sql-guid-primary --auto-generate-sql-load-type=key --auto-generate-sql-execute-number=5 --auto-generate-sql-secondary-indexes=3
 
 --exec $MYSQL_SLAP --only-print --delimiter=";" --query="select * from t1;select * from t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --engine="heap,myisam" --post-query="SHOW TABLES" --pre-query="SHOW TABLES";
+
+ --exec $MYSQL_SLAP --only-print --delimiter=";" --query="select * from t1;select * from t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --engine="heap,myisam" --post-query="SHOW TABLES" --pre-query="SHOW TABLES" --number-of-queries=6 --commit=1;

From 54bfd8b113f571cee1824457e8fceaf37e8781c9 Mon Sep 17 00:00:00 2001
From: unknown <brian@zim.(none)>
Date: Thu, 12 Jul 2007 17:39:07 -0700
Subject: [PATCH 002/139] Fixed locking issues around flushes.

storage/archive/ha_archive.cc:
  Added mutex around flush calls to make read's consistent (and not conflicting)
storage/archive/ha_archive.h:
  Fixed issues for fast count(*) call
---
 storage/archive/ha_archive.cc | 59 ++++++++++++++++++++---------------
 storage/archive/ha_archive.h  |  3 ++
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index bdc59cbe795..6696eac2fbb 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -436,6 +436,9 @@ int ha_archive::init_archive_writer()
 }
 
 
+/* 
+  No locks are required because it is associated with just one handler instance
+*/
 int ha_archive::init_archive_reader()
 {
   DBUG_ENTER("ha_archive::init_archive_reader");
@@ -794,15 +797,16 @@ int ha_archive::write_row(uchar *buf)
   if (share->crashed)
     DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
 
-  if (!share->archive_write_open)
-    if (init_archive_writer())
-      DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
-
   ha_statistic_increment(&SSV::ha_write_count);
   if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
     table->timestamp_field->set_time();
   pthread_mutex_lock(&share->mutex);
 
+  if (!share->archive_write_open)
+    if (init_archive_writer())
+      DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
+
+
   if (table->next_number_field && record == table->record[0])
   {
     KEY *mkey= &table->s->key_info[0]; // We only support one key right now
@@ -992,24 +996,6 @@ int ha_archive::rnd_init(bool scan)
   {
     DBUG_PRINT("info", ("archive will retrieve %llu rows", 
                         (unsigned long long) scan_rows));
-    stats.records= 0;
-
-    /* 
-      If dirty, we lock, and then reset/flush the data.
-      I found that just calling azflush() doesn't always work.
-    */
-    pthread_mutex_lock(&share->mutex);
-    scan_rows= share->rows_recorded;
-    if (share->dirty == TRUE)
-    {
-      if (share->dirty == TRUE)
-      {
-        DBUG_PRINT("ha_archive", ("archive flushing out rows for scan"));
-        azflush(&(share->archive_write), Z_SYNC_FLUSH);
-        share->dirty= FALSE;
-      }
-    }
-    pthread_mutex_unlock(&share->mutex);
 
     if (read_data_header(&archive))
       DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
@@ -1223,9 +1209,7 @@ int ha_archive::rnd_next(uchar *buf)
   current_position= aztell(&archive);
   rc= get_row(&archive, buf);
 
-
-  if (rc != HA_ERR_END_OF_FILE)
-    stats.records++;
+  table->status=rc ? STATUS_NOT_FOUND: 0;
 
   DBUG_RETURN(rc);
 }
@@ -1461,12 +1445,33 @@ void ha_archive::update_create_info(HA_CREATE_INFO *create_info)
 int ha_archive::info(uint flag)
 {
   DBUG_ENTER("ha_archive::info");
+
+  /* 
+    If dirty, we lock, and then reset/flush the data.
+    I found that just calling azflush() doesn't always work.
+  */
+  pthread_mutex_lock(&share->mutex);
+  if (share->dirty == TRUE)
+  {
+    if (share->dirty == TRUE)
+    {
+      DBUG_PRINT("ha_archive", ("archive flushing out rows for scan"));
+      azflush(&(share->archive_write), Z_SYNC_FLUSH);
+      share->dirty= FALSE;
+    }
+  }
+
   /* 
     This should be an accurate number now, though bulk and delayed inserts can
     cause the number to be inaccurate.
   */
   stats.records= share->rows_recorded;
+  pthread_mutex_unlock(&share->mutex);
+
+  scan_rows= stats.records;
   stats.deleted= 0;
+
+  DBUG_PRINT("ha_archive", ("Stats rows is %d\n", (int)stats.records));
   /* Costs quite a bit more to get all information */
   if (flag & HA_STATUS_TIME)
   {
@@ -1486,7 +1491,9 @@ int ha_archive::info(uint flag)
   if (flag & HA_STATUS_AUTO)
   {
     init_archive_reader();
+    pthread_mutex_lock(&share->mutex);
     azflush(&archive, Z_SYNC_FLUSH);
+    pthread_mutex_unlock(&share->mutex);
     stats.auto_increment_value= archive.auto_increment;
   }
 
@@ -1554,7 +1561,9 @@ int ha_archive::check(THD* thd, HA_CHECK_OPT* check_opt)
 
   old_proc_info= thd_proc_info(thd, "Checking table");
   /* Flush any waiting data */
+  pthread_mutex_lock(&share->mutex);
   azflush(&(share->archive_write), Z_SYNC_FLUSH);
+  pthread_mutex_unlock(&share->mutex);
 
   /*
     Now we will rewind the archive file so that we are positioned at the 
diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h
index 22fb57b0cc7..ab630ed22fd 100644
--- a/storage/archive/ha_archive.h
+++ b/storage/archive/ha_archive.h
@@ -88,6 +88,8 @@ public:
   {
     return (HA_NO_TRANSACTIONS | HA_REC_NOT_IN_SEQ | HA_CAN_BIT_FIELD |
             HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE |
+            HA_STATS_RECORDS_IS_EXACT |
+            HA_HAS_RECORDS |
             HA_FILE_BASED | HA_CAN_INSERT_DELAYED | HA_CAN_GEOMETRY);
   }
   ulong index_flags(uint idx, uint part, bool all_parts) const
@@ -101,6 +103,7 @@ public:
   uint max_supported_keys()          const { return 1; }
   uint max_supported_key_length()    const { return sizeof(ulonglong); }
   uint max_supported_key_part_length() const { return sizeof(ulonglong); }
+  ha_rows records() { return share->rows_recorded; }
   int index_init(uint keynr, bool sorted);
   virtual int index_read(uchar * buf, const uchar * key,
 			 uint key_len, enum ha_rkey_function find_flag);

From 475eac91ce320321a499e546f5c9e308c680a5e2 Mon Sep 17 00:00:00 2001
From: unknown <dkatz@damien-katzs-computer.local>
Date: Tue, 17 Jul 2007 14:43:56 -0400
Subject: [PATCH 003/139] Bug #29784  YaSSL assertion failure when reading 8k
 key.

Fixed the yassl base64 decoding to correctly allocate a maximum decoded buffer size.


mysql-test/std_data/server8k-cert.pem:
  BitKeeper file /Users/dkatz/50/mysql-test/std_data/server8k-cert.pem
mysql-test/std_data/server8k-key.pem:
  BitKeeper file /Users/dkatz/50/mysql-test/std_data/server8k-key.pem
extra/yassl/taocrypt/src/coding.cpp:
  Fixed buffer allocation to compute the proper maximum decoded size: (EncodedLength * 3/4) + 3
mysql-test/r/ssl_8k_key.result:
  New BitKeeper file ``mysql-test/r/ssl_8k_key.result''

  Test connection to server using large SSL key.
mysql-test/t/ssl_8k_key.test:
  New BitKeeper file ``mysql-test/t/ssl_8k_key.test''

  Test connection to server using large SSL key.
---
 extra/yassl/taocrypt/src/coding.cpp   |  2 +-
 mysql-test/r/ssl_8k_key.result        |  2 +
 mysql-test/std_data/server8k-cert.pem | 51 ++++++++++++++
 mysql-test/std_data/server8k-key.pem  | 99 +++++++++++++++++++++++++++
 mysql-test/t/ssl_8k_key.test          |  6 ++
 5 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 mysql-test/r/ssl_8k_key.result
 create mode 100644 mysql-test/std_data/server8k-cert.pem
 create mode 100644 mysql-test/std_data/server8k-key.pem
 create mode 100644 mysql-test/t/ssl_8k_key.test

diff --git a/extra/yassl/taocrypt/src/coding.cpp b/extra/yassl/taocrypt/src/coding.cpp
index 68055b3aff4..55fe31831e3 100644
--- a/extra/yassl/taocrypt/src/coding.cpp
+++ b/extra/yassl/taocrypt/src/coding.cpp
@@ -184,7 +184,7 @@ void Base64Decoder::Decode()
 {
     word32 bytes = coded_.size();
     word32 plainSz = bytes - ((bytes + (pemLineSz - 1)) / pemLineSz); 
-    plainSz = (plainSz * 3 + 3) / 4;
+    plainSz = ((plainSz * 3) / 4) + 3;
     decoded_.New(plainSz);
 
     word32 i = 0;
diff --git a/mysql-test/r/ssl_8k_key.result b/mysql-test/r/ssl_8k_key.result
new file mode 100644
index 00000000000..b33a1d2854f
--- /dev/null
+++ b/mysql-test/r/ssl_8k_key.result
@@ -0,0 +1,2 @@
+Variable_name	Value
+Ssl_cipher	DHE-RSA-AES256-SHA
diff --git a/mysql-test/std_data/server8k-cert.pem b/mysql-test/std_data/server8k-cert.pem
new file mode 100644
index 00000000000..a0750f9e69e
--- /dev/null
+++ b/mysql-test/std_data/server8k-cert.pem
@@ -0,0 +1,51 @@
+-----BEGIN CERTIFICATE-----
+MIIJHDCCBQQCAQEwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCU0UxEDAOBgNV
+BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMQ0wCwYDVQQLEwRUZXN0MQsw
+CQYDVQQDEwJDQTAeFw0wNzA3MTMwNzU2MjVaFw0xMDA0MDgwNzU2MjVaMFoxCzAJ
+BgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRkwFwYDVQQKFBBNeVNRTCAgIAog
+ICAgIEFCMQ0wCwYDVQQLEwRUZXN0MQ8wDQYDVQQDEwZzZXJ2ZXIwggQiMA0GCSqG
+SIb3DQEBAQUAA4IEDwAwggQKAoIEAQDUFlh/3mwov5YaICFXOdJXgHV/uDkTjXB6
+9oxlipshQaYPX8LDT5vhI3gPciS1Z1sRE2dTcC4Mk2K4LDUIjp3WkeTfFAHZPV3E
+Y+3OH/ftH4N6SEIBTKE4EY6ah0nJtU98M0JhxOh5zHje6zQp1SkBnhEOQYexYRqj
+OtGloZ9RyF0iFAXcyu2Ap14u37l5Yla0cyPzvZqP4mFYlcXwaRfAacJmqMM1vuQv
+Fx1JITUTBugMF3VGZ1F0tw63EIUH/FW/WWncPqvG18na40qlv9ZkBw0FhZeKS8cK
+JIY5y4J30jn/eV8p1lTO7K+ASTuGZWmdRDgjUG0Y9OGuKsPPoaE6ml0HTnMBsBSQ
+fXUq9XkwGt8DTgPioAKHBHjLbILEy4FMYWrlTZlPTzNqyhayec/2T15oDladNSt7
+JpDLpX70UECXFhdEGxsGxtXdKbIBvNm2yT4X2nxW9ItsECjSSgD+94TgGoa8QKDw
+rpmgq+Wqpm54CZ1vN1oqyMUw1sjNEX/iLByHAjSALby2Kffk5cl5mnsR6d/k4jsi
+c3Qsciwkd+rQt/8VMhS2ns3nkez/BK3FvQA2Ms8xJhFLfszVrBhnjcFRTNT2+/KM
+lr1oT5Q1XZKL7qVXTpabPL51JlVBL5CSHl1QRkffsqfqcgJkcHBq+kKjUiFs4lad
+hTrvNBCXYa5+NkA2QqIfdOpNwl62/gdE7/7zU1uh40vkVKyzL+APkLPywPEXBOpQ
+yIDNkgoXmS10+JMD44K7uZyUmxZL7W7Xbi30NuEFrVOzoUmVXhapPbpQnkQHxn8n
+tqKPYXdBcvXcCKyJ6i79H2Vk9fM6rBYiwNcE7QyWqfd2QMjzr76veF04sXkPR+tG
+5Y1lrF9Zp3vabFXQg2RJuGA3rV6MR2GFNXuChIYu410vhIhPNtmdKEVoIVZsFsug
++dtn0PDCFrR8VEd/sshp0naNa9Ad1lY+marJkOJOVpPgCs2yJDPAUB/YdvSJ4avW
+6ZdvNTwhBL8fEJMS2DSqkaa6A3+i/SqITpU8ToJxsMGagBsLieXgvJALFysSRfR/
+2dmEu9/J0PPc28inHXwjiLb99VKlkuEz8wX9UkuoqFl0pLa8jrlM8hzdPQ9QHb3k
+9c5knfgPCYkOIWwGXH+NwANHdQRK7CmGAFV24k9+P3q0g5ikabVHr+4ZQ3WPd+1H
+K0+Msbb/vv53vFJWa+pYeNeFcwNCyW2kJBTMiI6qmlL4IWCcX+QDzpRLalbAWWHj
+l5Zk39QEaCL024DYK948IDXCqDg6utEs7YnMdaIF0meYMKjehZFp0fVQ8e8Od+rp
+bbjdj/w60wMgBpSOeYxVrs3QKNZd/if4Az3LggoVHB09SjXKiWpvAgMBAAEwDQYJ
+KoZIhvcNAQEEBQADggQBABncOBW0wQwJdEB6W3d9CrhFp40q1OM54GPfX0/0aUfP
+aOQPxS1uCKcFhxAmR4OT9RiJx+0bhDctekkuMkj5yy3u0a/4PxHIhnVxXTyB0/Hj
+N1gLz6cQricunl6Q4Ldi54gR5/KUehKLBWnqsfxhgzWBHosvhlJC0xh/uio7JTqz
+ns60djyL7R4wGbSqiGdhT9L2HfpJo3dmmWLDxe02jaHkbL1Z6NQMxrRgs3+gctp/
+Wd5UxNl4BHbNsSbzaK9V9gXUcj4TjZGGSqVki0+pEZ3dmksGZdoW9cSKtzKvgUQ6
+vhhqO4dcopxkY2zYeVOpspgTm0XLZSbNPXv5rSFwa4cpWSfD7u8o8KhHvkkSMahw
+cMuH17W4voHHFDtWP8Oq9rA7uE/4/LKCl0JmJl2RWM+G6PMH8w4X4auHPssgRvb/
+Ge1AvgqQJrvi7zWx3XYKKJ0ISBy7fi5Jo/wYgLagRYcG3mwdm1+gAdw+77C/ZGmG
+FbWFIPB1+Mc6azhhk9m/vqP7o/Wuncc99mp2zPMzdAEzuzp/IJ9UJNat0edA7jiC
+bQ7JSRJ1DSzdJZSWWHdardLNKipPfrEHVm7f5QvL5DQLnGpt+rCWL361KsGtvETC
+o+Ph7+kDJsJLokUYfs/BEZopzspNPy/NQ2ECwQp7T4Yq/PBE6Ce/dFaoZysMUOrG
+TcALtJW6It98dRmTJPiqjlrlHNTrfoV3Aiy+tK4rpyGuApSHc+1Y+t7YvWotRlQ4
+GEboBqR8evjDPJ1xAaUZqwLkebf3mlpl4MzHM9uNWBkQdJilkQs/IrAaApG3Ayt0
+nIymNHmDslBEdrRGmT4aNWAWYvVYzyKDy3H0fzYdWwuA9goJUL4tj3eMJa8pgEU/
+rG3HfflVi+xuwm1UnLXPSIE8hixgV8ebnwcCnEjlUBvwpl7f5Ub40jKcdycdGvVu
+gcTUzuRl1+Ikfk/MXKPbdi4A5Pjtz6AG4Ez9q5j7X77JqskTI5Z/f1RPiKwFBJHg
+cN4+BPnEuSWGcjiNDOfQxhk5exlWRf/gpEhnQpGHe3a7tZgfxHUb/pWU9BYpf8OH
+vtV3WSDXlUqsEEH6/bmvj8lmFWJLmeZv+qLy1wHxcXR9/GJ6TwCF8niQIl3MrBAL
+sKPLft1drmpqdIQpZQIJxtN/AQuD9mxEdW7XA6rkvFySKcswJpS1QjkSWpafCBWE
+wu+SPxZL8oFrnNMTU3JloUjcRp70FkNXLLm/Dy+MjW2qFBtIoBgNptVGp94L1uZS
+amd2XJMcOQ+X9fcH3wAdM3IHGn3NiLf6eTW92JNNA0IN6aNtyVaJKmFJ1JfXOl9r
+ujr4SorRSesaerjIcuzW1u1YE5RlgeI4kizV2/D5kYc=
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/server8k-key.pem b/mysql-test/std_data/server8k-key.pem
new file mode 100644
index 00000000000..608593a5096
--- /dev/null
+++ b/mysql-test/std_data/server8k-key.pem
@@ -0,0 +1,99 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIISKQIBAAKCBAEA1BZYf95sKL+WGiAhVznSV4B1f7g5E41wevaMZYqbIUGmD1/C
+w0+b4SN4D3IktWdbERNnU3AuDJNiuCw1CI6d1pHk3xQB2T1dxGPtzh/37R+DekhC
+AUyhOBGOmodJybVPfDNCYcToecx43us0KdUpAZ4RDkGHsWEaozrRpaGfUchdIhQF
+3MrtgKdeLt+5eWJWtHMj872aj+JhWJXF8GkXwGnCZqjDNb7kLxcdSSE1EwboDBd1
+RmdRdLcOtxCFB/xVv1lp3D6rxtfJ2uNKpb/WZAcNBYWXikvHCiSGOcuCd9I5/3lf
+KdZUzuyvgEk7hmVpnUQ4I1BtGPThrirDz6GhOppdB05zAbAUkH11KvV5MBrfA04D
+4qAChwR4y2yCxMuBTGFq5U2ZT08zasoWsnnP9k9eaA5WnTUreyaQy6V+9FBAlxYX
+RBsbBsbV3SmyAbzZtsk+F9p8VvSLbBAo0koA/veE4BqGvECg8K6ZoKvlqqZueAmd
+bzdaKsjFMNbIzRF/4iwchwI0gC28tin35OXJeZp7Eenf5OI7InN0LHIsJHfq0Lf/
+FTIUtp7N55Hs/wStxb0ANjLPMSYRS37M1awYZ43BUUzU9vvyjJa9aE+UNV2Si+6l
+V06Wmzy+dSZVQS+Qkh5dUEZH37Kn6nICZHBwavpCo1IhbOJWnYU67zQQl2GufjZA
+NkKiH3TqTcJetv4HRO/+81NboeNL5FSssy/gD5Cz8sDxFwTqUMiAzZIKF5ktdPiT
+A+OCu7mclJsWS+1u124t9DbhBa1Ts6FJlV4WqT26UJ5EB8Z/J7aij2F3QXL13Ais
+ieou/R9lZPXzOqwWIsDXBO0Mlqn3dkDI86++r3hdOLF5D0frRuWNZaxfWad72mxV
+0INkSbhgN61ejEdhhTV7goSGLuNdL4SITzbZnShFaCFWbBbLoPnbZ9Dwwha0fFRH
+f7LIadJ2jWvQHdZWPpmqyZDiTlaT4ArNsiQzwFAf2Hb0ieGr1umXbzU8IQS/HxCT
+Etg0qpGmugN/ov0qiE6VPE6CcbDBmoAbC4nl4LyQCxcrEkX0f9nZhLvfydDz3NvI
+px18I4i2/fVSpZLhM/MF/VJLqKhZdKS2vI65TPIc3T0PUB295PXOZJ34DwmJDiFs
+Blx/jcADR3UESuwphgBVduJPfj96tIOYpGm1R6/uGUN1j3ftRytPjLG2/77+d7xS
+VmvqWHjXhXMDQsltpCQUzIiOqppS+CFgnF/kA86US2pWwFlh45eWZN/UBGgi9NuA
+2CvePCA1wqg4OrrRLO2JzHWiBdJnmDCo3oWRadH1UPHvDnfq6W243Y/8OtMDIAaU
+jnmMVa7N0CjWXf4n+AM9y4IKFRwdPUo1yolqbwIDAQABAoIEAQDI3u0tFoWMRoCs
+99d8HLiaxYED2YC9gw2QeKjal198LQhRsVnu0ByMLKLOxkX8RgrbbmxDe5Exufob
+A0urciAOFJoXqoRhs5x2oEqgGmkf/ePx0jQptOFREFfnBdGeKIpC0O3DWdLxYPbt
+8wixwkEXVhVDUk9pcdXf2ZqsbBpQRBvpZdtzlgNCAcLTVHP/gmMqf48CkIauVjPq
+ydfybibfx4sm3hodclH+Q78p/zicb8MhiKo7ZymgCKz4N743pQe1tsLrpbPeHY0C
+MpoFyF8O2Bq+KxwvELxQX+19GcHVKJhj3hmCr4wde9BxCWtGTBCusekVkVvy8iQ5
+aCmTIrtonMEVZXjJlXK0sw5hBKOmKx0jrSVC5FfgdxzNVlW4fCJXLEEpMsjMc+/3
+6bV7jqGn4N5CYaopNS2ccxdaucE3NjcmofahO6bqUTJHSPFecfYmCA42W2m+ldjj
+HZ78JLkyw03nT1hjPjbwHf5FTem1KfKg4EJrDprowMT7D8KZb0SW+z59pFoDOM5u
+Heu6sOSUtvpvKfozdw2ZAI58dhpW4/jTfCEtewRhPqE3/V7g3haTnQFxU8gm/a4N
+uefZTCjFE16QWNuvnUrJWw/DlvOBY8GjpQCWY0mDeBHPNOI0Xg9oRTgOCrKSLUya
+YSbg6BmhSKwKsYQU834jrQb3fXFlXZVIxlcNePOWMhHFFNAHucHF822Nr7u/3FOT
+twcbBIOXCGfDT6ed8d4dNum1L7k9Blju16CWkfuciL8PGXY4mGAmF4nZMXGZgK8B
+Cz9cxhtvFLe8gz5615DtBAsuVm7Q4AAHiULAMg6t6auyxCb8pXbAL0Ec5X4zS3+f
+I2riODYiyHCh/qTtjawOzUZZEtjZRMSDi+jk8wjjDdkFU8McOaYoPyqT3TDy2v6m
+NiPJs8GWQ2NCNo9CNoGbEIIFFP5iSz18XLFAOF+2dN/KHHl9nKyi7kOhYbbzoNku
+2wQV40yVsrS4E/hd/7+2IB2Muduxiu7NxCUSUXsw6p0hZTYMpIoduEfRSk1al0lS
+862GD8JgJ4RhJ0uIOTDJS52MQmO8zFIL86emdjjV1CzVvadYSQLTX7ZgR0i8g46A
+y0muCFAC8EJpnEtHzqtQ/z22zB8TCJShFuUK9KF6K8nOlbc6ShcUXU2J6r1sc8aT
+Dx0yzRXfCL15fpCJBP49EYaKhArTNmFRa2GaLiJP0OYkTrrwVOGuS6x2+kRVoP/8
+BcNMZ5x8mXP1LgotHCztgMKX30Hn5CLxbH8QfcWKemGva1jBmhCWxS17Gh3Ld9T3
+/WKkBa6JDq83rlO84x/iF3mB3tYkZPfcYtYURn5wwm/BmVV/9G1VwAatJdxmfCSy
+5JwC9WDBAoICAQD7xStPk3lq+qYHAtLZidujmzSNv7XG+E8UC9yvMRFuBwSM5ZE4
+YGD2LDev2nghB+7OSR8KJIkxeaNjP91Zf3s8wjCuxLg/cLGI6mf6uWy9+zypFg3i
+J+ylDKa6NBuqYyY75W7Pj63xvGQlw5kX5+mB3ulQbActT4cUiVdEkyDytzubqLzY
+s15QGFrL9gqLow+C+7LKQKdeXq8OavFV1PWkMDAJUki6cIir9m+f5Mqr2cQCLKgx
+38aX8c9UWJv6pI5zQQuBjpaBOwz07WnyTXiFpc71x/8i85uLGDM0e3VO5ZPGeRBj
+jZ0ucHatOHJ3i/nPRG16rsPR+q97QiDHoLF0quHEG+ND+rwTBzNGIwzYRE16p1o3
+UdzFk1RzlDCfOX7QgszCwK6mf8TbCK9f/FxJ5e6TCkt3iHXSrlLS4op6k9nEpKFH
+KHf4nPtCy9GriP+A8+dA6K1s+DgejoIojBMBTsnl4TEf+m8BaenTXGuU7KYyc8dR
+JqmpmDggDRT/ImHRhXirY7lIIYXnI7tRjN5gmnKpEiHScT1r848zpQ4gWH1Dx/ks
+mKT6NZ8nF45saQCYbKEYc0RH9Kw0O7vr1kVtNPc2dEZtVgt4bC5fnl7xX1/YTk3m
++h1qfzbku/+MX5rRjHLR2l8a71UltlnnnpP5NKBBgtxll6aCIkk6CdH8YQKCAgEA
+16aBaVa0cOZmiOQwPQkpuXIbV7msz1ttWEAHElCy6waniOCON89PYFCb7F0NjV3Q
+i+pGaRgG1iZGbjjHwyqTrHhMloFm+IsSWZqOZzrHgSJgA4bgTJFgp+5b31sQXGfJ
+14QQSqMJLC61/M+CnrNtiuI3IVHx6BFRxI42uE7PfTyUMaFhL9F0/SLl0Mw0oMPj
+S5kmarduuKpRn1tN9WO+ywEvYwopvH3e9PBssZzPpttlLiE/Wulb0iEtlVXYB9DS
+Vzc94N2dzFMIvWUDF9BQ+IBMRzXRm15Psy6LfzoK+9S6w38Dx3BVV8ykSMKeW1UR
+ZwTajjdnIBLdE3onD5XMmrSOPw/WtV5zXEYY4DObhIPoN2iD8GJP0IubPb6fonH5
+VHmuVZoXrroFEe7rdt2wgmBdPPl6fqvBKVhjJOpYQctrFLgWh63bXZKaBWqbQM9W
+fECq8We1VN3fzqwfwJQit3z5R/DjQNk8eQx7SnnkOzAY6ZgpysHCwaoPOnPVuiYF
+ZU0+X3iwfsdeefWmGEDIzoZk6nYaljs61lOhhEoWHngZHDkMOp5kg0n9f8BUP02+
+WJ4QhwzZ73hr4FPBuPHHXECw9TCAgCBHBFrnrXg5QalDhRXz4F+3tCY7UUpD/ikZ
+L6Daxm5zGJ5u3rXs6WwKy2EHVVS9zfqs4Q259pQdWM8CggIAcIKpGzOVM+h033c0
+kIBZxeAq+Rlt+0+lzxiJ80RjPJ8oOmqwndf8HKaf8BcaTfCEmGz20QqIwLJSAJ1e
+posgoINLTB6fE8Kho8TU2KeaX7/xWMKBS8p5pzxjGZ0Fq/wI7wVVoq3blsaQnout
+U5CQujfKXeUYw/fhLp09gWiadbzKh4I9ej2V7QclNDZsegBRg0BForqH0NVRN4k0
+9h1n9IqQPOonlCGMAgTr1zFgHLIBNNOOClOtJOOruk6qzbRR8FFl+eyld3TTEnUy
+PlS+gkMZnJ5WduEUZnFXGKH/R1Wy1yPs3gA/+KvLbRdnl+LWrPgwUH3fBmwXlWZ0
+zaETDEb9Ay1PP2bCO2KhWDt7lv3W/fPhjg0oMqbnO4tCuzTvZfC93l5K7h708skL
+zkIxX9i/57fXB8DUnmTGoHUaWzLNQ2IqrGj6TACjDDOXLCfZvl/AvTH9pk+6jHU0
+1zfZmmECOpeK43Z/ussA8jI/5Vpn3u38aVh0w1RB6JjQBD/yJLaXuUekWgaZFzTR
+ldz014jNqp5uvONcBmzeVr7w9CV3PR4VTQed2i6yQ770J6A44uTQjOOd5OYDOohj
+Lz4e4nGj9BK8Eko8cAEwLAzS8tyjMT+08n5dPOVCu68DwVBMGE7CVONYUuoXS/YU
+cTxddiU9ZGk9Yq0FfOwjeys+SqECggIAdn3M2b6Egwx2Bn2ra74fKQBjub4SEBWi
+bT0xJYUl6jHL2E/alRvZ94gTRLqUebq0nkxpx9El4IFDbcjRKpG4dqnbG0+a7rIr
+sQRVfq8zc+cZbparpCa1P1CfNojo4n080KiF8xzGK3q3EGRM1zqr1AYcWLiX/PWX
+QjMKKhdTtvKUUvjjV8z1RSnpsOKjgDpiJ+XM0BJeSiV7l94pZc4axZyvFvI8oI9g
+9KEueCE7j+k5HTGziBZ1F26Xh1iVzSWWjcmSvH3I+L4fLUHVgz45X3HPd8lAlOgr
+Tr8icxPHeTwYKtcdknZMzmNpWXlmXbTOTRbDqCUVCvCSfOM/lzauJ8tR5aCkTx/I
+r0js3jQ9HYEFFXzeEjVSubob4L9fI3kQkLQTcIGsxZr8si/fPX7uP5UHZjuGbRee
+mUMxptUFDZHiEo5cAs0qna2x54v+JoxGbxtxUhez8R/Am+TDxaMfuEZ5Cmh31egH
+bFPJYtC68TKqXZ/4RqpUgukYWPvQ0emWSWU6AmdkQyT06nppeyYNsDz0MkgWr7l3
+yNBHDVNP+Anxcip+Z68kd2cuXQWmxOnIzxR67FnJXeWDEM20whRHgI8jLHYsBTq3
+CtOQPSaz/zosGXJIgF7Xp6riKPZvibW3Ww49Z47EuyBCtyirNk7hV4LG7sITUJyO
+ZVKPfcdAoM0CggIBANz3EBZGyt3af2UjFFKbazV01KcHF8OxqdQzsLqHCXWb98V6
+PggQnrF76U7DvqOWho9djDBPrbQU55HG5nXq+eZKPwhsOdwQ8bxOhaVxQcATZOI7
+FtJYnjM1/+zMzzS0iPR5DA2pbB3AKH2Z+wODmF23CK2XTwoJyPKxvlyGKrIqq3gN
+kOmocNu2Qm5bJf+D/hYPm5Ust2wzD52NnvJU536bZ0ZMo1/kaK2idqSAzqo4TkR1
+j9U0fdW2rIBDo/qFmBBdJhYVjYLj4qR8CEEoIjshD4Nztf1xRM5C8irE/gJcT5+r
+4bPJJ5TjAtHxPiQqZruSprSEUbMsPqBap64ow0SmbNNWSgyaz2ha1rG0p52NBzH4
+XM52LBqS9QHPHvB0ooYfBTfPpDM3CePuuNyzjPAw86ncUo38FKXuc2oViJJ6C5I7
+v2sKhLK5gu3uPBB2ludDEXSpWBqiraynolOT/o52r+taYp9YY2WU3GrhOiV/A1FV
+Nl118xiF6FOFpEeTbhHvy27A8kZEKXgeSs+f4aC0XG9kLVD1CiCbQiqHTDcDS4nV
+O1N1eQxhP81X+YKE4Lgufh07REqYVwtCj2lQcMp73WDyfBLKTEFlmHusoqmT5JCH
+X0BWNjk5Dn1g5h63/lQb+EjNRILBhDFYhrDRDQtw5p0/7IY3AcNKDUHv+XGn
+-----END RSA PRIVATE KEY-----
diff --git a/mysql-test/t/ssl_8k_key.test b/mysql-test/t/ssl_8k_key.test
new file mode 100644
index 00000000000..b4203e68445
--- /dev/null
+++ b/mysql-test/t/ssl_8k_key.test
@@ -0,0 +1,6 @@
+-- source include/have_ssl.inc
+#
+# Bug#29784 YaSSL assertion failure when reading 8k key.
+#
+--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
+

From 6947f2d1316c7b0b7ede841a097328da8c21aa4d Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Wed, 18 Jul 2007 12:13:45 +0500
Subject: [PATCH 004/139] Fix for bug #28125: ERROR 2013 when adding index.

Problem: we may break a multibyte char sequence using a key
reduced to maximum allowed length for a storage engine
(that leads to failed assertion in the innodb code,
see also #17530).

Fix: align truncated key length to multibyte char boundary.


mysql-test/r/innodb_mysql.result:
  Fix for bug #28125: ERROR 2013 when adding index.
    - test result.
mysql-test/t/innodb_mysql.test:
  Fix for bug #28125: ERROR 2013 when adding index.
    - test case.
sql/sql_table.cc:
  Fix for bug #28125: ERROR 2013 when adding index.
    - align truncated key length to multibyte char boundary.
    - display real key length in bytes raising warnings.
---
 mysql-test/r/innodb_mysql.result | 14 +++++++++++++-
 mysql-test/t/innodb_mysql.test   |  9 +++++++++
 sql/sql_table.cc                 |  6 ++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index 4535710c905..4c1e7189998 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -418,7 +418,7 @@ DROP TABLE t1,t2;
 create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 
 character set utf8 collate utf8_general_ci;
 Warnings:
-Warning	1071	Specified key was too long; max key length is 765 bytes
+Warning	1071	Specified key was too long; max key length is 767 bytes
 insert into t1 values('aaa');
 drop table t1;
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c FLOAT, KEY b(b)) ENGINE = INNODB;
@@ -735,4 +735,16 @@ COUNT(*)
 3072
 set @@sort_buffer_size=default;
 DROP TABLE t1,t2;
+create table t1(a text) engine=innodb default charset=utf8;
+insert into t1 values('aaa');
+alter table t1 add index(a(1024));
+Warnings:
+Warning	1071	Specified key was too long; max key length is 767 bytes
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` text,
+  KEY `a` (`a`(255))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+drop table t1;
 End of 5.0 tests
diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test
index d4ce997ddb1..4930ec81a62 100644
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
@@ -741,4 +741,13 @@ set @@sort_buffer_size=default;
 
 DROP TABLE t1,t2;
 
+#
+# Bug #28125: ERROR 2013 when adding index.
+#
+create table t1(a text) engine=innodb default charset=utf8; 
+insert into t1 values('aaa');
+alter table t1 add index(a(1024));
+show create table t1;
+drop table t1;
+
 --echo End of 5.0 tests
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 87f23097a66..0da639f9896 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1357,6 +1357,8 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
 			  length);
 	      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			   ER_TOO_LONG_KEY, warn_buff);
+              /* Align key length to multibyte char boundary */
+              length-= length % sql_field->charset->mbmaxlen;
 	    }
 	    else
 	    {
@@ -1387,8 +1389,6 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
       if (length > file->max_key_part_length() && key->type != Key::FULLTEXT)
       {
         length= file->max_key_part_length();
-        /* Align key length to multibyte char boundary */
-        length-= length % sql_field->charset->mbmaxlen;
 	if (key->type == Key::MULTIPLE)
 	{
 	  /* not a critical problem */
@@ -1397,6 +1397,8 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
 		      length);
 	  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 		       ER_TOO_LONG_KEY, warn_buff);
+          /* Align key length to multibyte char boundary */
+          length-= length % sql_field->charset->mbmaxlen;
 	}
 	else
 	{

From 082c3cb46a5e6e4a5ca5375ba663f3417be72c84 Mon Sep 17 00:00:00 2001
From: unknown <svoj@mysql.com/june.mysql.com>
Date: Wed, 18 Jul 2007 13:55:50 +0500
Subject: [PATCH 005/139] BUG#29839 - lowercase_table3.test: Cannot find table
 test/T1 from             the internal data dictiona - re-enabled
 lowercase_table3 test; - added a rule to throw away expected warning to
 mtr_report.pl; - fixed a test case to produce unique warning.

mysql-test/lib/mtr_report.pl:
  Throw away a warning produced by BUG#29839 test.
mysql-test/r/lowercase_table3.result:
  Modified a test case to throw away expected warning.
mysql-test/t/disabled.def:
  Re-enabled lowercase_table3.test.
mysql-test/t/lowercase_table3.test:
  Modified a test case to throw away expected warning.
---
 mysql-test/lib/mtr_report.pl         | 6 +++++-
 mysql-test/r/lowercase_table3.result | 8 ++++----
 mysql-test/t/disabled.def            | 1 -
 mysql-test/t/lowercase_table3.test   | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index 306a0fe5d9d..fa38e8507f8 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -362,7 +362,11 @@ sub mtr_report_stats ($) {
 
                 # BUG#29807 - innodb_mysql.test: Cannot find table test/t2
                 #             from the internal data dictionary
-                /Cannot find table test\/bug29807 from the internal data dictionary/
+                /Cannot find table test\/bug29807 from the internal data dictionary/ or
+
+                # BUG#29839 - lowercase_table3.test: Cannot find table test/T1
+                #             from the internal data dictiona
+                /Cannot find table test\/BUG29839 from the internal data dictionary/
 	       )
             {
               next;                       # Skip these lines
diff --git a/mysql-test/r/lowercase_table3.result b/mysql-test/r/lowercase_table3.result
index 995a2c0d08a..14cff4f98c9 100644
--- a/mysql-test/r/lowercase_table3.result
+++ b/mysql-test/r/lowercase_table3.result
@@ -4,7 +4,7 @@ SELECT * from T1;
 a
 drop table t1;
 flush tables;
-CREATE TABLE t1 (a int) ENGINE=INNODB;
-SELECT * from T1;
-ERROR 42S02: Table 'test.T1' doesn't exist
-drop table t1;
+CREATE TABLE bug29839 (a int) ENGINE=INNODB;
+SELECT * from BUG29839;
+ERROR 42S02: Table 'test.BUG29839' doesn't exist
+drop table bug29839;
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 07c5b4d56a3..9d2b4abc929 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -25,4 +25,3 @@ ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Do
 
 mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
 federated_innodb     : Bug#29522 failed assertion in binlog_close_connection()
-lowercase_table3     : Bug#29839 2007-07-17 ingo Cannot find table test/T1 from the internal data dictionary
diff --git a/mysql-test/t/lowercase_table3.test b/mysql-test/t/lowercase_table3.test
index 75f6e5188c5..51385b4b178 100644
--- a/mysql-test/t/lowercase_table3.test
+++ b/mysql-test/t/lowercase_table3.test
@@ -27,9 +27,9 @@ flush tables;
 # storing things in lower case.
 #
 
-CREATE TABLE t1 (a int) ENGINE=INNODB;
+CREATE TABLE bug29839 (a int) ENGINE=INNODB;
 --error 1146
-SELECT * from T1;
-drop table t1;
+SELECT * from BUG29839;
+drop table bug29839;
 
 # End of 4.1 tests

From 035b06b4e1cacb0a1abe4c4272661827c2aa00ba Mon Sep 17 00:00:00 2001
From: unknown <svoj@mysql.com/june.mysql.com>
Date: Wed, 18 Jul 2007 15:39:13 +0500
Subject: [PATCH 006/139] BUG#28838 - duplicate external_lock in
 mysql_alter_table

Removed duplicate call to handler::external_lock() when
ALTER TABLE that doesn't need to copy a table (quick
ALTER TABLE) was executed.

Also quick ALTER TABLE doesn't hold LOCK_open anymore when
it enables/disables indexes.


sql/sql_table.cc:
  Do not call handler::external_lock() as table is already locked
  by open_ltable().

  Also do not hold LOCK_open mutex for alter_table_manage_keys() as
  this function doesn't require LOCK_open (LOCK_open is required by
  wait_while_table_is_used() only).
---
 sql/sql_table.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 87f23097a66..277d6d76ead 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -3789,11 +3789,9 @@ view_err:
   {
     VOID(pthread_mutex_lock(&LOCK_open));
     wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN);
-    table->file->external_lock(thd, F_WRLCK);
+    VOID(pthread_mutex_unlock(&LOCK_open));
     alter_table_manage_keys(table, table->file->indexes_are_disabled(),
                             alter_info->keys_onoff);
-    table->file->external_lock(thd, F_UNLCK);
-    VOID(pthread_mutex_unlock(&LOCK_open));
     error= ha_commit_stmt(thd);
     if (ha_commit(thd))
       error= 1;

From 8b8b430bbccc01717e3eb50e4e452cf415292d00 Mon Sep 17 00:00:00 2001
From: unknown <cmiller@zippy.cornsilk.net>
Date: Wed, 18 Jul 2007 14:03:58 -0400
Subject: [PATCH 007/139] Bug#26909: Specified key was too long; max key length
 is 255 bytes \ 	when creating table

Federated tables had an artificially low maximum of key length,
because the handler failed to implement a method to return it and
the default value is taked from the prototype handler.

Now, implement that method and return the maximum possible key
length, which is that of InnoDB.


mysql-test/r/federated.result:
  Verify that unique keys may be longer than 255 characters.
mysql-test/t/federated.test:
  Verify that unique keys may be longer than 255 characters.
sql/ha_federated.h:
  Implement the virtual method that tells the max size of parts to
  make a key.

  Backport the length defined in 5.1.
---
 mysql-test/r/federated.result | 37 ++++++++++++++++++++++++++++++++
 mysql-test/t/federated.test   | 40 +++++++++++++++++++++++++++++++++++
 sql/ha_federated.h            |  4 +++-
 3 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index cecffbb1471..b69ff8033d4 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -1843,6 +1843,43 @@ C3A4C3B6C3BCC39F
 D18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E
 drop table federated.t1;
 drop table federated.t1;
+CREATE TABLE federated.t1 (
+categoryId int(11) NOT NULL AUTO_INCREMENT,
+domainId varchar(745) NOT NULL DEFAULT '',
+categoryName varchar(255) NOT NULL DEFAULT '',
+PRIMARY KEY (categoryId),
+UNIQUE KEY idx_unique_category_categoryName (domainId, categoryName),
+KEY idx_category_domainId (domainId)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+CREATE TABLE federated.t1 (
+categoryId int(11) NOT NULL AUTO_INCREMENT,
+domainId varchar(745) NOT NULL DEFAULT '',
+categoryName varchar(255) NOT NULL DEFAULT '',
+PRIMARY KEY (categoryId),
+UNIQUE KEY idx_unique_category_categoryName (domainId, categoryName),
+KEY idx_category_domainId (domainId)
+) ENGINE=FEDERATED DEFAULT CHARSET=latin1
+CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';
+insert into federated.t1 (domainId, categoryName) values ( '1231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231  300', '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345  250');
+insert into federated.t1 (domainId, categoryName) values ( '12312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312  301', '12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456  250');
+insert into federated.t1 (domainId, categoryName) values ('a', 'b');
+select categoryId from federated.t1 order by domainId, categoryName;
+categoryId
+1
+2
+3
+select categoryId from federated.t1 where domainId='a' and categoryName='b' order by categoryId;
+categoryId
+3
+select categoryId from federated.t1 where domainId='a' and categoryName='b' order by categoryId;
+categoryId
+3
+select categoryId from federated.t1 where domainId<>'a' and categoryName<>'b' order by categoryId;
+categoryId
+1
+2
+drop table federated.t1;
+drop table federated.t1;
 DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
 DROP TABLE IF EXISTS federated.t1;
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index 894cd513914..e3c7d478c78 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -1575,5 +1575,45 @@ drop table federated.t1;
 connection slave;
 drop table federated.t1;
 
+#
+# Bug#26909: Specified key was too long; max key length is 255 bytes 
+#       when creating a table
+#
+connection slave;
+CREATE TABLE federated.t1 (
+    categoryId int(11) NOT NULL AUTO_INCREMENT,
+    domainId varchar(745) NOT NULL DEFAULT '',
+    categoryName varchar(255) NOT NULL DEFAULT '',
+    PRIMARY KEY (categoryId),
+    UNIQUE KEY idx_unique_category_categoryName (domainId, categoryName),
+    KEY idx_category_domainId (domainId)
+  ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+connection master;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval CREATE TABLE federated.t1 (
+    categoryId int(11) NOT NULL AUTO_INCREMENT,
+    domainId varchar(745) NOT NULL DEFAULT '',
+    categoryName varchar(255) NOT NULL DEFAULT '',
+    PRIMARY KEY (categoryId),
+    UNIQUE KEY idx_unique_category_categoryName (domainId, categoryName),
+    KEY idx_category_domainId (domainId)
+  ) ENGINE=FEDERATED DEFAULT CHARSET=latin1
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+
+
+insert into federated.t1 (domainId, categoryName) values ( '1231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231  300', '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345  250');
+insert into federated.t1 (domainId, categoryName) values ( '12312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312  301', '12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456  250');
+insert into federated.t1 (domainId, categoryName) values ('a', 'b');
+
+select categoryId from federated.t1 order by domainId, categoryName;
+select categoryId from federated.t1 where domainId='a' and categoryName='b' order by categoryId;
+select categoryId from federated.t1 where domainId='a' and categoryName='b' order by categoryId;
+select categoryId from federated.t1 where domainId<>'a' and categoryName<>'b' order by categoryId;
+
+drop table federated.t1;
+
+connection slave;
+drop table federated.t1;
 
 source include/federated_cleanup.inc;
diff --git a/sql/ha_federated.h b/sql/ha_federated.h
index 09c934cb493..9f24e92357c 100644
--- a/sql/ha_federated.h
+++ b/sql/ha_federated.h
@@ -37,6 +37,7 @@
 #define FEDERATED_QUERY_BUFFER_SIZE STRING_BUFFER_USUAL_SIZE * 5
 #define FEDERATED_RECORDS_IN_RANGE 2
 
+#define FEDERATED_MAX_KEY_LENGTH 3500 // Same as innodb
 #define FEDERATED_INFO " SHOW TABLE STATUS LIKE "
 #define FEDERATED_INFO_LEN sizeof(FEDERATED_INFO)
 #define FEDERATED_SELECT "SELECT "
@@ -217,7 +218,8 @@ public:
   uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
   uint max_supported_keys()          const { return MAX_KEY; }
   uint max_supported_key_parts()     const { return MAX_REF_PARTS; }
-  uint max_supported_key_length()    const { return MAX_KEY_LENGTH; }
+  uint max_supported_key_length()    const { return FEDERATED_MAX_KEY_LENGTH; }
+  uint max_supported_key_part_length() const { return FEDERATED_MAX_KEY_LENGTH; }
   /*
     Called in test_quick_select to determine if indexes should be used.
     Normally, we need to know number of blocks . For federated we need to

From 43a6c7804b926a24f13b63074b1ad8eec685ea39 Mon Sep 17 00:00:00 2001
From: unknown <istruewing@chilla.local>
Date: Wed, 18 Jul 2007 20:52:55 +0200
Subject: [PATCH 008/139] Post-merge fixes Fixed debug code of new query cache
 implementation.

---
 sql/sql_cache.cc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index cab9ef94d6d..39a7aebcc5d 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -878,10 +878,14 @@ ulong Query_cache::resize(ulong query_cache_size_arg)
   query_cache_size= query_cache_size_arg;
   ulong new_query_cache_size= init_cache();
 
-  DBUG_EXECUTE("check_querycache",check_integrity(0););
-
   STRUCT_LOCK(&structure_guard_mutex);
   m_cache_status= Query_cache::NO_FLUSH_IN_PROGRESS;
+  /*
+    Must not call check_integrity() with
+    m_cache_status != Query_cache::NO_FLUSH_IN_PROGRESS.
+    It would wait forever.
+  */
+  DBUG_EXECUTE("check_querycache",check_integrity(1););
   pthread_cond_signal(&COND_cache_status_changed);
   STRUCT_UNLOCK(&structure_guard_mutex);
 
@@ -4025,6 +4029,10 @@ my_bool Query_cache::check_integrity(bool locked)
   Query_cache_block * block = first_block;
   do
   {
+    /* When checking at system start, there is no block. */
+    if (!block)
+      break;
+
     DBUG_PRINT("qcache", ("block 0x%lx, type %u...", 
 			  (ulong) block, (uint) block->type));  
     // Check allignment

From 2486c23ca6d10b17365f8502f8bba10fe0bc2edd Mon Sep 17 00:00:00 2001
From: unknown <svoj@mysql.com/june.mysql.com>
Date: Thu, 19 Jul 2007 13:51:31 +0500
Subject: [PATCH 009/139] BUG#26325 - TEMPORARY TABLE "corrupt" after first
 read, according             to CHECK TABLE

CHECK/REPAIR TABLE reports "File not found" error when issued
against temporary table.

Fixed by disabling a brunch of code (in case it gets temporary table)
that is responsible for updating frm version as it is not needed
for temporary tables.


mysql-test/r/check.result:
  A test case for BUG#26325.
mysql-test/t/check.test:
  A test case for BUG#26325.
sql/handler.cc:
  No need to update frm version in case table was created or checked
  by server with the same version. This also ensures that we do not
  update frm version for temporary tables as this code doesn't support
  temporary tables.
---
 mysql-test/r/check.result | 8 ++++++++
 mysql-test/t/check.test   | 9 +++++++++
 sql/handler.cc            | 8 +++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/check.result b/mysql-test/r/check.result
index 60806e7393e..03219d0977e 100644
--- a/mysql-test/r/check.result
+++ b/mysql-test/r/check.result
@@ -14,3 +14,11 @@ test.v1	check	status	OK
 test.t2	check	status	OK
 drop view v1;
 drop table t1, t2;
+CREATE TEMPORARY TABLE t1(a INT);
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+REPAIR TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+DROP TABLE t1;
diff --git a/mysql-test/t/check.test b/mysql-test/t/check.test
index 8d9d70bd29a..698f6538529 100644
--- a/mysql-test/t/check.test
+++ b/mysql-test/t/check.test
@@ -36,3 +36,12 @@ Create view v1 as Select * from t1;
 Check Table v1,t2;
 drop view v1;
 drop table t1, t2;
+
+#
+# BUG#26325 - TEMPORARY TABLE "corrupt" after first read, according to CHECK
+#             TABLE
+#
+CREATE TEMPORARY TABLE t1(a INT);
+CHECK TABLE t1;
+REPAIR TABLE t1;
+DROP TABLE t1;
diff --git a/sql/handler.cc b/sql/handler.cc
index f8aec72ec90..dcc9fde8b76 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1997,7 +1997,13 @@ static bool update_frm_version(TABLE *table, bool needs_lock)
   int result= 1;
   DBUG_ENTER("update_frm_version");
 
-  if (table->s->mysql_version != MYSQL_VERSION_ID)
+  /*
+    No need to update frm version in case table was created or checked
+    by server with the same version. This also ensures that we do not
+    update frm version for temporary tables as this code doesn't support
+    temporary tables.
+  */
+  if (table->s->mysql_version == MYSQL_VERSION_ID)
     DBUG_RETURN(0);
 
   strxnmov(path, sizeof(path)-1, mysql_data_home, "/", table->s->db, "/",

From 36f1e4848ca0ddebe60b98286291057bb3d5e314 Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Thu, 19 Jul 2007 18:39:01 +0500
Subject: [PATCH 010/139] Fixed bug #29338. Optimization of queries with
 DETERMINISTIC functions in the WHERE clause was not effective: sequential
 scan was always used. Now a SF with the DETERMINISTIC flags is treated as
 constant when it's arguments are constants (or a SF doesn't has arguments).

sql/item_func.h:
  Fixed bug #29338.
  The Item_func_sp::used_tables has been removed
  (virtual Item_func::used_tables function is enough).
  The virtual Item_func_sp::update_used_tables function
  has been added.
sql/item_func.cc:
  Fixed bug #29338.
  The Item_func_sp::update_used_tables and the
  Item_func_sp::fix_field functions have been modified
  to take into account the DETERMINISTIC flag of SF definition.
mysql-test/r/sp.result:
  Updated test case for bug #29338.
mysql-test/t/sp.test:
  Updated test case for bug #29338.
---
 mysql-test/r/sp.result | 33 ++++++++++++++++++++++++++++++++-
 mysql-test/t/sp.test   | 32 +++++++++++++++++++++++++++++++-
 sql/item_func.cc       | 10 ++++++++++
 sql/item_func.h        |  2 +-
 4 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index b411c65faee..4321cd92826 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -1,5 +1,7 @@
 use test;
 drop table if exists t1,t2,t3,t4;
+drop function if exists f1;
+drop function if exists f2;
 create table t1 (
 id   char(16) not null default '',
 data int not null
@@ -6144,7 +6146,7 @@ drop table t1,t2;
 CREATE TABLE t1 (a int auto_increment primary key) engine=MyISAM;
 CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb;
 set @a=0;
-CREATE function bug27354() RETURNS int deterministic
+CREATE function bug27354() RETURNS int not deterministic
 begin
 insert into t1 values (null);
 set @a=@a+1;
@@ -6176,4 +6178,33 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 DROP VIEW v1;
 DROP FUNCTION metered;
 DROP TABLE t1;
+CREATE FUNCTION f1() RETURNS INT DETERMINISTIC RETURN 2;
+CREATE FUNCTION f2(I INT) RETURNS INT DETERMINISTIC RETURN 3;
+CREATE TABLE t1 (c1 INT, INDEX(c1));
+INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
+CREATE VIEW v1 AS SELECT c1 FROM t1;
+EXPLAIN SELECT * FROM t1 WHERE c1=1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ref	c1	c1	5	const	1	Using where; Using index
+EXPLAIN SELECT * FROM t1 WHERE c1=f1();
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ref	c1	c1	5	const	1	Using where; Using index
+EXPLAIN SELECT * FROM v1 WHERE c1=1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ref	c1	c1	5	const	1	Using where; Using index
+EXPLAIN SELECT * FROM v1 WHERE c1=f1();
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ref	c1	c1	5	const	1	Using where; Using index
+EXPLAIN SELECT * FROM t1 WHERE c1=f2(10);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ref	c1	c1	5	const	1	Using where; Using index
+EXPLAIN SELECT * FROM t1 WHERE c1=f2(c1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	index	NULL	c1	5	NULL	5	Using where; Using index
+EXPLAIN SELECT * FROM t1 WHERE c1=f2(rand());
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	index	NULL	c1	5	NULL	5	Using where; Using index
+DROP VIEW v1;
+DROP FUNCTION f1;
+DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 2f82482bdf7..aeb85ac6012 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -23,6 +23,8 @@ use test;
 #
 --disable_warnings
 drop table if exists t1,t2,t3,t4;
+drop function if exists f1;
+drop function if exists f2;
 --enable_warnings
 create table t1 (
 	id   char(16) not null default '',
@@ -7098,7 +7100,7 @@ CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb;
 set @a=0;
 
 delimiter |;
-CREATE function bug27354() RETURNS int deterministic
+CREATE function bug27354() RETURNS int not deterministic
 begin
 insert into t1 values (null);
 set @a=@a+1;
@@ -7134,5 +7136,33 @@ DROP VIEW v1;
 DROP FUNCTION metered;
 DROP TABLE t1;
 
+#
+# Bug #29338: no optimization for stored functions with a trivial body
+# always returning constant.
+#
+
+CREATE FUNCTION f1() RETURNS INT DETERMINISTIC RETURN 2;
+CREATE FUNCTION f2(I INT) RETURNS INT DETERMINISTIC RETURN 3;
+
+CREATE TABLE t1 (c1 INT, INDEX(c1));
+
+INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
+
+CREATE VIEW v1 AS SELECT c1 FROM t1;
+
+EXPLAIN SELECT * FROM t1 WHERE c1=1;
+EXPLAIN SELECT * FROM t1 WHERE c1=f1();
+
+EXPLAIN SELECT * FROM v1 WHERE c1=1;
+EXPLAIN SELECT * FROM v1 WHERE c1=f1();
+
+EXPLAIN SELECT * FROM t1 WHERE c1=f2(10);
+EXPLAIN SELECT * FROM t1 WHERE c1=f2(c1);
+EXPLAIN SELECT * FROM t1 WHERE c1=f2(rand());
+
+
+DROP VIEW v1;
+DROP FUNCTION f1;
+DROP TABLE t1;
 
 --echo End of 5.0 tests
diff --git a/sql/item_func.cc b/sql/item_func.cc
index b256ce4624a..e05f0a45083 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -5591,5 +5591,15 @@ Item_func_sp::fix_fields(THD *thd, Item **ref)
     
 #endif /* ! NO_EMBEDDED_ACCESS_CHECKS */
   }
+  if (!m_sp->m_chistics->detistic)
+   used_tables_cache |= RAND_TABLE_BIT;
   DBUG_RETURN(res);
 }
+
+
+void Item_func_sp::update_used_tables()
+{
+  Item_func::update_used_tables();
+  if (!m_sp->m_chistics->detistic)
+   used_tables_cache |= RAND_TABLE_BIT;
+}
diff --git a/sql/item_func.h b/sql/item_func.h
index 9a0201cb28b..56b5e75652c 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1467,7 +1467,7 @@ public:
   virtual ~Item_func_sp()
   {}
 
-  table_map used_tables() const { return RAND_TABLE_BIT; }
+  void update_used_tables();
 
   void cleanup();
 

From 4740e005a0bff2f89b484634adfcd25f34ba15d9 Mon Sep 17 00:00:00 2001
From: unknown <dkatz@damien-katzs-computer.local>
Date: Thu, 19 Jul 2007 15:25:54 -0400
Subject: [PATCH 011/139] Bug #29910  	Sporadic test failure in status.test

mysql-test/t/status.test:
  Fixed test to correctly wait for right server process and state.
---
 mysql-test/t/status.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test
index 1208393aa09..9fd54d4766d 100644
--- a/mysql-test/t/status.test
+++ b/mysql-test/t/status.test
@@ -22,13 +22,13 @@ connection con2;
 lock tables t1 read;
 unlock tables;
 lock tables t1 read;
-let $ID= `select connection_id()`;
 connection con1;
+let $ID= `select connection_id()`;
 --send
 update t1 set n = 3;
 connection con2;
 # wait for the other query to start executing
-let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID and STATE = 0;
+let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID and STATE = "Locked";
 --source include/wait_condition.inc
 unlock tables;
 connection con1;

From 28ec0efcb6810c98af5bfbeeaaf0bfa13343a874 Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Fri, 20 Jul 2007 11:23:38 +0500
Subject: [PATCH 012/139] Fixed #29923: federated.test fails in 5.0-maint,
 5.1-maint

Result adjusted.


mysql-test/r/federated.result:
  Fixed #29923: federated.test fails in 5.0-maint, 5.1-maint
    - result adjusted.
---
 mysql-test/r/federated.result | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index 076e165b21e..56522ba2f50 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -1878,6 +1878,8 @@ select categoryId from federated.t1 where domainId<>'a' and categoryName<>'b' or
 categoryId
 1
 2
+drop table federated.t1;
+drop table federated.t1;
 create table federated.t1 (a int primary key, b varchar(64))
 DEFAULT CHARSET=utf8;
 create table federated.t1 (a int primary key, b varchar(64))

From 30b0de253ca1509e1c14c85ea74d82ae33acaa9c Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Fri, 20 Jul 2007 11:45:08 +0500
Subject: [PATCH 013/139] after-merge fixup.

---
 mysql-test/r/federated.result | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index 966816ee19b..5c5cb7eaa79 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -1878,6 +1878,8 @@ select categoryId from federated.t1 where domainId<>'a' and categoryName<>'b' or
 categoryId
 1
 2
+drop table federated.t1;
+drop table federated.t1;
 create table federated.t1 (a int primary key, b varchar(64))
 DEFAULT CHARSET=utf8;
 create table federated.t1 (a int primary key, b varchar(64))

From 363a2f765c044e9442423692208d12635ec63eb0 Mon Sep 17 00:00:00 2001
From: unknown <svoj@mysql.com/june.mysql.com>
Date: Fri, 20 Jul 2007 13:27:12 +0500
Subject: [PATCH 014/139] BUG#28838 - duplicate external_lock in
 mysql_alter_table Fixed wrong test case. Added lost row that appeared after
 fix for this bug.

mysql-test/r/alter_table.result:
  Fixed wrong test case. Added lost row that appeared after fix for
  BUG#28838 - duplicate external_lock in mysql_alter_table.
---
 mysql-test/r/alter_table.result | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index a9c01f308f7..cc93eab0cd5 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -1030,6 +1030,7 @@ select * from t2;
 c
 NULL
 1
+Two
 Three
 lock table t2 write, t3 read;
 alter table t2 change c vc varchar(100) default "Four", rename to t1;
@@ -1046,6 +1047,7 @@ select * from t1;
 vc
 NULL
 1
+Two
 Three
 Four
 drop tables t1, t3;

From 866225919c303f36e83b6af10e3908bcb39bda62 Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Fri, 20 Jul 2007 15:19:37 +0500
Subject: [PATCH 015/139] after-merge fixup

---
 mysql-test/r/innodb_mysql.result | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index 9494a04f593..6bc3084cf6d 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -755,7 +755,7 @@ drop table t1,t2;
 create table t1(f1 varchar(800) binary not null, key(f1))
 character set utf8 collate utf8_general_ci;
 Warnings:
-Warning	1071	Specified key was too long; max key length is 765 bytes
+Warning	1071	Specified key was too long; max key length is 767 bytes
 insert into t1 values('aaa');
 drop table t1;
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c FLOAT, KEY b(b)) ENGINE = INNODB;
@@ -814,6 +814,19 @@ drop table if exists t1;
 create table t1 (a int) engine=innodb;
 alter table t1 alter a set default 1;
 drop table t1;
+create table t1(a text) engine=innodb default charset=utf8;
+insert into t1 values('aaa');
+alter table t1 add index(a(1024));
+Warnings:
+Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 767 bytes
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` text,
+  KEY `a` (`a`(255))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+drop table t1;
 End of 5.0 tests
 CREATE TABLE `t2` (
 `k` int(11) NOT NULL auto_increment,

From 3d2675ec3ecbe04e5f555b446858fa8ac78536e0 Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Fri, 20 Jul 2007 15:37:42 +0500
Subject: [PATCH 016/139] after-merge fixup

---
 mysql-test/r/innodb_mysql.result | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index f44ce5b5122..a7f6b0ad9d7 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -735,6 +735,10 @@ COUNT(*)
 3072
 set @@sort_buffer_size=default;
 DROP TABLE t1,t2;
+drop table if exists t1;
+create table t1 (a int) engine=innodb;
+alter table t1 alter a set default 1;
+drop table t1;
 create table t1(a text) engine=innodb default charset=utf8;
 insert into t1 values('aaa');
 alter table t1 add index(a(1024));
@@ -746,8 +750,5 @@ t1	CREATE TABLE `t1` (
   `a` text,
   KEY `a` (`a`(255))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
-drop table if exists t1;
-create table t1 (a int) engine=innodb;
-alter table t1 alter a set default 1;
 drop table t1;
 End of 5.0 tests

From 1a2d2117ffcd9641ed472039f29c8996023e7b60 Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Fri, 20 Jul 2007 16:05:55 +0500
Subject: [PATCH 017/139] Bug #29494 Field packet with NULL fields crashes
 libmysqlclient.

unpack_fields() didn't expect NULL_LENGHT in the field's descriptions.
In this case we get NULL in the resulting string so cannot use
strdup_root to make a copy of it.
strdup_root changed with strmake_root as it's NULL-safe


sql-common/client.c:
  Bug #29494 Field packet with NULL fields crashes libmysqlclient

  strdup_root changed with strmake_root in unpack_fields()
---
 sql-common/client.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sql-common/client.c b/sql-common/client.c
index 431c1bdf418..bf9c7252283 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1176,12 +1176,12 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
       /* fields count may be wrong */
       DBUG_ASSERT ((field - result) < fields);
       cli_fetch_lengths(&lengths[0], row->data, default_value ? 8 : 7);
-      field->catalog  = strdup_root(alloc,(char*) row->data[0]);
-      field->db       = strdup_root(alloc,(char*) row->data[1]);
-      field->table    = strdup_root(alloc,(char*) row->data[2]);
-      field->org_table= strdup_root(alloc,(char*) row->data[3]);
-      field->name     = strdup_root(alloc,(char*) row->data[4]);
-      field->org_name = strdup_root(alloc,(char*) row->data[5]);
+      field->catalog=   strmake_root(alloc,(char*) row->data[0], lengths[0]);
+      field->db=        strmake_root(alloc,(char*) row->data[1], lengths[1]);
+      field->table=     strmake_root(alloc,(char*) row->data[2], lengths[2]);
+      field->org_table= strmake_root(alloc,(char*) row->data[3], lengths[3]);
+      field->name=      strmake_root(alloc,(char*) row->data[4], lengths[4]);
+      field->org_name=  strmake_root(alloc,(char*) row->data[5], lengths[5]);
 
       field->catalog_length=	lengths[0];
       field->db_length=		lengths[1];
@@ -1202,7 +1202,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
         field->flags|= NUM_FLAG;
       if (default_value && row->data[7])
       {
-        field->def=strdup_root(alloc,(char*) row->data[7]);
+        field->def=strmake_root(alloc,(char*) row->data[7], lengths[7]);
 	field->def_length= lengths[7];
       }
       else

From eea5c2a3c5968c458d872484d9afe9ca228e6700 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Fri, 20 Jul 2007 14:17:15 +0300
Subject: [PATCH 018/139] Bug #29644: alter table hangs if records locked in
 share mode by long running transaction

On Windows opened files can't be deleted. There was a special
upgraded lock mode (TL_WRITE instead of TL_WRITE_ALLOW_READ)
in ALTER TABLE to make sure nobody has the table opened
when deleting the old table in ALTER TABLE. This special mode
was causing ALTER TABLE to hang waiting on a lock inside InnoDB.
This special lock is no longer necessary as the server is
closing the tables it needs to delete in ALTER TABLE.
Fixed by removing the special lock.
Note that this also reverses the fix for bug 17264 that deals with
another consequence of this special lock mode being used.


mysql-test/r/innodb_mysql.result:
  Bug #29644: test case
mysql-test/t/innodb_mysql.test:
  Bug #29644: test case
sql/ha_innodb.cc:
  Bug #29644: reverse the (now excessive) fix
  for bug 17264 (but leave the test case).
sql/sql_base.cc:
  Bug #29644: don't need a special lock mode for Win32 anymore:
  the table is closed before the drop.
---
 mysql-test/r/innodb_mysql.result | 23 ++++++++++++++
 mysql-test/t/innodb_mysql.test   | 51 ++++++++++++++++++++++++++++++++
 sql/ha_innodb.cc                 | 11 -------
 sql/sql_base.cc                  |  7 -----
 4 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index 4535710c905..1cb9563216b 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -735,4 +735,27 @@ COUNT(*)
 3072
 set @@sort_buffer_size=default;
 DROP TABLE t1,t2;
+CREATE TABLE t1 (a INT, PRIMARY KEY (a)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+INSERT INTO t1 SELECT a + 8  FROM t1;
+INSERT INTO t1 SELECT a + 16 FROM t1;
+CREATE PROCEDURE p1 ()
+BEGIN
+DECLARE i INT DEFAULT 50;
+DECLARE cnt INT;
+START TRANSACTION;
+ALTER TABLE t1 ENGINE=InnoDB;
+COMMIT;
+START TRANSACTION;
+WHILE (i > 0) DO
+SET i = i - 1;
+SELECT COUNT(*) INTO cnt FROM t1 LOCK IN SHARE MODE;
+END WHILE;
+COMMIT;
+END;|
+CALL p1();
+CALL p1();
+CALL p1();
+DROP PROCEDURE p1;
+DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test
index d4ce997ddb1..a8724d2e7d5 100644
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
@@ -741,4 +741,55 @@ set @@sort_buffer_size=default;
 
 DROP TABLE t1,t2;
 
+#
+# Bug #29644: alter table hangs if records locked in share mode by long
+# running transaction
+#
+
+CREATE TABLE t1 (a INT, PRIMARY KEY (a)) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+INSERT INTO t1 SELECT a + 8  FROM t1;
+INSERT INTO t1 SELECT a + 16 FROM t1;
+
+DELIMITER |;
+CREATE PROCEDURE p1 ()
+BEGIN
+  DECLARE i INT DEFAULT 50;
+  DECLARE cnt INT;
+  START TRANSACTION;
+    ALTER TABLE t1 ENGINE=InnoDB;
+  COMMIT;
+  START TRANSACTION;
+  WHILE (i > 0) DO
+    SET i = i - 1;
+    SELECT COUNT(*) INTO cnt FROM t1 LOCK IN SHARE MODE;
+  END WHILE;
+  COMMIT;
+END;|
+
+DELIMITER ;|
+
+CONNECT (con1,localhost,root,,);
+CONNECT (con2,localhost,root,,);
+
+CONNECTION con1;
+SEND CALL p1();
+CONNECTION con2;
+SEND CALL p1();
+CONNECTION default;
+CALL p1();
+
+CONNECTION con1;
+REAP;
+CONNECTION con2;
+REAP;
+CONNECTION default;
+DISCONNECT con1;
+DISCONNECT con2;
+
+DROP PROCEDURE p1;
+DROP TABLE t1;
+
+
 --echo End of 5.0 tests
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index a3676bd7e1b..0177829614d 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -6702,17 +6702,6 @@ ha_innobase::store_lock(
 		    && !thd->tablespace_op
 		    && thd->lex->sql_command != SQLCOM_TRUNCATE
 		    && thd->lex->sql_command != SQLCOM_OPTIMIZE
-
-#ifdef __WIN__
-                /* For alter table on win32 for succesful operation
-                completion it is used TL_WRITE(=10) lock instead of
-                TL_WRITE_ALLOW_READ(=6), however here in innodb handler
-                TL_WRITE is lifted to TL_WRITE_ALLOW_WRITE, which causes
-                race condition when several clients do alter table
-                simultaneously (bug #17264). This fix avoids the problem. */
-		    && thd->lex->sql_command != SQLCOM_ALTER_TABLE
-#endif
-
 		    && thd->lex->sql_command != SQLCOM_CREATE_TABLE) {
 
 			lock_type = TL_WRITE_ALLOW_WRITE;
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index ed006714143..e633b548a08 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2938,13 +2938,6 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type)
 
   if (table)
   {
-#if defined( __WIN__) || defined(OS2)
-    /* Win32 can't drop a file that is open */
-    if (lock_type == TL_WRITE_ALLOW_READ)
-    {
-      lock_type= TL_WRITE;
-    }
-#endif /* __WIN__ || OS2 */
     table_list->lock_type= lock_type;
     table_list->table=	   table;
     table->grant= table_list->grant;

From 95a8c6c327a477c3bcaf67ba6acf7f48bbab4158 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Fri, 20 Jul 2007 21:05:29 +0300
Subject: [PATCH 019/139] Bug #28591: MySQL need not sort the records in case
 of ORDER BY primary_key on InnoDB table

Queries that use an InnoDB secondary index to retrieve
data don't need to sort in case of ORDER BY primary key
if the secondary index is compared to constant(s).
They can also skip sorting if ORDER BY contains both the
the secondary key parts and the primary key parts (in
that order).
This is because InnoDB returns the rows in order of the
primary key for rows with the same values of the secondary
key columns.
Fixed by preventing temp table sort for the qualifying
queries.


mysql-test/r/innodb_mysql.result:
  Bug #28591: test case
mysql-test/t/innodb_mysql.test:
  Bug #28591: test case
sql/sql_select.cc:
  Bug #28591: Use the primary key as suffix when testing
  if the key can be used for ORDER BY on supporting engines.
sql/table.cc:
  Bug #28591: can use the primary key
  as a suffix for the secondary keys
---
 mysql-test/r/innodb_mysql.result | 245 +++++++++++++++++++++++++++++++
 mysql-test/t/innodb_mysql.test   |  33 +++++
 sql/sql_select.cc                |  29 +++-
 sql/table.cc                     |   4 +
 4 files changed, 309 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index 4535710c905..28f53a628ee 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -735,4 +735,249 @@ COUNT(*)
 3072
 set @@sort_buffer_size=default;
 DROP TABLE t1,t2;
+CREATE TABLE t1 (a int, b int, PRIMARY KEY (a), KEY bkey (b)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,2),(3,2),(2,2),(4,2),(5,2),(6,2),(7,2),(8,2);
+INSERT INTO t1 SELECT a + 8, 2 FROM t1;
+INSERT INTO t1 SELECT a + 16, 1 FROM t1;
+EXPLAIN SELECT * FROM t1 WHERE b=2 ORDER BY a;
+id	1
+select_type	SIMPLE
+table	t1
+type	ref
+possible_keys	bkey
+key	bkey
+key_len	5
+ref	const
+rows	16
+Extra	Using where; Using index
+SELECT * FROM t1 WHERE b=2 ORDER BY a;
+a	b
+1	2
+2	2
+3	2
+4	2
+5	2
+6	2
+7	2
+8	2
+9	2
+10	2
+11	2
+12	2
+13	2
+14	2
+15	2
+16	2
+EXPLAIN SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;
+id	1
+select_type	SIMPLE
+table	t1
+type	range
+possible_keys	bkey
+key	bkey
+key_len	5
+ref	NULL
+rows	16
+Extra	Using where; Using index; Using filesort
+SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;
+a	b
+1	2
+2	2
+3	2
+4	2
+5	2
+6	2
+7	2
+8	2
+9	2
+10	2
+11	2
+12	2
+13	2
+14	2
+15	2
+16	2
+17	1
+18	1
+19	1
+20	1
+21	1
+22	1
+23	1
+24	1
+25	1
+26	1
+27	1
+28	1
+29	1
+30	1
+31	1
+32	1
+EXPLAIN SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY b,a;
+id	1
+select_type	SIMPLE
+table	t1
+type	range
+possible_keys	bkey
+key	bkey
+key_len	5
+ref	NULL
+rows	16
+Extra	Using where; Using index
+SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY b,a;
+a	b
+17	1
+18	1
+19	1
+20	1
+21	1
+22	1
+23	1
+24	1
+25	1
+26	1
+27	1
+28	1
+29	1
+30	1
+31	1
+32	1
+1	2
+2	2
+3	2
+4	2
+5	2
+6	2
+7	2
+8	2
+9	2
+10	2
+11	2
+12	2
+13	2
+14	2
+15	2
+16	2
+CREATE TABLE t2 (a int, b int, c int, PRIMARY KEY (a), KEY bkey (b,c))
+ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1,1,1),(3,1,1),(2,1,1),(4,1,1);
+INSERT INTO t2 SELECT a + 4, 1, 1 FROM t2;
+INSERT INTO t2 SELECT a + 8, 1, 1 FROM t2;
+EXPLAIN SELECT * FROM t2 WHERE b=1 ORDER BY a;
+id	1
+select_type	SIMPLE
+table	t2
+type	ref
+possible_keys	bkey
+key	bkey
+key_len	5
+ref	const
+rows	8
+Extra	Using where; Using index; Using filesort
+SELECT * FROM t2 WHERE b=1 ORDER BY a;
+a	b	c
+1	1	1
+2	1	1
+3	1	1
+4	1	1
+5	1	1
+6	1	1
+7	1	1
+8	1	1
+9	1	1
+10	1	1
+11	1	1
+12	1	1
+13	1	1
+14	1	1
+15	1	1
+16	1	1
+EXPLAIN SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY a;
+id	1
+select_type	SIMPLE
+table	t2
+type	ref
+possible_keys	bkey
+key	bkey
+key_len	10
+ref	const,const
+rows	8
+Extra	Using where; Using index
+SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY a;
+a	b	c
+1	1	1
+2	1	1
+3	1	1
+4	1	1
+5	1	1
+6	1	1
+7	1	1
+8	1	1
+9	1	1
+10	1	1
+11	1	1
+12	1	1
+13	1	1
+14	1	1
+15	1	1
+16	1	1
+EXPLAIN SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY b,c,a;
+id	1
+select_type	SIMPLE
+table	t2
+type	ref
+possible_keys	bkey
+key	bkey
+key_len	10
+ref	const,const
+rows	8
+Extra	Using where; Using index
+SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY b,c,a;
+a	b	c
+1	1	1
+2	1	1
+3	1	1
+4	1	1
+5	1	1
+6	1	1
+7	1	1
+8	1	1
+9	1	1
+10	1	1
+11	1	1
+12	1	1
+13	1	1
+14	1	1
+15	1	1
+16	1	1
+EXPLAIN SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY c,a;
+id	1
+select_type	SIMPLE
+table	t2
+type	ref
+possible_keys	bkey
+key	bkey
+key_len	10
+ref	const,const
+rows	8
+Extra	Using where; Using index
+SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY c,a;
+a	b	c
+1	1	1
+2	1	1
+3	1	1
+4	1	1
+5	1	1
+6	1	1
+7	1	1
+8	1	1
+9	1	1
+10	1	1
+11	1	1
+12	1	1
+13	1	1
+14	1	1
+15	1	1
+16	1	1
+DROP TABLE t1,t2;
 End of 5.0 tests
diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test
index d4ce997ddb1..9a44c673548 100644
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
@@ -741,4 +741,37 @@ set @@sort_buffer_size=default;
 
 DROP TABLE t1,t2;
 
+#
+# Bug #28591: MySQL need not sort the records in case of ORDER BY
+# primary_key on InnoDB table
+#
+
+CREATE TABLE t1 (a int, b int, PRIMARY KEY (a), KEY bkey (b)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,2),(3,2),(2,2),(4,2),(5,2),(6,2),(7,2),(8,2);
+INSERT INTO t1 SELECT a + 8, 2 FROM t1;
+INSERT INTO t1 SELECT a + 16, 1 FROM t1;
+query_vertical EXPLAIN SELECT * FROM t1 WHERE b=2 ORDER BY a;
+SELECT * FROM t1 WHERE b=2 ORDER BY a;
+query_vertical EXPLAIN SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;
+SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;
+query_vertical EXPLAIN SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY b,a;
+SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY b,a;
+
+CREATE TABLE t2 (a int, b int, c int, PRIMARY KEY (a), KEY bkey (b,c))
+  ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1,1,1),(3,1,1),(2,1,1),(4,1,1);
+INSERT INTO t2 SELECT a + 4, 1, 1 FROM t2;
+INSERT INTO t2 SELECT a + 8, 1, 1 FROM t2;
+
+query_vertical EXPLAIN SELECT * FROM t2 WHERE b=1 ORDER BY a;
+SELECT * FROM t2 WHERE b=1 ORDER BY a;
+query_vertical EXPLAIN SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY a;
+SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY a;
+query_vertical EXPLAIN SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY b,c,a;
+SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY b,c,a;
+query_vertical EXPLAIN SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY c,a;
+SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY c,a;
+
+DROP TABLE t1,t2;
+
 --echo End of 5.0 tests
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c62a19b2752..c77fb341232 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -12009,6 +12009,7 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
   key_part_end=key_part+table->key_info[idx].key_parts;
   key_part_map const_key_parts=table->const_key_parts[idx];
   int reverse=0;
+  my_bool on_primary_key= FALSE;
   DBUG_ENTER("test_if_order_by_key");
 
   for (; order ; order=order->next, const_key_parts>>=1)
@@ -12023,7 +12024,30 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
     for (; const_key_parts & 1 ; const_key_parts>>= 1)
       key_part++; 
 
-    if (key_part == key_part_end || key_part->field != field)
+    if (key_part == key_part_end)
+    {
+      /* 
+        We are at the end of the key. Check if the engine has the primary
+        key as a suffix to the secondary keys. If it has continue to check
+        the primary key as a suffix.
+      */
+      if (!on_primary_key &&
+          (table->file->table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
+          table->s->primary_key != MAX_KEY)
+      {
+        on_primary_key= TRUE;
+        key_part= table->key_info[table->s->primary_key].key_part;
+        key_part_end=key_part+table->key_info[table->s->primary_key].key_parts;
+        const_key_parts=table->const_key_parts[table->s->primary_key];
+
+        for (; const_key_parts & 1 ; const_key_parts>>= 1)
+          key_part++; 
+      }
+      else
+        DBUG_RETURN(0);
+    }
+
+    if (key_part->field != field)
       DBUG_RETURN(0);
 
     /* set flag to 1 if we can use read-next on key, else to -1 */
@@ -12034,7 +12058,8 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
     reverse=flag;				// Remember if reverse
     key_part++;
   }
-  *used_key_parts= (uint) (key_part - table->key_info[idx].key_part);
+  *used_key_parts= on_primary_key ? table->key_info[idx].key_parts :
+    (uint) (key_part - table->key_info[idx].key_part);
   if (reverse == -1 && !(table->file->index_flags(idx, *used_key_parts-1, 1) &
                          HA_READ_PREV))
     reverse= 0;                                 // Index can't be used
diff --git a/sql/table.cc b/sql/table.cc
index 4e0f2b5d287..8cfd206a74f 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -780,7 +780,11 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
 	      the primary key, then we can use any key to find this column
 	    */
 	    if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX)
+            {
 	      field->part_of_key= share->keys_in_use;
+              if (field->part_of_sortkey.is_set(key))
+                field->part_of_sortkey= share->keys_in_use;
+            }
 	  }
 	  if (field->key_length() != key_part->length)
 	  {

From 0fe79d23c01b91bb5381199f40648d8d836dca9a Mon Sep 17 00:00:00 2001
From: unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org>
Date: Fri, 20 Jul 2007 11:35:19 -0700
Subject: [PATCH 020/139] Bug#29875   "Disable transaction support in Federated
 storage engine"   Minimal patch to disable Federated's transactions until
 they can be fixed.

mysql-test/r/federated.result:
  verify that transactions are disabled
mysql-test/t/disabled.def:
  bug29875
    disable federated_transactions test until Bug#29523 is resolved.
mysql-test/t/federated.test:
  verify that transactions are disabled
storage/federated/ha_federated.cc:
  bug29875
    Disable support for transactions until fixed.
storage/federated/ha_federated.h:
  bug29875
    Disable support for transactions until fixed.
---
 mysql-test/r/federated.result     | 22 ++++++++++++++++++++++
 mysql-test/t/disabled.def         |  1 +
 mysql-test/t/federated.test       | 26 ++++++++++++++++++++++++++
 storage/federated/ha_federated.cc | 12 ++++++++++++
 storage/federated/ha_federated.h  |  1 +
 5 files changed, 62 insertions(+)

diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index 42228fac2c9..690cc803608 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -1882,6 +1882,28 @@ a	b
 2	Curly
 drop table federated.t1;
 drop table federated.t1;
+CREATE TABLE federated.t1 (a INT PRIMARY KEY) DEFAULT CHARSET=utf8;
+CREATE TABLE federated.t1 (a INT PRIMARY KEY)
+ENGINE=FEDERATED
+CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'
+  DEFAULT CHARSET=utf8;
+SELECT transactions FROM information_schema.engines WHERE engine="FEDERATED";
+transactions
+NO
+INSERT INTO federated.t1 VALUES (1);
+SET autocommit=0;
+INSERT INTO federated.t1 VALUES (2);
+ROLLBACK;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
+SET autocommit=1;
+SELECT * FROM federated.t1;
+a
+1
+2
+DROP TABLE federated.t1;
+DROP TABLE federated.t1;
+End of 5.1 tests
 DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
 DROP TABLE IF EXISTS federated.t1;
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 07c5b4d56a3..14b6979dd19 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -25,4 +25,5 @@ ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Do
 
 mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
 federated_innodb     : Bug#29522 failed assertion in binlog_close_connection()
+federated_transactions   : Bug#29523 Transactions do not work
 lowercase_table3     : Bug#29839 2007-07-17 ingo Cannot find table test/T1 from the internal data dictionary
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index fa65568e9cc..d54934a2e73 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -1683,4 +1683,30 @@ connection slave;
 drop table federated.t1;
 
 
+#
+# BUG#29875 Disable support for transactions
+#
+connection slave;
+CREATE TABLE federated.t1 (a INT PRIMARY KEY) DEFAULT CHARSET=utf8;
+connection master;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval CREATE TABLE federated.t1 (a INT PRIMARY KEY)
+  ENGINE=FEDERATED
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'
+  DEFAULT CHARSET=utf8;
+
+SELECT transactions FROM information_schema.engines WHERE engine="FEDERATED";
+INSERT INTO federated.t1 VALUES (1);
+SET autocommit=0;
+INSERT INTO federated.t1 VALUES (2);
+ROLLBACK;
+SET autocommit=1;
+SELECT * FROM federated.t1;
+
+DROP TABLE federated.t1;
+connection slave;
+DROP TABLE federated.t1;
+
+--echo End of 5.1 tests
+
 source include/federated_cleanup.inc;
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 635a6fa79e0..2c9d692bb5b 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -449,6 +449,13 @@ int federated_db_init(void *p)
   federated_hton->create= federated_create_handler;
   federated_hton->flags= HTON_ALTER_NOT_SUPPORTED | HTON_NO_PARTITION;
 
+  /*
+    Support for transactions disabled until WL#2952 fixes it.
+	We do it like this to avoid "defined but not used" compiler warnings.
+  */
+  federated_hton->commit= 0;
+  federated_hton->rollback= 0;
+
   if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
     goto error;
   if (!hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0,
@@ -3163,6 +3170,10 @@ int ha_federated::external_lock(THD *thd, int lock_type)
   ha_federated *trx= (ha_federated *)thd->ha_data[ht->slot];
   DBUG_ENTER("ha_federated::external_lock");
 
+  /*
+    Support for transactions disabled until WL#2952 fixes it.
+  */
+#ifdef XXX_SUPERCEDED_BY_WL2952
   if (lock_type != F_UNLCK)
   {
     DBUG_PRINT("info",("federated not lock F_UNLCK"));
@@ -3216,6 +3227,7 @@ int ha_federated::external_lock(THD *thd, int lock_type)
       }
     }
   }
+#endif /* XXX_SUPERCEDED_BY_WL2952 */
   DBUG_RETURN(0);
 }
 
diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h
index 3443194817b..b6c99f4d3aa 100644
--- a/storage/federated/ha_federated.h
+++ b/storage/federated/ha_federated.h
@@ -141,6 +141,7 @@ public:
             | HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_CAN_INDEX_BLOBS |
             HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE |
             HA_NO_PREFIX_CHAR_KEYS | HA_PRIMARY_KEY_REQUIRED_FOR_DELETE |
+            HA_NO_TRANSACTIONS /* until fixed by WL#2952 */ |
             HA_PARTIAL_COLUMN_READ | HA_NULL_IN_KEY);
   }
   /*

From b012fca45adaadf00427a2e6761f85f5e8c0af6c Mon Sep 17 00:00:00 2001
From: unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org>
Date: Fri, 20 Jul 2007 14:01:37 -0700
Subject: [PATCH 021/139] silence two 'unused variable' warnings

---
 storage/federated/ha_federated.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 2c9d692bb5b..67dc37a8ff2 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -3167,7 +3167,6 @@ bool ha_federated::get_error_message(int error, String* buf)
 int ha_federated::external_lock(THD *thd, int lock_type)
 {
   int error= 0;
-  ha_federated *trx= (ha_federated *)thd->ha_data[ht->slot];
   DBUG_ENTER("ha_federated::external_lock");
 
   /*
@@ -3176,6 +3175,8 @@ int ha_federated::external_lock(THD *thd, int lock_type)
 #ifdef XXX_SUPERCEDED_BY_WL2952
   if (lock_type != F_UNLCK)
   {
+    ha_federated *trx= (ha_federated *)thd->ha_data[ht->slot];
+
     DBUG_PRINT("info",("federated not lock F_UNLCK"));
     if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) 
     {
@@ -3228,7 +3229,7 @@ int ha_federated::external_lock(THD *thd, int lock_type)
     }
   }
 #endif /* XXX_SUPERCEDED_BY_WL2952 */
-  DBUG_RETURN(0);
+  DBUG_RETURN(error);
 }
 
 

From cff531ffc104179679648ee8b83f1ea74b7b376c Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Sat, 21 Jul 2007 04:50:11 +0500
Subject: [PATCH 022/139] Fixed bug #29788. After dumping triggers mysqldump
 copied the value of the OLD_SQL_MODE variable to the SQL_MODE variable. If
 the --compact option of the mysqldump was not set the OLD_SQL_MODE variable
 had the value of the uninitialized SQL_MODE variable. So usually the
 NO_AUTO_VALUE_ON_ZERO option of the SQL_MODE variable was discarded.

This fix is for non-"--compact" mode of the mysqldump,
because mysqldump --compact never set SQL_MODE to the
value of NO_AUTO_VALUE_ON_ZERO.

The dump_triggers_for_table function has been modified
to restore previous value of the SQL_MODE variable after
dumping triggers using the SAVE_SQL_MODE temporary
variable.


client/mysqldump.c:
  Fixed bug #29788.
  The dump_triggers_for_table function has been modified
  to restore previous value of the SQL_MODE variable after
  dumping triggers using the SAVE_SQL_MODE temporary
  variable.
mysql-test/r/mysqldump.result:
  Updated test case for bug #29788.
mysql-test/t/mysqldump.test:
  Updated test case for bug #29788.
---
 client/mysqldump.c            |  7 ++++---
 mysql-test/r/mysqldump.result | 38 +++++++++++++++++++++++++++++++----
 mysql-test/t/mysqldump.test   | 22 ++++++++++++++++++++
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/client/mysqldump.c b/client/mysqldump.c
index f72cb0171e1..9ccea308a1f 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2122,8 +2122,7 @@ static void dump_triggers_for_table(char *table,
   }
   if (mysql_num_rows(result))
   {
-    if (opt_compact)
-      fprintf(sql_file, "\n/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;\n");
+    fprintf(sql_file, "\n/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;\n");
     fprintf(sql_file, "\nDELIMITER ;;\n");
   }
   while ((row= mysql_fetch_row(result)))
@@ -2167,9 +2166,11 @@ static void dump_triggers_for_table(char *table,
             row[3] /* Statement */);
   }
   if (mysql_num_rows(result))
+  {
     fprintf(sql_file,
             "DELIMITER ;\n"
-            "/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;\n");
+            "/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;\n");
+  }
   mysql_free_result(result);
   /*
     make sure to set back opt_compatible mode to
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index da05fe7bc5b..7178cbb5d49 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -2238,6 +2238,8 @@ INSERT INTO `t1` VALUES (1,NULL),(2,NULL),(4,NULL),(11,NULL);
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 
+/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;
+
 DELIMITER ;;
 /*!50003 SET SESSION SQL_MODE="" */;;
 /*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `trg1` BEFORE INSERT ON `t1` FOR EACH ROW begin
@@ -2260,7 +2262,7 @@ end if;
 end */;;
 
 DELIMITER ;
-/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;
+/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;
 DROP TABLE IF EXISTS `t2`;
 CREATE TABLE `t2` (
   `a` int(11) default NULL
@@ -2271,6 +2273,8 @@ LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 UNLOCK TABLES;
 
+/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;
+
 DELIMITER ;;
 /*!50003 SET SESSION SQL_MODE="STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER" */;;
 /*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `trg4` BEFORE INSERT ON `t2` FOR EACH ROW begin
@@ -2280,7 +2284,7 @@ end if;
 end */;;
 
 DELIMITER ;
-/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;
+/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -2628,13 +2632,15 @@ INSERT INTO "t1 test" VALUES (1),(2),(3);
 /*!40000 ALTER TABLE "t1 test" ENABLE KEYS */;
 UNLOCK TABLES;
 
+/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;
+
 DELIMITER ;;
 /*!50003 SET SESSION SQL_MODE="" */;;
 /*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `test trig` BEFORE INSERT ON `t1 test` FOR EACH ROW BEGIN
 INSERT INTO `t2 test` SET a2 = NEW.a1; END */;;
 
 DELIMITER ;
-/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;
+/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;
 DROP TABLE IF EXISTS "t2 test";
 CREATE TABLE "t2 test" (
   "a2" int(11) default NULL
@@ -2788,6 +2794,8 @@ LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 
+/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;
+
 DELIMITER ;;
 /*!50003 SET SESSION SQL_MODE="IGNORE_SPACE" */;;
 /*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `tr1` BEFORE INSERT ON `t1` FOR EACH ROW BEGIN
@@ -2795,7 +2803,7 @@ SET new.a = 0;
 END */;;
 
 DELIMITER ;
-/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;
+/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -3334,5 +3342,27 @@ SELECT * FROM v1;
 1
 DROP VIEW v1;
 #
+# Bug #29788: mysqldump discards the NO_AUTO_VALUE_ON_ZERO value of
+#             the SQL_MODE variable after the dumping of triggers.
+#
+CREATE TABLE t1 (c1 INT);
+CREATE TRIGGER t1bd BEFORE DELETE ON t1 FOR EACH ROW BEGIN END;
+CREATE TABLE t2 (c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
+SET @TMP_SQL_MODE = @@SQL_MODE;
+SET SQL_MODE = 'NO_AUTO_VALUE_ON_ZERO';
+INSERT INTO t2 VALUES (0), (1), (2);
+SET SQL_MODE = @TMP_SQL_MODE;
+SELECT * FROM t2;
+c1
+0
+1
+2
+SELECT * FROM t2;
+c1
+0
+1
+2
+DROP TABLE t1,t2;
+#
 # End of 5.0 tests
 #
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index d42162541de..3c62577e781 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1554,6 +1554,28 @@ DROP VIEW v1;
 SELECT * FROM v1;
 DROP VIEW v1;
 
+--echo #
+--echo # Bug #29788: mysqldump discards the NO_AUTO_VALUE_ON_ZERO value of
+--echo #             the SQL_MODE variable after the dumping of triggers.
+--echo #
+
+CREATE TABLE t1 (c1 INT);
+CREATE TRIGGER t1bd BEFORE DELETE ON t1 FOR EACH ROW BEGIN END;
+
+CREATE TABLE t2 (c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
+
+SET @TMP_SQL_MODE = @@SQL_MODE;
+SET SQL_MODE = 'NO_AUTO_VALUE_ON_ZERO';
+INSERT INTO t2 VALUES (0), (1), (2);
+SET SQL_MODE = @TMP_SQL_MODE;
+SELECT * FROM t2;
+
+--exec $MYSQL_DUMP --routines test >$MYSQLTEST_VARDIR/tmp/bug29788.sql
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug29788.sql
+SELECT * FROM t2;
+
+DROP TABLE t1,t2;
+
 --echo #
 --echo # End of 5.0 tests
 --echo #

From 72c6c789cf206977894fc531ada2c253bc0b1806 Mon Sep 17 00:00:00 2001
From: unknown <igor@olga.mysql.com>
Date: Fri, 20 Jul 2007 22:56:19 -0700
Subject: [PATCH 023/139] Fixed bug #29911. This bug manifested itself for join
 queries with GROUP BY and HAVING clauses whose SELECT lists contained
 DISTINCT. It occurred when the optimizer could deduce that the result set
 would have not more than one row. The bug could lead to wrong result sets for
 queries of this type because HAVING conditions were erroneously ignored in
 some cases in the function remove_duplicates.

mysql-test/r/having.result:
  Added a test case for bug #29911.
mysql-test/t/having.test:
  Added a test case for bug #29911.
---
 mysql-test/r/having.result | 19 +++++++++++++++++++
 mysql-test/t/having.test   | 26 ++++++++++++++++++++++++++
 sql/sql_select.cc          |  2 +-
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/having.result b/mysql-test/r/having.result
index ccd1f0e61e7..7b4340a133b 100644
--- a/mysql-test/r/having.result
+++ b/mysql-test/r/having.result
@@ -158,3 +158,22 @@ EXPLAIN SELECT 0 AS x, a FROM t1 GROUP BY x,a HAVING x=1 AND a > 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible HAVING
 DROP table t1;
+CREATE TABLE t1 (a int PRIMARY KEY);
+CREATE TABLE t2 (b int PRIMARY KEY, a int);
+CREATE TABLE t3 (b int, flag int);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1,1), (2,1), (3,1);
+INSERT INTO t3(b,flag) VALUES (2, 1);
+SELECT t1.a
+FROM t1 INNER JOIN t2 ON t1.a=t2.a LEFT JOIN t3 ON t2.b=t3.b
+GROUP BY t1.a, t2.b HAVING MAX(t3.flag)=0;
+a
+SELECT DISTINCT t1.a, MAX(t3.flag)
+FROM t1 INNER JOIN t2 ON t1.a=t2.a LEFT JOIN t3 ON t2.b=t3.b
+GROUP BY t1.a, t2.b HAVING MAX(t3.flag)=0;
+a	MAX(t3.flag)
+SELECT DISTINCT t1.a
+FROM t1 INNER JOIN t2 ON t1.a=t2.a LEFT JOIN t3 ON t2.b=t3.b
+GROUP BY t1.a, t2.b HAVING MAX(t3.flag)=0;
+a
+DROP TABLE t1,t2,t3;
diff --git a/mysql-test/t/having.test b/mysql-test/t/having.test
index 8b39e3bd454..c0ce3cbace7 100644
--- a/mysql-test/t/having.test
+++ b/mysql-test/t/having.test
@@ -151,4 +151,30 @@ EXPLAIN SELECT 0 AS x, a FROM t1 GROUP BY x,a HAVING x=1 AND a > 1;
 
 DROP table t1;  
 
+#
+# Bug #29911: HAVING clause depending on constant table and evaluated to false
+#
+
+CREATE TABLE t1 (a int PRIMARY KEY);
+CREATE TABLE t2 (b int PRIMARY KEY, a int);
+CREATE TABLE t3 (b int, flag int);
+
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1,1), (2,1), (3,1);
+INSERT INTO t3(b,flag) VALUES (2, 1);
+
+SELECT t1.a
+  FROM t1 INNER JOIN t2 ON t1.a=t2.a LEFT JOIN t3 ON t2.b=t3.b
+    GROUP BY t1.a, t2.b HAVING MAX(t3.flag)=0;
+
+SELECT DISTINCT t1.a, MAX(t3.flag)
+  FROM t1 INNER JOIN t2 ON t1.a=t2.a LEFT JOIN t3 ON t2.b=t3.b
+    GROUP BY t1.a, t2.b HAVING MAX(t3.flag)=0;
+
+SELECT DISTINCT t1.a
+  FROM t1 INNER JOIN t2 ON t1.a=t2.a LEFT JOIN t3 ON t2.b=t3.b
+    GROUP BY t1.a, t2.b HAVING MAX(t3.flag)=0;
+
+DROP TABLE t1,t2,t3;
+
 # End of 4.1 tests
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8b5664a7f96..afbffc499ad 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -8118,7 +8118,7 @@ remove_duplicates(JOIN *join, TABLE *entry,List<Item> &fields, Item *having)
       field_count++;
   }
 
-  if (!field_count && !(join->select_options & OPTION_FOUND_ROWS)) 
+  if (!field_count && !(join->select_options & OPTION_FOUND_ROWS) && !having) 
   {                    // only const items with no OPTION_FOUND_ROWS
     join->unit->select_limit_cnt= 1;		// Only send first row
     DBUG_RETURN(0);

From 9cad4f08dbcdced743a402ded32139c848757d27 Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Sun, 22 Jul 2007 01:49:41 +0500
Subject: [PATCH 024/139] sp.test, sp.result:   Additional test case fix for
 bug #29338.

mysql-test/t/sp.test:
  Additional test case fix for bug #29338.
mysql-test/r/sp.result:
  Additional test case fix for bug #29338.
---
 mysql-test/r/sp.result | 1 +
 mysql-test/t/sp.test   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 4321cd92826..3103174cf2e 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -6206,5 +6206,6 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	NULL	c1	5	NULL	5	Using where; Using index
 DROP VIEW v1;
 DROP FUNCTION f1;
+DROP FUNCTION f2;
 DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index aeb85ac6012..22615c1cb28 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -7163,6 +7163,7 @@ EXPLAIN SELECT * FROM t1 WHERE c1=f2(rand());
 
 DROP VIEW v1;
 DROP FUNCTION f1;
+DROP FUNCTION f2;
 DROP TABLE t1;
 
 --echo End of 5.0 tests

From d50caace5fa82b2281f5118c49f6754609d51ba9 Mon Sep 17 00:00:00 2001
From: unknown <igor@olga.mysql.com>
Date: Sun, 22 Jul 2007 18:26:16 -0700
Subject: [PATCH 025/139] Fixed bug #29611. If a primary key is defined over
 column c of enum type then the EXPLAIN command for a look-up query of the
 form   SELECT * FROM t WHERE c=0 said that the query was with an impossible
 where condition though the query correctly returned non-empty result set when
 the table indeed contained rows with error empty strings for column c.

This kind of misbehavior was due to a bug in the function
Field_enum::store(longlong,bool) that erroneously returned 1 if
the the value to be stored was equal to 0.
Note that the method
Field_enum::store(const char *from,uint length,CHARSET_INFO *cs)
correctly returned 0 if a value of the error empty string
was stored.


mysql-test/r/type_enum.result:
  Added a test case for bug #29661.
mysql-test/t/type_enum.test:
  Added a test case for bug #29661.
sql/field.cc:
  Fixed bug #29611.
  If a primary key was defined over column c of enum type then
  the EXPLAIN command for a look-up query of the form
    SELECT * FROM t WHERE c=0
  said that the query was with an impossible where condition though the
  query correctly returned non-empty result set when the table indeed
  contained rows with error empty strings for column c.

  This kind of misbehavior was due to a bug in the function
  Field_enum::store(longlong,bool) that erroneously returned 1 if
  the the value to be stored was equal to 0.
  Note that the method
  Field_enum::store(const char *from,uint length,CHARSET_INFO *cs)
  correctly returned 0 if a value of the error empty string
  was stored.
---
 mysql-test/r/type_enum.result | 24 ++++++++++++++++++++++++
 mysql-test/t/type_enum.test   | 24 ++++++++++++++++++++++++
 sql/field.cc                  |  7 +++++--
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/type_enum.result b/mysql-test/r/type_enum.result
index ca516f027ba..994001d94e5 100644
--- a/mysql-test/r/type_enum.result
+++ b/mysql-test/r/type_enum.result
@@ -1829,3 +1829,27 @@ c1 + 0
 0
 2
 DROP TABLE t1,t2;
+CREATE TABLE t1(a enum('a','b','c','d'));
+INSERT INTO t1 VALUES (4),(1),(0),(3);
+Warnings:
+Warning	1265	Data truncated for column 'a' at row 3
+SELECT a FROM t1;
+a
+d
+a
+
+c
+EXPLAIN SELECT a FROM t1 WHERE a=0;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
+SELECT a FROM t1 WHERE a=0;
+a
+
+ALTER TABLE t1 ADD PRIMARY KEY (a);
+EXPLAIN SELECT a FROM t1 WHERE a=0;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	const	PRIMARY	PRIMARY	1	const	1	Using index
+SELECT a FROM t1 WHERE a=0;
+a
+
+DROP TABLE t1;
diff --git a/mysql-test/t/type_enum.test b/mysql-test/t/type_enum.test
index fbba38f926d..3dedb0018b1 100644
--- a/mysql-test/t/type_enum.test
+++ b/mysql-test/t/type_enum.test
@@ -200,3 +200,27 @@ CREATE TABLE t2 SELECT * FROM t1;
 SELECT c1 + 0 FROM t2;
 
 DROP TABLE t1,t2;
+
+#
+# Bug#29661: Lookup by 0 for a primary index over a enum type  
+#
+
+CREATE TABLE t1(a enum('a','b','c','d'));
+INSERT INTO t1 VALUES (4),(1),(0),(3);
+
+SELECT a FROM t1;
+
+EXPLAIN SELECT a FROM t1 WHERE a=0;
+SELECT a FROM t1 WHERE a=0;
+
+ALTER TABLE t1 ADD PRIMARY KEY (a);
+
+EXPLAIN SELECT a FROM t1 WHERE a=0;
+SELECT a FROM t1 WHERE a=0;
+
+DROP TABLE t1;
+
+
+
+
+
diff --git a/sql/field.cc b/sql/field.cc
index 993c1fb3c4f..4a1320af48c 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -7640,8 +7640,11 @@ int Field_enum::store(longlong nr, bool unsigned_val)
   if ((ulonglong) nr > typelib->count || nr == 0)
   {
     set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
-    nr=0;
-    error=1;
+    if (nr != 0 || table->in_use->count_cuted_fields)
+    {
+      nr= 0;
+      error= 1;
+    }
   }
   store_type((ulonglong) (uint) nr);
   return error;

From c38fa3f3acb380c5c18c982b7cdc0370b2328c76 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Mon, 23 Jul 2007 06:26:57 +0300
Subject: [PATCH 026/139] table.cc, sql_select.cc:   Limit the fix for bug
 28591 to InnoDB only

sql/sql_select.cc:
  Limit the fix for bug 28591 to InnoDB only
sql/table.cc:
  Limit the fix for bug 28591 to InnoDB only
---
 sql/sql_select.cc | 1 +
 sql/table.cc      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index d82a0fdcf41..2d9d261bb31 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -12033,6 +12033,7 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
       */
       if (!on_primary_key &&
           (table->file->table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
+          table->s->db_type == DB_TYPE_INNODB &&
           table->s->primary_key != MAX_KEY)
       {
         on_primary_key= TRUE;
diff --git a/sql/table.cc b/sql/table.cc
index b231033d4f2..7b826bcdf2d 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -782,7 +782,8 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
 	    if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX)
             {
 	      field->part_of_key= share->keys_in_use;
-              if (field->part_of_sortkey.is_set(key))
+              if (share->db_type == DB_TYPE_INNODB && 
+                  field->part_of_sortkey.is_set(key))
                 field->part_of_sortkey= share->keys_in_use;
             }
 	  }

From 4ffd997a8e3548c186078111d23e9a6a708f4f23 Mon Sep 17 00:00:00 2001
From: unknown <thek@adventure.(none)>
Date: Mon, 23 Jul 2007 15:05:50 +0200
Subject: [PATCH 027/139] Bug#28012 Patch : IM crashes instead of reporting an
 error when mysqldpath is bad

On the windows platform, if an instance object failed to initialize during
program start, the instance manager would crash.
This could happen if an incorrect mysqld path was supplied in the
defaults configuration file.
The patch prevents the program from crashing and makes it show an
error message instead.


mysql-test/r/im_options.result:
  - Options have changed names.
server-tools/instance-manager/instance.cc:
  - Added code to verify that the instance object was initialized
    before any attempt is made to start the associated process.
  - Instance::complete_initialization method will now return TRUE
    on an error during instance initialization.
server-tools/instance-manager/instance_options.cc:
  - Parsed result byte sequence from executed process doesn't contain a new line
    character anymore.
server-tools/instance-manager/parse_output.cc:
  - 'popen' didn't behave as intended on the windows platform.
  - The function parse_output_and_get_value was completly rewritten to correct the
    error in the windows built and to be more easily maintained across platforms.
server-tools/instance-manager/parse_output.h:
  - 'popen' didn't behave as intended on the windows platform.
  - The function parse_output_and_get_value was completly rewritten to correct the
    error in the windows built and to be more easily maintained across platforms.
server-tools/instance-manager/portability.h:
  - Add more portability constants for convenience.
---
 mysql-test/r/im_options.result                |  10 +-
 server-tools/instance-manager/instance.cc     |  36 +-
 .../instance-manager/instance_options.cc      |  13 +-
 server-tools/instance-manager/parse_output.cc | 421 +++++++++++++++---
 server-tools/instance-manager/parse_output.h  |  16 +-
 server-tools/instance-manager/portability.h   |   5 +
 6 files changed, 393 insertions(+), 108 deletions(-)

diff --git a/mysql-test/r/im_options.result b/mysql-test/r/im_options.result
index 3225db0c8c5..22bd5d5bdf6 100644
--- a/mysql-test/r/im_options.result
+++ b/mysql-test/r/im_options.result
@@ -37,9 +37,10 @@ log-slow-queries	option_value
 language	option_value
 character-sets-dir	option_value
 basedir	option_value
+shutdown-delay	option_value
 skip-stack-trace	option_value
-skip-innodb	option_value
-skip-ndbcluster	option_value
+loose-skip-innodb	option_value
+loose-skip-ndbcluster	option_value
 nonguarded	option_value
 log-output	option_value
 SET mysqld2.server_id = 2;
@@ -57,9 +58,10 @@ log-slow-queries	option_value
 language	option_value
 character-sets-dir	option_value
 basedir	option_value
+shutdown-delay	option_value
 skip-stack-trace	option_value
-skip-innodb	option_value
-skip-ndbcluster	option_value
+loose-skip-innodb	option_value
+loose-skip-ndbcluster	option_value
 nonguarded	option_value
 log-output	option_value
 server_id	option_value
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc
index edc9c88fe9f..80e7e99214b 100644
--- a/server-tools/instance-manager/instance.cc
+++ b/server-tools/instance-manager/instance.cc
@@ -524,24 +524,17 @@ bool Instance::init(const LEX_STRING *name_arg)
 
 
 /**
-  Complete instance options initialization.
+  @brief Complete instance options initialization.
 
-  SYNOPSIS
-    complete_initialization()
-
-  RETURN
-    FALSE - ok
-    TRUE  - error
+  @return Error status.
+    @retval FALSE ok
+    @retval TRUE error
 */
 
 bool Instance::complete_initialization()
 {
   configured= ! options.complete_initialization();
-  return FALSE;
-  /*
-    TODO: return actual status (from
-    Instance_options::complete_initialization()) here.
-  */
+  return !configured;
 }
 
 /**************************************************************************
@@ -644,25 +637,24 @@ bool Instance::is_mysqld_running()
 
 
 /**
-  Start mysqld.
+  @brief Start mysqld.
 
-  SYNOPSIS
-    start_mysqld()
+  Reset flags and start Instance Monitor thread, which will start mysqld.
 
-  DESCRIPTION
-    Reset flags and start Instance Monitor thread, which will start mysqld.
+  @note Instance must be locked before calling the operation.
 
-    MT-NOTE: instance must be locked before calling the operation.
-
-  RETURN
-    FALSE - ok
-    TRUE  - could not start instance
+  @return Error status code
+    @retval FALSE Ok
+    @retval TRUE Could not start instance
 */
 
 bool Instance::start_mysqld()
 {
   Instance_monitor *instance_monitor;
 
+  if (!configured)
+    return TRUE;
+
   /*
     Prepare instance to start Instance Monitor thread.
 
diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc
index 5665c6f8670..8b96d6f0f96 100644
--- a/server-tools/instance-manager/instance_options.cc
+++ b/server-tools/instance-manager/instance_options.cc
@@ -156,7 +156,8 @@ int Instance_options::get_default_option(char *result, size_t result_len,
     goto err;
 
   /* +2 eats first "--" from the option string (E.g. "--datadir") */
-  rc= parse_output_and_get_value((char*) cmd.buffer, option_name + 2,
+  rc= parse_output_and_get_value((char*) cmd.buffer,
+                                 option_name + 2, strlen(option_name + 2),
                                  result, result_len, GET_VALUE);
 err:
   return rc;
@@ -194,8 +195,8 @@ bool Instance_options::fill_instance_version()
 
   bzero(result, MAX_VERSION_LENGTH);
 
-  if (parse_output_and_get_value((char*) cmd.buffer, "Ver", result,
-                                 MAX_VERSION_LENGTH, GET_LINE))
+  if (parse_output_and_get_value((char*) cmd.buffer, STRING_WITH_LEN("Ver"),
+                                 result, MAX_VERSION_LENGTH, GET_LINE))
   {
     log_error("Failed to get version of '%s': unexpected output.",
               (const char *) mysqld_path.str);
@@ -206,8 +207,7 @@ bool Instance_options::fill_instance_version()
 
   {
     char *start;
-    /* chop the newline from the end of the version string */
-    result[strlen(result) - NEWLINE_LEN]= '\0';
+
     /* trim leading whitespaces */
     start= result;
     while (my_isspace(default_charset_info, *start))
@@ -255,7 +255,8 @@ bool Instance_options::fill_mysqld_real_path()
 
   bzero(result, FN_REFLEN);
 
-  if (parse_output_and_get_value((char*) cmd.buffer, "Usage: ",
+  if (parse_output_and_get_value((char*) cmd.buffer,
+                                 STRING_WITH_LEN("Usage: "),
                                  result, FN_REFLEN,
                                  GET_LINE))
   {
diff --git a/server-tools/instance-manager/parse_output.cc b/server-tools/instance-manager/parse_output.cc
index 36eb5185f6b..4dc67657512 100644
--- a/server-tools/instance-manager/parse_output.cc
+++ b/server-tools/instance-manager/parse_output.cc
@@ -24,6 +24,13 @@
 #include "parse.h"
 #include "portability.h"
 
+/**************************************************************************
+  Private module implementation.
+**************************************************************************/
+
+namespace { /* no-indent */
+
+/*************************************************************************/
 
 void trim_space(const char **text, uint *word_len)
 {
@@ -39,90 +46,362 @@ void trim_space(const char **text, uint *word_len)
   *word_len= (end - start)+1;
 }
 
-/*
-  Parse output of the given command
+/*************************************************************************/
 
-  SYNOPSIS
-    parse_output_and_get_value()
-
-    command          the command to execue with popen.
-    word             the word to look for (usually an option name)
-    result           the buffer to store the next word (option value)
-    input_buffer_len self-explanatory
-    flag             this equals to GET_LINE if we want to get all the line after
-                     the matched word and GET_VALUE otherwise.
-
-  DESCRIPTION
-
-    Parse output of the "command". Find the "word" and return the next one
-    if flag is GET_VALUE. Return the rest of the parsed string otherwise.
-
-  RETURN
-    0 - ok, the word has been found
-    1 - error occured or the word is not found
+/**
+  @brief A facade to the internal workings of optaining the output from an
+  executed system process.
 */
 
-int parse_output_and_get_value(const char *command, const char *word,
-                               char *result, size_t input_buffer_len,
-                               uint flag)
+class Mysqld_output_parser
+{
+public:
+  Mysqld_output_parser()
+  { }
+
+  virtual ~Mysqld_output_parser()
+  { }
+
+public:
+  bool parse(const char *command,
+             const char *option_name_str,
+             uint option_name_length,
+             char *option_value_buf,
+             size_t option_value_buf_size,
+             enum_option_type option_type);
+
+protected:
+  /**
+    @brief Run a process and attach stdout- and stdin-pipes to it.
+
+    @param command The path to the process to be executed
+
+    @return Error status.
+      @retval TRUE An error occurred
+      @retval FALSE Operation was a success
+  */
+
+  virtual bool run_command(const char *command)= 0;
+
+
+  /**
+    @brief Read a sequence of bytes from the executed process' stdout pipe.
+
+    The sequence is terminated by either '\0', LF or CRLF tokens. The
+    terminating token is excluded from the result.
+
+    @param line_buffer A pointer to a character buffer
+    @param line_buffer_size The size of the buffer in bytes
+
+    @return Error status.
+      @retval TRUE An error occured
+      @retval FALSE Operation was a success
+  */
+
+  virtual bool read_line(char *line_buffer,
+                         uint line_buffer_size)= 0;
+
+
+  /**
+    @brief Release any resources needed after a execution and parsing.
+  */
+
+  virtual bool cleanup()= 0;
+};
+
+/*************************************************************************/
+
+bool Mysqld_output_parser::parse(const char *command,
+                                 const char *option_name_str,
+                                 uint option_name_length,
+                                 char *option_value_buf,
+                                 size_t option_value_buf_size,
+                                 enum_option_type option_type)
 {
-  FILE *output;
-  uint wordlen;
   /* should be enough to store the string from the output */
-  enum { MAX_LINE_LEN= 512 };
-  char linebuf[MAX_LINE_LEN];
-  int rc= 1;
+  const int LINE_BUFFER_SIZE= 512;
+  char line_buffer[LINE_BUFFER_SIZE];
 
-  wordlen= strlen(word);
+  if (run_command(command))
+    return TRUE;
 
-  /*
-    Successful return of popen does not tell us whether the command has been
-    executed successfully: if the command was not found, we'll get EOF
-    when reading the output buffer below.
-  */
-  if (!(output= popen(command, "r")))
-    goto err;
-
-  /*
-    We want fully buffered stream. We also want system to
-    allocate appropriate buffer.
-  */
-  setvbuf(output, NULL, _IOFBF, 0);
-
-  while (fgets(linebuf, sizeof(linebuf) - 1, output))
+  while (true)
   {
-    uint found_word_len= 0;
-    char *linep= linebuf;
-
-    linebuf[sizeof(linebuf) - 1]= '\0';        /* safety */
-
-    /*
-      Find the word(s) we are looking for in the line
-    */
-    if ((linep= strstr(linep, word)))
+    if (read_line(line_buffer, LINE_BUFFER_SIZE))
     {
-      /*
-        If we have found our word(s), then move linep past the word(s)
-      */
-      linep+= wordlen;
-      if (flag & GET_VALUE)
+      cleanup();
+      return TRUE;
+    }
+
+    uint found_word_len= 0;
+    char *linep= line_buffer;
+
+    line_buffer[sizeof(line_buffer) - 1]= '\0';        /* safety */
+
+    /* Find the word(s) we are looking for in the line. */
+
+    linep= strstr(linep, option_name_str);
+
+    if (!linep)
+      continue;
+
+    linep+= option_name_length;
+
+    switch (option_type)
+    {
+    case GET_VALUE:
+      trim_space((const char**) &linep, &found_word_len);
+
+      if (option_value_buf_size <= found_word_len)
       {
-        trim_space((const char**) &linep, &found_word_len);
-        if (input_buffer_len <= found_word_len)
-          goto err;
-        strmake(result, linep, found_word_len);
+        cleanup();
+        return TRUE;
       }
-      else         /* currently there are only two options */
-        strmake(result, linep, input_buffer_len - 1);
-      rc= 0;
+
+      strmake(option_value_buf, linep, found_word_len);
+
+      break;
+
+    case GET_LINE:
+      strmake(option_value_buf, linep, option_value_buf_size - 1);
+
       break;
     }
+
+    cleanup();
+
+    return FALSE;
   }
-
-  /* we are not interested in the termination status */
-  pclose(output);
-
-err:
-  return rc;
 }
 
+/**************************************************************************
+  Platform-specific implementation: UNIX.
+**************************************************************************/
+
+#ifndef __WIN__
+
+class Mysqld_output_parser_unix : public Mysqld_output_parser
+{
+public:
+  Mysqld_output_parser_unix() :
+    m_stdout(NULL)
+  { }
+
+protected:
+  virtual bool run_command(const char *command);
+
+  virtual bool read_line(char *line_buffer,
+                         uint line_buffer_size);
+
+  virtual bool cleanup();
+
+private:
+  FILE *m_stdout;
+};
+
+bool Mysqld_output_parser_unix::run_command(const char *command)
+{
+  if (!(m_stdout= popen(command, "r")))
+    return TRUE;
+
+  /*
+    We want fully buffered stream. We also want system to allocate
+    appropriate buffer.
+  */
+
+  setvbuf(m_stdout, NULL, _IOFBF, 0);
+
+  return FALSE;
+}
+
+bool Mysqld_output_parser_unix::read_line(char *line_buffer,
+                                          uint line_buffer_size)
+{
+  char *retbuff = fgets(line_buffer, line_buffer_size, m_stdout);
+  /* Remove any tailing new line charaters */
+  if (line_buffer[line_buffer_size-1] == LF)
+   line_buffer[line_buffer_size-1]= '\0';
+  return (retbuff == NULL);
+}
+
+bool Mysqld_output_parser_unix::cleanup()
+{
+  if (m_stdout)
+    pclose(m_stdout);
+
+  return FALSE;
+}
+
+#else /* Windows */
+
+/**************************************************************************
+  Platform-specific implementation: Windows.
+**************************************************************************/
+
+class Mysqld_output_parser_win : public Mysqld_output_parser
+{
+public:
+  Mysqld_output_parser_win() :
+      m_internal_buffer(NULL),
+      m_internal_buffer_offset(0),
+      m_internal_buffer_size(0)
+  { }
+
+protected:
+  virtual bool run_command(const char *command);
+  virtual bool read_line(char *line_buffer,
+                         uint line_buffer_size);
+  virtual bool cleanup();
+
+private:
+  HANDLE m_h_child_stdout_wr;
+  HANDLE m_h_child_stdout_rd;
+  uint m_internal_buffer_offset;
+  uint m_internal_buffer_size;
+  char *m_internal_buffer;
+};
+
+bool Mysqld_output_parser_win::run_command(const char *command)
+{
+  BOOL op_status;
+
+  SECURITY_ATTRIBUTES sa_attr;
+  sa_attr.nLength= sizeof(SECURITY_ATTRIBUTES);
+  sa_attr.bInheritHandle= TRUE;
+  sa_attr.lpSecurityDescriptor= NULL;
+
+  op_status= CreatePipe(&m_h_child_stdout_rd,
+                        &m_h_child_stdout_wr,
+                        &sa_attr,
+                        0 /* Use system-default buffer size. */);
+
+  if (!op_status)
+    return TRUE;
+
+  SetHandleInformation(m_h_child_stdout_rd, HANDLE_FLAG_INHERIT, 0);
+
+  STARTUPINFO si_start_info;
+  ZeroMemory(&si_start_info, sizeof(STARTUPINFO));
+  si_start_info.cb= sizeof(STARTUPINFO);
+  si_start_info.hStdError= m_h_child_stdout_wr;
+  si_start_info.hStdOutput= m_h_child_stdout_wr;
+  si_start_info.dwFlags|= STARTF_USESTDHANDLES;
+
+  PROCESS_INFORMATION pi_proc_info;
+
+  op_status= CreateProcess(NULL,           /* Application name. */
+                           (char*)command, /* Command line. */
+                           NULL,           /* Process security attributes. */
+                           NULL,           /* Primary thread security attr.*/
+                           TRUE,           /* Handles are inherited. */
+                           0,              /* Creation flags. */
+                           NULL,           /* Use parent's environment. */
+                           NULL,           /* Use parent's curr. directory. */
+                           &si_start_info, /* STARTUPINFO pointer. */
+                           &pi_proc_info); /* Rec. PROCESS_INFORMATION. */
+
+  if (!retval)
+  {
+    CloseHandle(m_h_child_stdout_rd);
+    CloseHandle(m_h_child_stdout_wr);
+
+    return TRUE;
+  }
+
+  /* Close unnessary handles. */
+
+  CloseHandle(pi_proc_info.hProcess);
+  CloseHandle(pi_proc_info.hThread);
+
+  return FALSE;
+}
+
+bool Mysqld_output_parser_win::read_line(char *line_buffer,
+                                         uint line_buffer_size)
+{
+  DWORD dw_read_count= m_internal_buffer_size;
+  bzero(line_buffer,line_buffer_size);
+  char *buff_ptr= line_buffer;
+  char ch;
+
+  while (buff_ptr - line_buffer < line_buffer_size)
+  {
+    do
+    {
+      ReadFile(m_h_child_stdout_rd, &ch,
+               1, &dw_read_count, NULL);
+    } while ((ch == CR || ch == LF) && buff_ptr == line_buffer);
+
+    if (dw_read_count == 0)
+      return TRUE;
+
+    if (ch == CR || ch == LF)
+      break;
+
+    *buff_ptr++ = ch;
+  }
+
+  return FALSE;
+}
+
+bool Mysqld_output_parser_win::cleanup()
+{
+  /* Close all handles. */
+
+  CloseHandle(m_h_child_stdout_wr);
+  CloseHandle(m_h_child_stdout_rd);
+
+  return FALSE;
+}
+#endif
+
+/*************************************************************************/
+
+} /* End of private module implementation. */
+
+/*************************************************************************/
+
+/**
+  @brief Parse output of the given command
+
+  @param      command               The command to execute.
+  @param      option_name_str       Option name.
+  @param      option_name_length    Length of the option name.
+  @param[out] option_value_buf      The buffer to store option value.
+  @param      option_value_buf_size Size of the option value buffer.
+  @param      option_type           Type of the option:
+                                      - GET_LINE if we want to get all the
+                                        line after the option name;
+                                      - GET_VALUE otherwise.
+
+  Execute the process by running "command". Find the "option name" and
+  return the next word if "option_type" is GET_VALUE. Return the rest of
+  the parsed string otherwise.
+
+  @note This function has a separate windows implementation.
+
+  @return The error status.
+    @retval FALSE Ok, the option name has been found.
+    @retval TRUE Error occured or the option name is not found.
+*/
+
+bool parse_output_and_get_value(const char *command,
+                                const char *option_name_str,
+                                uint option_name_length,
+                                char *option_value_buf,
+                                size_t option_value_buf_size,
+                                enum_option_type option_type)
+{
+#ifndef __WIN__
+  Mysqld_output_parser_unix parser;
+#else /* __WIN__ */
+  Mysqld_output_parser_win parser;
+#endif
+
+  return parser.parse(command,
+                      option_name_str,
+                      option_name_length,
+                      option_value_buf,
+                      option_value_buf_size,
+                      option_type);
+}
diff --git a/server-tools/instance-manager/parse_output.h b/server-tools/instance-manager/parse_output.h
index 8851934f230..41618f643a3 100644
--- a/server-tools/instance-manager/parse_output.h
+++ b/server-tools/instance-manager/parse_output.h
@@ -17,11 +17,17 @@
 
 #include <my_global.h>
 
-#define GET_VALUE 1
-#define GET_LINE  2
+enum enum_option_type
+{
+  GET_VALUE = 1,
+  GET_LINE
+};
 
-int parse_output_and_get_value(const char *command, const char *word,
-                               char *result, size_t input_buffer_len,
-                               uint flag);
+bool parse_output_and_get_value(const char *command,
+                                const char *option_name_str,
+                                uint option_name_length,
+                                char *option_value_buf,
+                                size_t option_value_buf_size,
+                                enum_option_type option_type);
 
 #endif /* INCLUDES_MYSQL_INSTANCE_MANAGER_PARSE_OUTPUT_H */
diff --git a/server-tools/instance-manager/portability.h b/server-tools/instance-manager/portability.h
index eb677a0135c..990e6140a9e 100644
--- a/server-tools/instance-manager/portability.h
+++ b/server-tools/instance-manager/portability.h
@@ -48,11 +48,16 @@ typedef int pid_t;
 #define NEWLINE "\r\n"
 #define NEWLINE_LEN 2
 
+const char CR = '\r';
+const char LF = '\n';
+
 #else /* ! __WIN__ */
 
 #define NEWLINE "\n"
 #define NEWLINE_LEN 1
 
+const char LF = '\n';
+
 #endif /* __WIN__ */
 
 #endif  /* INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H */

From 54c9742922864ee711e024bb93307c553d66fb38 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Mon, 23 Jul 2007 19:09:48 +0300
Subject: [PATCH 028/139] coding style fix : Index_hint

---
 sql/sql_lex.cc   |  6 +++---
 sql/sql_lex.h    | 14 +++++++-------
 sql/sql_parse.cc |  2 +-
 sql/table.cc     |  4 ++--
 sql/table.h      |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 9f69e7dee05..ab5bdc1e6fa 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1770,7 +1770,7 @@ TABLE_LIST *st_select_lex_node::add_table_to_list (THD *thd, Table_ident *table,
 						  LEX_STRING *alias,
 						  ulong table_join_options,
 						  thr_lock_type flags,
-						  List<index_hint> *hints,
+						  List<Index_hint> *hints,
                                                   LEX_STRING *option)
 {
   return 0;
@@ -2723,7 +2723,7 @@ void st_select_lex::set_index_hint_type(enum index_hint_type type,
 
 void st_select_lex::alloc_index_hints (THD *thd)
 { 
-  index_hints= new (thd->mem_root) List<index_hint>(); 
+  index_hints= new (thd->mem_root) List<Index_hint>(); 
 }
 
 
@@ -2744,7 +2744,7 @@ void st_select_lex::alloc_index_hints (THD *thd)
 bool st_select_lex::add_index_hint (THD *thd, char *str, uint length)
 {
   return index_hints->push_front (new (thd->mem_root) 
-                                 index_hint(current_index_hint_type,
+                                 Index_hint(current_index_hint_type,
                                             current_index_hint_clause,
                                             str, length));
 }
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 4ac59fbacde..6044f4f752e 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -236,7 +236,7 @@ typedef uchar index_clause_map;
                              INDEX_HINT_MASK_ORDER)
 
 /* Single element of an USE/FORCE/IGNORE INDEX list specified as a SQL hint  */
-class index_hint : public Sql_alloc
+class Index_hint : public Sql_alloc
 {
 public:
   /* The type of the hint : USE/FORCE/IGNORE */
@@ -249,7 +249,7 @@ public:
   */ 
   LEX_STRING key_name;
 
-  index_hint (enum index_hint_type type_arg, index_clause_map clause_arg,
+  Index_hint (enum index_hint_type type_arg, index_clause_map clause_arg,
               char *str, uint length) :
     type(type_arg), clause(clause_arg)
   {
@@ -441,7 +441,7 @@ public:
 					LEX_STRING *alias,
 					ulong table_options,
 					thr_lock_type flags= TL_UNLOCK,
-					List<index_hint> *hints= 0,
+					List<Index_hint> *hints= 0,
                                         LEX_STRING *option= 0);
   virtual void set_lock_for_tables(thr_lock_type lock_type) {}
 
@@ -719,7 +719,7 @@ public:
 				LEX_STRING *alias,
 				ulong table_options,
 				thr_lock_type flags= TL_UNLOCK,
-				List<index_hint> *hints= 0,
+				List<Index_hint> *hints= 0,
                                 LEX_STRING *option= 0);
   TABLE_LIST* get_table_list();
   bool init_nested_join(THD *thd);
@@ -779,9 +779,9 @@ public:
   /* make a list to hold index hints */
   void alloc_index_hints (THD *thd);
   /* read and clear the index hints */
-  List<index_hint>* pop_index_hints(void) 
+  List<Index_hint>* pop_index_hints(void) 
   {
-    List<index_hint> *hints= index_hints;
+    List<Index_hint> *hints= index_hints;
     index_hints= NULL;
     return hints;
   }
@@ -793,7 +793,7 @@ private:
   enum index_hint_type current_index_hint_type;
   index_clause_map current_index_hint_clause;
   /* a list of USE/FORCE/IGNORE INDEX */
-  List<index_hint> *index_hints;
+  List<Index_hint> *index_hints;
 };
 typedef class st_select_lex SELECT_LEX;
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f2a61b7f7c5..93887db88e1 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5636,7 +5636,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
 					     LEX_STRING *alias,
 					     ulong table_options,
 					     thr_lock_type lock_type,
-					     List<index_hint> *index_hints_arg,
+					     List<Index_hint> *index_hints_arg,
                                              LEX_STRING *option)
 {
   register TABLE_LIST *ptr;
diff --git a/sql/table.cc b/sql/table.cc
index 5ac43343934..2c4d18ca4ff 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -4642,11 +4642,11 @@ bool TABLE_LIST::process_index_hints(TABLE *table)
     key_map index_join[INDEX_HINT_FORCE + 1];
     key_map index_order[INDEX_HINT_FORCE + 1];
     key_map index_group[INDEX_HINT_FORCE + 1];
-    index_hint *hint;
+    Index_hint *hint;
     int type;
     bool have_empty_use_join= FALSE, have_empty_use_order= FALSE, 
          have_empty_use_group= FALSE;
-    List_iterator <index_hint> iter(*index_hints);
+    List_iterator <Index_hint> iter(*index_hints);
 
     /* initialize temporary variables used to collect hints of each kind */
     for (type= INDEX_HINT_IGNORE; type <= INDEX_HINT_FORCE; type++)
diff --git a/sql/table.h b/sql/table.h
index 494b74d564c..a276a9f32fd 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -754,7 +754,7 @@ public:
          (TABLE_LIST::join_using_fields != NULL)
 */
 
-class index_hint;
+class Index_hint;
 struct TABLE_LIST
 {
   TABLE_LIST() {}                          /* Remove gcc warning */
@@ -826,7 +826,7 @@ struct TABLE_LIST
   */
   TABLE_LIST *next_name_resolution_table;
   /* Index names in a "... JOIN ... USE/IGNORE INDEX ..." clause. */
-  List<index_hint> *index_hints;
+  List<Index_hint> *index_hints;
   TABLE        *table;                          /* opened table */
   uint          table_id; /* table id (from binlog) for opened table */
   /*

From 54cebc4764260bf06c334e9644110fd5e369470f Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com/kent-amd64.(none)>
Date: Mon, 23 Jul 2007 23:54:55 +0200
Subject: [PATCH 029/139] Many files:   Put back old code to check stack
 direction at configure time

config/ac-macros/misc.m4:
  Put back old code to check stack direction at configure time
configure.in:
  Put back old code to check stack direction at configure time
include/config-netware.h:
  Put back old code to check stack direction at configure time
include/config-win.h:
  Put back old code to check stack direction at configure time
include/my_global.h:
  Put back old code to check stack direction at configure time
sql/sql_parse.cc:
  Put back old code to check stack direction at configure time
---
 config/ac-macros/misc.m4 | 23 +++++++++++++++++++++++
 configure.in             |  2 ++
 include/config-netware.h |  3 +++
 include/config-win.h     |  2 ++
 include/my_global.h      |  4 ++++
 sql/sql_parse.cc         |  6 +++++-
 6 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
index 0619a52fbbf..9f84e06fa46 100644
--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -450,6 +450,29 @@ AC_DEFINE([HAVE_BOOL], [1], [bool is not defined by all C++ compilators])
 fi
 ])dnl
 
+AC_DEFUN([MYSQL_STACK_DIRECTION],
+ [AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+ [AC_TRY_RUN([#include <stdlib.h>
+ int find_stack_direction ()
+ {
+   static char *addr = 0;
+   auto char dummy;
+   if (addr == 0)
+     {
+       addr = &dummy;
+       return find_stack_direction ();
+     }
+   else
+     return (&dummy > addr) ? 1 : -1;
+ }
+ int main ()
+ {
+   exit (find_stack_direction() < 0);
+ }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+   ac_cv_c_stack_direction=)])
+ AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
+])dnl
+
 AC_DEFUN([MYSQL_CHECK_LONGLONG_TO_FLOAT],
 [
 AC_MSG_CHECKING(if conversion of longlong to float works)
diff --git a/configure.in b/configure.in
index e2857cf43e3..1d62c8a59d9 100644
--- a/configure.in
+++ b/configure.in
@@ -1792,6 +1792,8 @@ MYSQL_TYPE_ACCEPT
 #---END:
 # Figure out what type of struct rlimit to use with setrlimit
 MYSQL_TYPE_STRUCT_RLIMIT
+# Find where the stack goes
+MYSQL_STACK_DIRECTION
 # We want to skip alloca on irix unconditionally. It may work on some version..
 MYSQL_FUNC_ALLOCA
 # Do struct timespec have members tv_sec or ts_sec
diff --git a/include/config-netware.h b/include/config-netware.h
index f7f494b519c..e6bddee034e 100644
--- a/include/config-netware.h
+++ b/include/config-netware.h
@@ -112,6 +112,9 @@ extern "C" {
 /* signal by closing the sockets */
 #define SIGNAL_WITH_VIO_CLOSE 1
 
+/* On NetWare, stack grows towards lower address */
+#define STACK_DIRECTION -1
+
 /* On NetWare, we need to set stack size for threads, otherwise default 16K is used */
 #define NW_THD_STACKSIZE 65536
 
diff --git a/include/config-win.h b/include/config-win.h
index fa5c15b0668..bc2ae60f137 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -250,6 +250,8 @@ inline double ulonglong2double(ulonglong value)
 #endif
 
 
+#define STACK_DIRECTION -1
+
 /* Optimized store functions for Intel x86 */
 
 #ifndef _WIN64
diff --git a/include/my_global.h b/include/my_global.h
index 91860f6e7a9..8b6cdef8daa 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -804,6 +804,10 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #define ulong_to_double(X) ((double) (ulong) (X))
 #define SET_STACK_SIZE(X)	/* Not needed on real machines */
 
+#ifndef STACK_DIRECTION
+#error "please add -DSTACK_DIRECTION=1 or -1 to your CPPFLAGS"
+#endif
+
 #if !defined(HAVE_STRTOK_R)
 #define strtok_r(A,B,C) strtok((A),(B))
 #endif
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f2a61b7f7c5..2ee20fe6dc2 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5042,7 +5042,11 @@ bool check_merge_table_access(THD *thd, char *db,
 
 #ifndef EMBEDDED_LIBRARY
 
-#define used_stack(A,B) (long)(A > B ? A - B : B - A)
+#if STACK_DIRECTION < 0
+#define used_stack(A,B) (long) (A - B)
+#else
+#define used_stack(A,B) (long) (B - A)
+#endif
 
 #ifndef DBUG_OFF
 long max_stack_used;

From 04fc8b71d66810df6784876d58fe3a5e534b2ac4 Mon Sep 17 00:00:00 2001
From: unknown <malff/marcsql@weblab.(none)>
Date: Mon, 23 Jul 2007 16:23:35 -0600
Subject: [PATCH 030/139] Bug#29959 (Non-standard bison syntax in sql_yacc.yy)

In sql/sql_yacc.yy, use the %prec construct at the end of rule join_table


sql/sql_yacc.yy:
  In sql/sql_yacc.yy, use the %prec construct at the end of rule join_table
---
 sql/sql_yacc.yy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 6fbd521e302..d71e756e91c 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -5567,7 +5567,7 @@ join_table:
           so that [INNER | CROSS] JOIN is properly nested as other
           left-associative joins.
         */
-        table_ref %prec TABLE_REF_PRIORITY normal_join table_ref
+        table_ref normal_join table_ref %prec TABLE_REF_PRIORITY
           { MYSQL_YYABORT_UNLESS($1 && ($$=$3)); }
 	| table_ref STRAIGHT_JOIN table_factor
 	  { MYSQL_YYABORT_UNLESS($1 && ($$=$3)); $3->straight=1; }

From 0f85ae9f2cb88dd8a17aaa5f69639e3e22fd0f9f Mon Sep 17 00:00:00 2001
From: unknown <antony@pcg5ppc.xiphis.org>
Date: Mon, 23 Jul 2007 23:35:43 -0700
Subject: [PATCH 031/139] Bug#25714   "getGeneratedKeys() does not work with
 FEDERATED table"   mysql_insert() expected the storage engine to update the
 row data   during the write_row() operation with the value of the new auto-  
 increment field. The field must be updated when only one row has   been
 inserted as mysql_insert() would ignore the thd->last_insert.   This patch
 implements HA_STATUS_AUTO support in ha_federated::info()   and ensures that
 ha_federated::write_row() does update the row's   auto-increment value.   The
 test case was written in C as the protocol's 'id' value is   accessible
 through libmysqlclient and not via SQL statements.   mysql-test-run.pl was
 extended to enable running the test binary.

mysql-test/mysql-test-run.pl:
  bug25714
    implement support to run C test for bug25714
sql/ha_federated.cc:
  bug25714
    The storage engine instance property auto_increment_value was not
    being set.
    mysql_insert() requires that the storage engine updates the row with
    the auto-increment value, especially when only inserting one row.
    Implement support for ha_federated::info(HA_STATUS_AUTO)
tests/Makefile.am:
  bug25714
    build C test for bug
mysql-test/include/have_bug25714.inc:
  New BitKeeper file ``mysql-test/include/have_bug25714.inc''
mysql-test/r/federated_bug_25714.result:
  New BitKeeper file ``mysql-test/r/federated_bug_25714.result''
mysql-test/r/have_bug25714.require:
  New BitKeeper file ``mysql-test/r/have_bug25714.require''
mysql-test/t/federated_bug_25714.test:
  New BitKeeper file ``mysql-test/t/federated_bug_25714.test''
tests/bug25714.c:
  New BitKeeper file ``tests/bug25714.c''
---
 mysql-test/include/have_bug25714.inc    |  7 +++
 mysql-test/mysql-test-run.pl            | 12 +++++
 mysql-test/r/federated_bug_25714.result | 56 ++++++++++++++++++++
 mysql-test/r/have_bug25714.require      |  2 +
 mysql-test/t/federated_bug_25714.test   | 47 +++++++++++++++++
 sql/ha_federated.cc                     | 14 +++--
 tests/Makefile.am                       |  5 +-
 tests/bug25714.c                        | 68 +++++++++++++++++++++++++
 8 files changed, 207 insertions(+), 4 deletions(-)
 create mode 100644 mysql-test/include/have_bug25714.inc
 create mode 100644 mysql-test/r/federated_bug_25714.result
 create mode 100644 mysql-test/r/have_bug25714.require
 create mode 100644 mysql-test/t/federated_bug_25714.test
 create mode 100644 tests/bug25714.c

diff --git a/mysql-test/include/have_bug25714.inc b/mysql-test/include/have_bug25714.inc
new file mode 100644
index 00000000000..0c995cd0d4c
--- /dev/null
+++ b/mysql-test/include/have_bug25714.inc
@@ -0,0 +1,7 @@
+#
+# Check if the variable MYSQL_BUG25714 is set
+#
+--require r/have_bug25714.require
+disable_query_log;
+eval select LENGTH("MYSQL_BUG25714") > 0 as "have_bug25714_exe";
+enable_query_log;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c58ed308bd8..43b1ef7ac86 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -144,6 +144,7 @@ our $exe_mysqladmin;
 our $exe_mysql_upgrade;
 our $exe_mysqlbinlog;
 our $exe_mysql_client_test;
+our $exe_bug25714;
 our $exe_mysqld;
 our $exe_mysqlcheck;
 our $exe_mysqldump;
@@ -1630,6 +1631,12 @@ sub executable_setup () {
                            "$glob_basedir/tests/mysql_client_test",
                            "$glob_basedir/bin/mysql_client_test");
   }
+
+  # Look for bug25714 executable which may _not_ exist in
+  # some versions, test using it should be skipped
+  $exe_bug25714=
+      mtr_exe_maybe_exists(vs_config_dirs('tests', 'bug25714'),
+                           "$glob_basedir/tests/bug25714");
 }
 
 
@@ -2010,6 +2017,11 @@ sub environment_setup () {
 
   $ENV{'MYSQL'}= $cmdline_mysql;
 
+  # ----------------------------------------------------
+  # Setup env so childs can execute bug25714
+  # ----------------------------------------------------
+  $ENV{'MYSQL_BUG25714'}=  $exe_bug25714;
+
   # ----------------------------------------------------
   # Setup env so childs can execute mysql_client_test
   # ----------------------------------------------------
diff --git a/mysql-test/r/federated_bug_25714.result b/mysql-test/r/federated_bug_25714.result
new file mode 100644
index 00000000000..12554f7af3a
--- /dev/null
+++ b/mysql-test/r/federated_bug_25714.result
@@ -0,0 +1,56 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+stop slave;
+DROP DATABASE IF EXISTS federated;
+CREATE DATABASE federated;
+DROP DATABASE IF EXISTS federated;
+CREATE DATABASE federated;
+DROP TABLE IF EXISTS federated.bug_13118_table;
+CREATE TABLE federated.t1 (
+`id` int auto_increment primary key, 
+`value` int
+) ENGINE=MyISAM;
+INSERT INTO federated.t1 SET value=1;
+INSERT INTO federated.t1 SET value=2;
+INSERT INTO federated.t1 SET value=2;
+DROP TABLE IF EXISTS federated.t1;
+CREATE TABLE federated.t1 (
+`id` int auto_increment primary key, 
+`value` int
+) ENGINE=FEDERATED
+CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';
+SELECT * from federated.t1;
+id	value
+1	1
+2	2
+3	2
+INSERT INTO federated.t1 SET value=4;
+SELECT LAST_INSERT_ID();
+LAST_INSERT_ID()
+4
+
+5 inserted
+6 inserted
+
+7 inserted
+8 inserted
+SELECT * from federated.t1;
+id	value
+1	1
+2	2
+3	2
+4	4
+5	54
+6	55
+7	54
+8	55
+DROP TABLE federated.t1;
+DROP TABLE federated.t1;
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE IF EXISTS federated;
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE IF EXISTS federated;
diff --git a/mysql-test/r/have_bug25714.require b/mysql-test/r/have_bug25714.require
new file mode 100644
index 00000000000..5acc378dcf7
--- /dev/null
+++ b/mysql-test/r/have_bug25714.require
@@ -0,0 +1,2 @@
+have_bug25714_exe
+1
diff --git a/mysql-test/t/federated_bug_25714.test b/mysql-test/t/federated_bug_25714.test
new file mode 100644
index 00000000000..9c185181511
--- /dev/null
+++ b/mysql-test/t/federated_bug_25714.test
@@ -0,0 +1,47 @@
+--source include/have_bug25714.inc
+source include/federated.inc;
+
+
+connection slave;
+--disable_warnings
+DROP TABLE IF EXISTS federated.bug_13118_table;
+--enable_warnings
+
+CREATE TABLE federated.t1 (
+    `id` int auto_increment primary key, 
+	`value` int
+    ) ENGINE=MyISAM;
+INSERT INTO federated.t1 SET value=1;
+INSERT INTO federated.t1 SET value=2;
+INSERT INTO federated.t1 SET value=2;
+
+connection master;
+--disable_warnings
+DROP TABLE IF EXISTS federated.t1;
+--enable_warnings
+
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval CREATE TABLE federated.t1 (
+    `id` int auto_increment primary key, 
+	`value` int
+    ) ENGINE=FEDERATED
+    CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+
+SELECT * from federated.t1;
+
+INSERT INTO federated.t1 SET value=4;
+
+SELECT LAST_INSERT_ID();
+
+--exec $MYSQL_BUG25714 $SLAVE_MYPORT
+--exec $MYSQL_BUG25714 $MASTER_MYPORT
+
+SELECT * from federated.t1;
+
+DROP TABLE federated.t1;
+connection slave;
+DROP TABLE federated.t1;
+
+
+source include/federated_cleanup.inc;
+
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index 3cf9c2a8b99..b669be78ebb 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -1811,8 +1811,13 @@ int ha_federated::write_row(byte *buf)
     field, then store the last_insert_id() value from the foreign server
   */
   if (auto_increment_update_required)
+  {
     update_auto_increment();
 
+    /* mysql_insert() uses this for protocol return value */
+    table->next_number_field->store(auto_increment_value, 1);
+  }
+
   DBUG_RETURN(0);
 }
 
@@ -1896,7 +1901,8 @@ void ha_federated::update_auto_increment(void)
   THD *thd= current_thd;
   DBUG_ENTER("ha_federated::update_auto_increment");
 
-  thd->insert_id(mysql->last_used_con->insert_id);
+  ha_federated::info(HA_STATUS_AUTO);
+  thd->insert_id(auto_increment_value);
   DBUG_PRINT("info",("last_insert_id: %ld", (long) auto_increment_value));
 
   DBUG_VOID_RETURN;
@@ -2688,8 +2694,10 @@ int ha_federated::info(uint flag)
     block_size= 4096;
   }
 
-  if (result)
-    mysql_free_result(result);
+  if (flag & HA_STATUS_AUTO)
+    auto_increment_value= mysql->last_used_con->insert_id;
+
+  mysql_free_result(result);
 
   DBUG_RETURN(0);
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bd56570d8d4..1c39a3630dd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,7 +28,7 @@ EXTRA_DIST =		auto_increment.res auto_increment.tst \
 			CMakeLists.txt
 
 bin_PROGRAMS =		mysql_client_test
-noinst_PROGRAMS =	insert_test select_test thread_test
+noinst_PROGRAMS =	insert_test select_test thread_test bug25714
 
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
 			$(openssl_includes)
@@ -45,6 +45,9 @@ select_test_SOURCES=       select_test.c
 insert_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 select_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 
+bug25714_SOURCES=          bug25714.c
+bug25714_DEPENDENCIES=     $(LIBRARIES) $(pkglib_LTLIBRARIES)
+
 # Fix for mit-threads
 DEFS =			-DUNDEF_THREADS_HACK
 
diff --git a/tests/bug25714.c b/tests/bug25714.c
new file mode 100644
index 00000000000..d163b8ad00e
--- /dev/null
+++ b/tests/bug25714.c
@@ -0,0 +1,68 @@
+/* Copyright (C) 2007 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include <mysql.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+int main (int argc, char **argv)
+{
+  MYSQL conn;
+  int OK;
+
+  const char* query4= "INSERT INTO federated.t1 SET Value=54";
+  const char* query5= "INSERT INTO federated.t1 SET Value=55";
+
+  if (argc != 2)
+    return -1;
+
+  mysql_init(&conn);
+  if (!mysql_real_connect(
+                          &conn,
+                          "127.0.0.1",
+                          "root",
+                          "",
+                          "test",
+                          atoi(argv[1]),
+                          NULL,
+                          CLIENT_FOUND_ROWS))
+  {
+    fprintf(stderr, "Failed to connect to database: Error: %s\n",
+            mysql_error(&conn));
+    return 1;
+  } else {
+    printf("%s\n", mysql_error(&conn));
+  }
+
+  OK = mysql_real_query (&conn, query4, strlen(query4));
+
+  assert(0 == OK);
+
+  printf("%ld inserted\n",
+         (long) mysql_insert_id(&conn));
+
+  OK = mysql_real_query (&conn, query5, strlen(query5));
+
+  assert(0 == OK);
+
+  printf("%ld inserted\n",
+         (long) mysql_insert_id(&conn));
+
+  mysql_close(&conn);
+
+  return 0;
+};

From c4d53e31b0d7c242ebcaaf354605fa4ebbad0acc Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Tue, 24 Jul 2007 18:15:44 +0400
Subject: [PATCH 032/139] Bug#15130: CREATE .. SELECT was denied to use
 advantages of the SQL_BIG_RESULT.

When the SQL_BIG_RESULT flag is specified SELECT should store items from the
select list in the filesort data and use them when sending to a client.
The get_addon_fields function is responsible for creating necessary structures
for that. But this function was allowed to do so only for SELECT and
INSERT .. SELECT queries. This makes the SQL_BIG_RESULT useless for
the CREATE .. SELECT queries.

Now the get_addon_fields allows storing select list items in the filesort
data for the CREATE .. SELECT queries.


mysql-test/t/create.test:
  Added a test case for the bug#15130: CREATE .. SELECT was denied to use
  advantages of the SQL_BIG_RESULT.
mysql-test/r/create.result:
  Added a test case for the bug#15130: CREATE .. SELECT was denied to use
  advantages of the SQL_BIG_RESULT.
sql/filesort.cc:
  Bug#15130: CREATE .. SELECT was denied to use advantages of the SQL_BIG_RESULT.
  Now the get_addon_fields allows storing select list items in the filesort
  data for the CREATE .. SELECT queries.
---
 mysql-test/r/create.result | 13 +++++++++++++
 mysql-test/t/create.test   | 10 ++++++++++
 sql/filesort.cc            |  3 ++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index e692dbf3938..dedd01be340 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -1503,4 +1503,17 @@ t1	CREATE TABLE `t1` (
   `c17` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+create table t1(f1 int,f2 int);
+insert into t1 value(1,1),(1,2),(1,3),(2,1),(2,2),(2,3);
+flush status;
+create table t2 select sql_big_result f1,count(f2) from t1 group by f1;
+show status like 'handler_read%';
+Variable_name	Value
+Handler_read_first	0
+Handler_read_key	0
+Handler_read_next	0
+Handler_read_prev	0
+Handler_read_rnd	0
+Handler_read_rnd_next	7
+drop table t1,t2;
 End of 5.0 tests
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 99f3fea416a..822620aa552 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -1119,4 +1119,14 @@ show create table t1;
 drop table t1;
 
 
+#
+# Bug#15130:CREATE .. SELECT was denied to use advantages of the SQL_BIG_RESULT.
+#
+create table t1(f1 int,f2 int);
+insert into t1 value(1,1),(1,2),(1,3),(2,1),(2,2),(2,3);
+flush status;
+create table t2 select sql_big_result f1,count(f2) from t1 group by f1;
+show status like 'handler_read%';
+drop table t1,t2;
+
 --echo End of 5.0 tests
diff --git a/sql/filesort.cc b/sql/filesort.cc
index f8868ed6927..db73ede99b0 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -1430,7 +1430,8 @@ get_addon_fields(THD *thd, Field **ptabfield, uint sortlength, uint *plength)
     doesn't work for alter table
   */
   if (thd->lex->sql_command != SQLCOM_SELECT &&
-      thd->lex->sql_command != SQLCOM_INSERT_SELECT)
+      thd->lex->sql_command != SQLCOM_INSERT_SELECT &&
+      thd->lex->sql_command != SQLCOM_CREATE_TABLE)
     return 0;
   for (pfield= ptabfield; (field= *pfield) ; pfield++)
   {

From 541e40f9af3ac9b958276eec69809483be19b23a Mon Sep 17 00:00:00 2001
From: unknown <antony@pcg5ppc.xiphis.org>
Date: Tue, 24 Jul 2007 07:23:59 -0700
Subject: [PATCH 033/139] post 5.0 to 5.1 merge fixes

---
 storage/federated/ha_federated.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 9d070dfa7b1..ebc8f898341 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -2029,7 +2029,7 @@ int ha_federated::write_row(uchar *buf)
     update_auto_increment();
 
     /* mysql_insert() uses this for protocol return value */
-    table->next_number_field->store(auto_increment_value, 1);
+    table->next_number_field->store(stats.auto_increment_value, 1);
   }
 
   DBUG_RETURN(0);
@@ -2940,7 +2940,7 @@ int ha_federated::info(uint flag)
   }
 
   if (flag & HA_STATUS_AUTO)
-    auto_increment_value= mysql->last_used_con->insert_id;
+    stats.auto_increment_value= mysql->last_used_con->insert_id;
 
   mysql_free_result(result);
 

From 4ab0c0cf49c243a7848195d27d8cfdaa1b09e31e Mon Sep 17 00:00:00 2001
From: unknown <antony@pcg5ppc.xiphis.org>
Date: Tue, 24 Jul 2007 09:32:51 -0700
Subject: [PATCH 034/139] build bug25714 test app on Windows

---
 tests/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5eade93621b..7559ca9ec6b 100755
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -22,3 +22,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 ADD_EXECUTABLE(mysql_client_test mysql_client_test.c)
 TARGET_LINK_LIBRARIES(mysql_client_test dbug mysys mysqlclient yassl taocrypt zlib wsock32)
+
+ADD_EXECUTABLE(bug25714 bug25714.c)
+TARGET_LINK_LIBRARIES(bug25714 dbug mysys mysqlclient yassl taocrypt zlib wsock32)

From 791eee3ec2258177195d0463c2a9a4961e709598 Mon Sep 17 00:00:00 2001
From: unknown <antony@pcg5ppc.xiphis.org>
Date: Tue, 24 Jul 2007 09:36:56 -0700
Subject: [PATCH 035/139] build bug25714 test app on Windows

---
 tests/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5eade93621b..7559ca9ec6b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -22,3 +22,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 ADD_EXECUTABLE(mysql_client_test mysql_client_test.c)
 TARGET_LINK_LIBRARIES(mysql_client_test dbug mysys mysqlclient yassl taocrypt zlib wsock32)
+
+ADD_EXECUTABLE(bug25714 bug25714.c)
+TARGET_LINK_LIBRARIES(bug25714 dbug mysys mysqlclient yassl taocrypt zlib wsock32)

From 5415dcc337cb348f35bc17299a2ca07ac60316f8 Mon Sep 17 00:00:00 2001
From: unknown <antony@pcg5ppc.xiphis.org>
Date: Tue, 24 Jul 2007 10:50:28 -0700
Subject: [PATCH 036/139] fix compile on Windows for bug25714.c --- fix compile
 on Windows for bug25714.c

tests/bug25714.c:
  fix compile on Windows
---
 tests/bug25714.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/bug25714.c b/tests/bug25714.c
index d163b8ad00e..e9b2be44209 100644
--- a/tests/bug25714.c
+++ b/tests/bug25714.c
@@ -13,10 +13,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <my_global.h>
+#include <my_sys.h>
 #include <mysql.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <m_string.h>
 #include <assert.h>
 
 int main (int argc, char **argv)
@@ -27,6 +27,8 @@ int main (int argc, char **argv)
   const char* query4= "INSERT INTO federated.t1 SET Value=54";
   const char* query5= "INSERT INTO federated.t1 SET Value=55";
 
+  MY_INIT(argv[0]);
+
   if (argc != 2)
     return -1;
 
@@ -63,6 +65,7 @@ int main (int argc, char **argv)
          (long) mysql_insert_id(&conn));
 
   mysql_close(&conn);
+  my_end(0);
 
   return 0;
 };

From c2f0c211cd74ae2d058e1d865e9a3d880b8a2cfd Mon Sep 17 00:00:00 2001
From: unknown <tsmith@ramayana.hindu.god>
Date: Tue, 24 Jul 2007 19:34:31 -0600
Subject: [PATCH 037/139] Apply snapshot innodb-51-ss1644

Fixes:
- Bug #23710: crash_commit_before fails if innodb_file_per_table=1
- Bug #28254: innodb crash if shutdown during innodb_table_monitor is running
- Bug #28604: innodb_force_recovery restricts data dump
- Bug #29097: fsp_get_available_space_in_free_extents() is capped at 4TB
- Bug #29155: Innodb "Parallel recovery" is not prevented


storage/innobase/Makefile.am:
  Apply snapshot innodb-51-ss1644

  Revision r1632:
  Add include/lock0priv.h to noinst_HEADERS in Makefile.am.



  Revision r1636:
  Move lock_get_type() from lock/lock0lock.c to include/lock0priv.ic:
  * lock0lock.c: remove lock_get_type() and include include/lock0priv.ic
  * lock0priv.h: include lock0priv.ic and add lock_get_type() prototype
  * Makefile.am: add lock0priv.ic to noinst_HEADERS
  * lock0priv.ic: introduce this new file containing the body of
    lock_get_type()

  This move is necessary in order to use lock_get_type() from other lock/
  source files (it's going to be used in lock/lock0iter.c).

  Approved by:	Heikki


  Revision r1638:
  Introduce a lock queue iterator for easy (and opaque) traversing of lock
  queues. Supports table and record lock queues via the same interface.

  There is only "get previous" method because currently there is no need
  for "get next" - it would be unused. Feel free to add one if needed.

  Approved by:	Heikki
storage/innobase/buf/buf0buf.c:
  Apply snapshot innodb-51-ss1644

  Revision r1624:
  Fix change missed as part of Bug 15815. Use a function to check if a block
  needs to be made younger.


  Revision r1581:
  Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/buf/buf0lru.c:
  Apply snapshot innodb-51-ss1644

  Revision r1581:
  Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/fsp/fsp0fsp.c:
  Apply snapshot innodb-51-ss1644

  Revision r1605:
  Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
  by typecasting the variables before multiplying them, so that the result of
  the multiplication is of type "unsigned long long".

  I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
  use it without overwriting it with zeroes (by commenting the code that
  overwrites :newraw files).

  New type ullint is introduced with the sole purpose of shortening
  "unsigned long long", please do not define it to something else than
  "unsigned long long".

  Approved by:	Heikki
storage/innobase/handler/ha_innodb.cc:
  Apply snapshot innodb-51-ss1644

  Revision r1605:
  Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
  by typecasting the variables before multiplying them, so that the result of
  the multiplication is of type "unsigned long long".

  I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
  use it without overwriting it with zeroes (by commenting the code that
  overwrites :newraw files).

  New type ullint is introduced with the sole purpose of shortening
  "unsigned long long", please do not define it to something else than
  "unsigned long long".

  Approved by:	Heikki


  Revision r1573:
  create_table_def(): Eliminate the inline function call to dict_table_is_comp()
  that was introduced in r1571.  Inlining is disabled in ha_innodb.cc.


  Revision r1574:
  innodb_check_for_record_too_big_error(): Divide the return value of
  page_get_free_space_of_empty_noninline() by 2.  Until r1571, that function
  did not return the same value as page_get_free_space_of_empty().


  Revision r1571:
  Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
  When creating an index containing a too long record, InnoDB would
  dereference a NULL pointer when trying to determine the maximum row length.

  innodb_check_for_record_too_big_error(): Replace the dict_table_t*
  parameter with a Boolean flag.  There is not always a dict_table_t object
  when this function is called.

  page_get_free_space_of_empty_noninline(): Move the definition and
  declaration from row0mysql (!) to page0page.  Make the signature
  identical with page_get_free_space_of_empty().

  create_clustered_index_when_no_primary(): Add the parameter "comp".
  Remove unnecessary casts.
storage/innobase/include/buf0buf.ic:
  Apply snapshot innodb-51-ss1644

  Revision r1624:
  Fix change missed as part of Bug 15815. Use a function to check if a block
  needs to be made younger.
storage/innobase/include/fsp0fsp.h:
  Apply snapshot innodb-51-ss1644

  Revision r1605:
  Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
  by typecasting the variables before multiplying them, so that the result of
  the multiplication is of type "unsigned long long".

  I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
  use it without overwriting it with zeroes (by commenting the code that
  overwrites :newraw files).

  New type ullint is introduced with the sole purpose of shortening
  "unsigned long long", please do not define it to something else than
  "unsigned long long".

  Approved by:	Heikki
storage/innobase/include/lock0lock.h:
  Apply snapshot innodb-51-ss1644

  Revision r1623:
  Fix typo in comment.


  Revision r1628:
  lock_has_to_wait() is needed in the INFORMATION_SCHEMA implementation
  in order to determine which lock is blocking which. Make it non-static
  and put its definition in include/lock0lock.h.

  Approved by:	Heikki (via IM)
storage/innobase/include/mem0mem.ic:
  Apply snapshot innodb-51-ss1644

  Revision r1581:
  Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/include/page0page.h:
  Apply snapshot innodb-51-ss1644

  Revision r1571:
  Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
  When creating an index containing a too long record, InnoDB would
  dereference a NULL pointer when trying to determine the maximum row length.

  innodb_check_for_record_too_big_error(): Replace the dict_table_t*
  parameter with a Boolean flag.  There is not always a dict_table_t object
  when this function is called.

  page_get_free_space_of_empty_noninline(): Move the definition and
  declaration from row0mysql (!) to page0page.  Make the signature
  identical with page_get_free_space_of_empty().

  create_clustered_index_when_no_primary(): Add the parameter "comp".
  Remove unnecessary casts.
storage/innobase/include/row0mysql.h:
  Apply snapshot innodb-51-ss1644

  Revision r1571:
  Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
  When creating an index containing a too long record, InnoDB would
  dereference a NULL pointer when trying to determine the maximum row length.

  innodb_check_for_record_too_big_error(): Replace the dict_table_t*
  parameter with a Boolean flag.  There is not always a dict_table_t object
  when this function is called.

  page_get_free_space_of_empty_noninline(): Move the definition and
  declaration from row0mysql (!) to page0page.  Make the signature
  identical with page_get_free_space_of_empty().

  create_clustered_index_when_no_primary(): Add the parameter "comp".
  Remove unnecessary casts.
storage/innobase/include/univ.i:
  Apply snapshot innodb-51-ss1644

  Revision r1605:
  Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
  by typecasting the variables before multiplying them, so that the result of
  the multiplication is of type "unsigned long long".

  I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
  use it without overwriting it with zeroes (by commenting the code that
  overwrites :newraw files).

  New type ullint is introduced with the sole purpose of shortening
  "unsigned long long", please do not define it to something else than
  "unsigned long long".

  Approved by:	Heikki


  Revision r1581:
  Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/lock/lock0lock.c:
  Apply snapshot innodb-51-ss1644

  Revision r1631:
  Move lock_rec_find_set_bit() and lock_rec_get_prev() from
  lock/lock0lock.c to include/lock0priv.h and make them non-static.
  They will be used in lock/lock0iter.c.

  Approved by:	Heikki


  Revision r1636:
  Move lock_get_type() from lock/lock0lock.c to include/lock0priv.ic:
  * lock0lock.c: remove lock_get_type() and include include/lock0priv.ic
  * lock0priv.h: include lock0priv.ic and add lock_get_type() prototype
  * Makefile.am: add lock0priv.ic to noinst_HEADERS
  * lock0priv.ic: introduce this new file containing the body of
    lock_get_type()

  This move is necessary in order to use lock_get_type() from other lock/
  source files (it's going to be used in lock/lock0iter.c).

  Approved by:	Heikki


  Revision r1628:
  lock_has_to_wait() is needed in the INFORMATION_SCHEMA implementation
  in order to determine which lock is blocking which. Make it non-static
  and put its definition in include/lock0lock.h.

  Approved by:	Heikki (via IM)


  Revision r1629:
  Add "const" qualifiers to lock_get_type() and lock_get_mode().

  Approved by:	Sunny


  Revision r1626:
  Move lock_*struct structures from lock/lock0lock.c to include/lock0priv.h.

  This is needed in order to add more code to lock/ that uses members of
  these structures (internal to the lock module) but in a separate file,
  rather than lock0lock.c. lock0lock.c is a way too big already.

  Approved by:	Sunny
storage/innobase/log/log0recv.c:
  Apply snapshot innodb-51-ss1644

  Revision r1607:
  Bug#23710

  At InnoDB startup consider the case where log scan went beyond checkpoint_lsn as a crash and initiate crash recovery code path.

  reviewed by: Heikki
storage/innobase/mem/mem0mem.c:
  Apply snapshot innodb-51-ss1644

  Revision r1581:
  Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/mem/mem0pool.c:
  Apply snapshot innodb-51-ss1644

  Revision r1581:
  Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/os/os0file.c:
  Apply snapshot innodb-51-ss1644

  Revision r1613:
  Fix Bug#29155 by enabling file locking on FreeBSD.
  It has been disabled because InnoDB has refused to start on
  FreeBSD & LinuxThreads, but now it starts just fine.

  Approved by:	Heikki
storage/innobase/page/page0page.c:
  Apply snapshot innodb-51-ss1644

  Revision r1571:
  Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
  When creating an index containing a too long record, InnoDB would
  dereference a NULL pointer when trying to determine the maximum row length.

  innodb_check_for_record_too_big_error(): Replace the dict_table_t*
  parameter with a Boolean flag.  There is not always a dict_table_t object
  when this function is called.

  page_get_free_space_of_empty_noninline(): Move the definition and
  declaration from row0mysql (!) to page0page.  Make the signature
  identical with page_get_free_space_of_empty().

  create_clustered_index_when_no_primary(): Add the parameter "comp".
  Remove unnecessary casts.
storage/innobase/rem/rem0rec.c:
  Apply snapshot innodb-51-ss1644

  Revision r1581:
  Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/row/row0mysql.c:
  Apply snapshot innodb-51-ss1644

  Revision r1571:
  Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
  When creating an index containing a too long record, InnoDB would
  dereference a NULL pointer when trying to determine the maximum row length.

  innodb_check_for_record_too_big_error(): Replace the dict_table_t*
  parameter with a Boolean flag.  There is not always a dict_table_t object
  when this function is called.

  page_get_free_space_of_empty_noninline(): Move the definition and
  declaration from row0mysql (!) to page0page.  Make the signature
  identical with page_get_free_space_of_empty().

  create_clustered_index_when_no_primary(): Add the parameter "comp".
  Remove unnecessary casts.
storage/innobase/sync/sync0rw.c:
  Apply snapshot innodb-51-ss1644

  Revision r1598:
  Add some comments.

  Approved by:	Heikki (via IM)
storage/innobase/sync/sync0sync.c:
  Apply snapshot innodb-51-ss1644

  Revision r1598:
  Add some comments.

  Approved by:	Heikki (via IM)
storage/innobase/trx/trx0sys.c:
  Apply snapshot innodb-51-ss1644

  Revision r1581:
  Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/trx/trx0trx.c:
  Apply snapshot innodb-51-ss1644

  Revision r1595:
  trx_commit_for_mysql(): Avoid acquiring and releasing kernel_mutex when
  trx->sess or trx_dummy_sess is non-NULL.
storage/innobase/ut/ut0mem.c:
  Apply snapshot innodb-51-ss1644

  Revision r1581:
  Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
---
 storage/innobase/Makefile.am          |   5 +-
 storage/innobase/buf/buf0buf.c        |  12 +-
 storage/innobase/buf/buf0lru.c        |  13 ++
 storage/innobase/fsp/fsp0fsp.c        |   5 +-
 storage/innobase/handler/ha_innodb.cc |  41 ++---
 storage/innobase/include/buf0buf.ic   |   2 +-
 storage/innobase/include/fsp0fsp.h    |   2 +-
 storage/innobase/include/lock0lock.h  |  14 +-
 storage/innobase/include/mem0mem.ic   |   6 +
 storage/innobase/include/page0page.h  |   9 +
 storage/innobase/include/row0mysql.h  |  13 --
 storage/innobase/include/univ.i       |  16 ++
 storage/innobase/lock/lock0lock.c     |  64 +------
 storage/innobase/log/log0recv.c       | 247 +++++++++++++++-----------
 storage/innobase/mem/mem0mem.c        |   1 +
 storage/innobase/mem/mem0pool.c       |   6 +
 storage/innobase/os/os0file.c         |   3 +-
 storage/innobase/page/page0page.c     |  12 ++
 storage/innobase/rem/rem0rec.c        |   6 +-
 storage/innobase/row/row0mysql.c      |  22 ---
 storage/innobase/sync/sync0rw.c       |  18 ++
 storage/innobase/sync/sync0sync.c     |   1 +
 storage/innobase/trx/trx0sys.c        |  11 +-
 storage/innobase/trx/trx0trx.c        |  12 +-
 storage/innobase/ut/ut0mem.c          |   2 +
 25 files changed, 314 insertions(+), 229 deletions(-)

diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am
index 0b23ae74f9e..30e056d68fb 100644
--- a/storage/innobase/Makefile.am
+++ b/storage/innobase/Makefile.am
@@ -55,7 +55,9 @@ noinst_HEADERS = include/btr0btr.h include/btr0btr.ic			\
 			include/ha0ha.ic include/hash0hash.h		\
 			include/hash0hash.ic include/ibuf0ibuf.h	\
 			include/ibuf0ibuf.ic include/ibuf0types.h	\
+			include/lock0iter.h				\
 			include/lock0lock.h include/lock0lock.ic	\
+			include/lock0priv.h include/lock0priv.ic	\
 			include/lock0types.h include/log0log.h		\
 			include/log0log.ic include/log0recv.h		\
 			include/log0recv.ic include/mach0data.h		\
@@ -129,7 +131,8 @@ libinnobase_a_SOURCES =	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c	\
 			eval/eval0eval.c eval/eval0proc.c		\
 			fil/fil0fil.c fsp/fsp0fsp.c fut/fut0fut.c	\
 			fut/fut0lst.c ha/ha0ha.c ha/hash0hash.c		\
-			ibuf/ibuf0ibuf.c lock/lock0lock.c		\
+			ibuf/ibuf0ibuf.c lock/lock0iter.c		\
+			lock/lock0lock.c				\
 			log/log0log.c log/log0recv.c mach/mach0data.c	\
 			mem/mem0mem.c mem/mem0pool.c mtr/mtr0log.c	\
 			mtr/mtr0mtr.c os/os0file.c os/os0proc.c		\
diff --git a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
index c847b8db9e2..469d3ac05d7 100644
--- a/storage/innobase/buf/buf0buf.c
+++ b/storage/innobase/buf/buf0buf.c
@@ -903,8 +903,7 @@ buf_block_make_young(
 	/* Note that we read freed_page_clock's without holding any mutex:
 	this is allowed since the result is used only in heuristics */
 
-	if (buf_pool->freed_page_clock >= block->freed_page_clock
-				+ 1 + (buf_pool->curr_size / 4)) {
+	if (buf_block_peek_if_too_old(block)) {
 
 		mutex_enter(&buf_pool->mutex);
 		/* There has been freeing activity in the LRU list:
@@ -1648,6 +1647,15 @@ buf_page_init(
 
 	block->lock_hash_val	= lock_rec_hash(space, offset);
 
+#ifdef UNIV_DEBUG_VALGRIND
+	if (!space) {
+		/* Silence valid Valgrind warnings about uninitialized
+		data being written to data files.  There are some unused
+		bytes on some pages that InnoDB does not initialize. */
+		UNIV_MEM_VALID(block->frame, UNIV_PAGE_SIZE);
+	}
+#endif /* UNIV_DEBUG_VALGRIND */
+
 	/* Insert into the hash table of file pages */
 
 	if (buf_page_hash_get(space, offset)) {
diff --git a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
index 1e27144bdbf..7b49a7641af 100644
--- a/storage/innobase/buf/buf0lru.c
+++ b/storage/innobase/buf/buf0lru.c
@@ -244,7 +244,15 @@ buf_LRU_search_and_free_block(
 			frame at all */
 
 			if (block->frame) {
+				/* The page was declared uninitialized
+				by buf_LRU_block_remove_hashed_page().
+				We need to flag the contents of the
+				page valid (which it still is) in
+				order to avoid bogus Valgrind
+				warnings. */
+				UNIV_MEM_VALID(block->frame, UNIV_PAGE_SIZE);
 				btr_search_drop_page_hash_index(block->frame);
+				UNIV_MEM_INVALID(block->frame, UNIV_PAGE_SIZE);
 			}
 
 			ut_a(block->buf_fix_count == 0);
@@ -449,6 +457,7 @@ loop:
 		mutex_enter(&block->mutex);
 
 		block->state = BUF_BLOCK_READY_FOR_USE;
+		UNIV_MEM_ALLOC(block->frame, UNIV_PAGE_SIZE);
 
 		mutex_exit(&block->mutex);
 
@@ -864,6 +873,7 @@ buf_LRU_block_free_non_file_page(
 
 	block->state = BUF_BLOCK_NOT_USED;
 
+	UNIV_MEM_ALLOC(block->frame, UNIV_PAGE_SIZE);
 #ifdef UNIV_DEBUG
 	/* Wipe contents of page to reveal possible stale pointers to it */
 	memset(block->frame, '\0', UNIV_PAGE_SIZE);
@@ -871,6 +881,8 @@ buf_LRU_block_free_non_file_page(
 	UT_LIST_ADD_FIRST(free, buf_pool->free, block);
 	block->in_free_list = TRUE;
 
+	UNIV_MEM_FREE(block->frame, UNIV_PAGE_SIZE);
+
 	if (srv_use_awe && block->frame) {
 		/* Add to the list of mapped pages */
 
@@ -939,6 +951,7 @@ buf_LRU_block_remove_hashed_page(
 		    buf_page_address_fold(block->space, block->offset),
 		    block);
 
+	UNIV_MEM_INVALID(block->frame, UNIV_PAGE_SIZE);
 	block->state = BUF_BLOCK_REMOVE_HASH;
 }
 
diff --git a/storage/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c
index 78fb55e4ef3..e1074933fe8 100644
--- a/storage/innobase/fsp/fsp0fsp.c
+++ b/storage/innobase/fsp/fsp0fsp.c
@@ -2829,7 +2829,7 @@ will be able to insert new data to the database without running out the
 tablespace. Only free extents are taken into account and we also subtract
 the safety margin required by the above function fsp_reserve_free_extents. */
 
-ulint
+ullint
 fsp_get_available_space_in_free_extents(
 /*====================================*/
 			/* out: available space in kB */
@@ -2895,7 +2895,8 @@ fsp_get_available_space_in_free_extents(
 		return(0);
 	}
 
-	return(((n_free - reserve) * FSP_EXTENT_SIZE)
+	return((ullint)(n_free - reserve)
+	       * FSP_EXTENT_SIZE
 	       * (UNIV_PAGE_SIZE / 1024));
 }
 
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index b7d0c4417c3..c2e230d2087 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -4533,17 +4533,16 @@ ha_innobase::position(
 /*********************************************************************
 If it's a DB_TOO_BIG_RECORD error then set a suitable message to
 return to the client.*/
-static
+inline
 void
 innodb_check_for_record_too_big_error(
 /*==================================*/
-	dict_table_t*	table,		/* in: table to check */
-	int		error)		/* in: error code to check */
+	ulint	comp,	/* in: ROW_FORMAT: nonzero=COMPACT, 0=REDUNDANT */
+	int	error)	/* in: error code to check */
 {
 	if (error == (int)DB_TOO_BIG_RECORD) {
-		ulint		max_row_size;
-
-		max_row_size = page_get_free_space_of_empty_noninline(table);
+		ulint	max_row_size
+			= page_get_free_space_of_empty_noninline(comp) / 2;
 
 		my_error(ER_TOO_BIG_ROWSIZE, MYF(0), max_row_size);
 	}
@@ -4657,9 +4656,7 @@ create_table_def(
 
 	error = row_create_table_for_mysql(table, trx);
 
-	/* We need access to the table and so we do the error checking
-	and set the error message here, before the error translation.*/
-	innodb_check_for_record_too_big_error(table, error);
+	innodb_check_for_record_too_big_error(flags & DICT_TF_COMPACT, error);
 
 	error = convert_error_code_to_mysql(error, NULL);
 
@@ -4783,9 +4780,8 @@ create_index(
 	sure we don't create too long indexes. */
 	error = row_create_index_for_mysql(index, trx, field_lengths);
 
-	/* We need access to the table and so we do the error checking
-	and set the error message here, before the error translation.*/
-	innodb_check_for_record_too_big_error(index->table, error);
+	innodb_check_for_record_too_big_error(form->s->row_type
+					      != ROW_TYPE_REDUNDANT, error);
 
 	error = convert_error_code_to_mysql(error, NULL);
 
@@ -4802,6 +4798,8 @@ int
 create_clustered_index_when_no_primary(
 /*===================================*/
 	trx_t*		trx,		/* in: InnoDB transaction handle */
+	ulint		comp,		/* in: ROW_FORMAT:
+					nonzero=COMPACT, 0=REDUNDANT */
 	const char*	table_name)	/* in: table name */
 {
 	dict_index_t*	index;
@@ -4810,13 +4808,11 @@ create_clustered_index_when_no_primary(
 	/* We pass 0 as the space id, and determine at a lower level the space
 	id where to store the table */
 
-	index = dict_mem_index_create((char*) table_name,
-		(char*) "GEN_CLUST_INDEX", 0, DICT_CLUSTERED, 0);
+	index = dict_mem_index_create(table_name, "GEN_CLUST_INDEX",
+				      0, DICT_CLUSTERED, 0);
 	error = row_create_index_for_mysql(index, trx, NULL);
 
-	/* We need access to the table and so we do the error checking
-	and set the error message here, before the error translation.*/
-	innodb_check_for_record_too_big_error(index->table, error);
+	innodb_check_for_record_too_big_error(comp, error);
 
 	error = convert_error_code_to_mysql(error, NULL);
 
@@ -4947,8 +4943,9 @@ ha_innobase::create(
 		order the rows by their row id which is internally generated
 		by InnoDB */
 
-		error = create_clustered_index_when_no_primary(trx,
-							norm_name);
+		error = create_clustered_index_when_no_primary(
+			trx, form->s->row_type != ROW_TYPE_REDUNDANT,
+			norm_name);
 		if (error) {
 			goto cleanup;
 		}
@@ -5873,9 +5870,9 @@ ha_innobase::update_table_comment(
 	mutex_enter_noninline(&srv_dict_tmpfile_mutex);
 	rewind(srv_dict_tmpfile);
 
-	fprintf(srv_dict_tmpfile, "InnoDB free: %lu kB",
-		   (ulong) fsp_get_available_space_in_free_extents(
-					prebuilt->table->space));
+	fprintf(srv_dict_tmpfile, "InnoDB free: %llu kB",
+		fsp_get_available_space_in_free_extents(
+			prebuilt->table->space));
 
 	dict_print_info_on_foreign_keys(FALSE, srv_dict_tmpfile,
 				prebuilt->trx, prebuilt->table);
diff --git a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
index 031bf6c51b4..b077ff0c181 100644
--- a/storage/innobase/include/buf0buf.ic
+++ b/storage/innobase/include/buf0buf.ic
@@ -28,7 +28,7 @@ buf_block_peek_if_too_old(
 	buf_block_t*	block)	/* in: block to make younger */
 {
 	return(buf_pool->freed_page_clock >= block->freed_page_clock
-	       + 1 + (buf_pool->curr_size / 1024));
+	       + 1 + (buf_pool->curr_size / 4));
 }
 
 /*************************************************************************
diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h
index d04269fc157..82e95a2e920 100644
--- a/storage/innobase/include/fsp0fsp.h
+++ b/storage/innobase/include/fsp0fsp.h
@@ -245,7 +245,7 @@ will be able to insert new data to the database without running out the
 tablespace. Only free extents are taken into account and we also subtract
 the safety margin required by the above function fsp_reserve_free_extents. */
 
-ulint
+ullint
 fsp_get_available_space_in_free_extents(
 /*====================================*/
 			/* out: available space in kB */
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
index 6b863e32183..059c459c374 100644
--- a/storage/innobase/include/lock0lock.h
+++ b/storage/innobase/include/lock0lock.h
@@ -519,6 +519,18 @@ lock_is_table_exclusive(
 	dict_table_t*	table,	/* in: table */
 	trx_t*		trx);	/* in: transaction */
 /*************************************************************************
+Checks if a lock request lock1 has to wait for request lock2. */
+
+ibool
+lock_has_to_wait(
+/*=============*/
+			/* out: TRUE if lock1 has to wait for lock2 to be
+			removed */
+	lock_t*	lock1,	/* in: waiting lock */
+	lock_t*	lock2);	/* in: another lock; NOTE that it is assumed that this
+			has a lock bit set on the same record as in lock1 if
+			the locks are record locks */
+/*************************************************************************
 Checks that a transaction id is sensible, i.e., not in the future. */
 
 ibool
@@ -597,7 +609,7 @@ lock_validate(void);
 			/* out: TRUE if ok */
 /*************************************************************************
 Return approximate number or record locks (bits set in the bitmap) for
-this transaction. Since delete-marked records ma ybe removed, the
+this transaction. Since delete-marked records maybe removed, the
 record count will not be precise. */
 
 ulint
diff --git a/storage/innobase/include/mem0mem.ic b/storage/innobase/include/mem0mem.ic
index cb8fbe92cf0..e59443da73d 100644
--- a/storage/innobase/include/mem0mem.ic
+++ b/storage/innobase/include/mem0mem.ic
@@ -167,6 +167,8 @@ mem_heap_alloc(
 	mem_block_set_free(block, free + MEM_SPACE_NEEDED(n));
 
 #ifdef UNIV_MEM_DEBUG
+	UNIV_MEM_ALLOC(buf,
+		       n + MEM_FIELD_HEADER_SIZE + MEM_FIELD_TRAILER_SIZE);
 
 	/* In the debug version write debugging info to the field */
 	mem_field_init((byte*)buf, n);
@@ -177,8 +179,10 @@ mem_heap_alloc(
 
 #endif
 #ifdef UNIV_SET_MEM_TO_ZERO
+	UNIV_MEM_ALLOC(buf, n);
 	memset(buf, '\0', n);
 #endif
+	UNIV_MEM_ALLOC(buf, n);
 	return(buf);
 }
 
@@ -369,6 +373,8 @@ mem_heap_free_top(
 	if ((heap != block) && (mem_block_get_free(block)
 				== mem_block_get_start(block))) {
 		mem_heap_block_free(heap, block);
+	} else {
+		UNIV_MEM_FREE((byte*) block + mem_block_get_free(block), n);
 	}
 }
 
diff --git a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h
index 833d268c9de..273007c2778 100644
--- a/storage/innobase/include/page0page.h
+++ b/storage/innobase/include/page0page.h
@@ -531,6 +531,15 @@ page_get_free_space_of_empty(
 			/* out: free space */
 	ulint	comp)	/* in: nonzero=compact page format */
 		__attribute__((const));
+/*****************************************************************
+Calculates free space if a page is emptied. */
+
+ulint
+page_get_free_space_of_empty_noninline(
+/*===================================*/
+			/* out: free space */
+	ulint	comp)	/* in: nonzero=compact page format */
+		__attribute__((const));
 /****************************************************************
 Returns the sum of the sizes of the records in the record list
 excluding the infimum and supremum records. */
diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h
index bda3494073f..1448efe94fe 100644
--- a/storage/innobase/include/row0mysql.h
+++ b/storage/innobase/include/row0mysql.h
@@ -460,19 +460,6 @@ row_check_table_for_mysql(
 					/* out: DB_ERROR or DB_SUCCESS */
 	row_prebuilt_t*	prebuilt);	/* in: prebuilt struct in MySQL
 					handle */
-/*************************************************************************
-Get the min of the maximum possible row sizes. */
-
-ulint
-page_get_free_space_of_empty_noninline(
-/*===================================*/
-					/* out: The (approx) maximum size
-					of a row, this is a conservative
-					estimate, since the size can be
-					slightly larger depending upon
-					the ROW_FORMAT setting.*/
-	dict_table_t*	table);		/* in: table for which max record
-					size required.*/
 
 /* A struct describing a place for an individual column in the MySQL
 row format which is presented to the table handler in ha_innobase.
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index 957baa0391f..ba8e6e56219 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -83,6 +83,8 @@ memory is read outside the allocated blocks. */
 /* Make a non-inline debug version */
 
 #if 0
+#define UNIV_DEBUG_VALGRIND			/* Enable extra
+						Valgrind instrumentation */
 #define UNIV_DEBUG				/* Enable ut_ad() assertions */
 #define UNIV_LIST_DEBUG				/* debug UT_LIST_ macros */
 #define UNIV_MEM_DEBUG				/* detect memory leaks etc */
@@ -214,6 +216,8 @@ typedef __int64			ib_longlong;
 typedef longlong		ib_longlong;
 #endif
 
+typedef unsigned long long int	ullint;
+
 #ifndef __WIN__
 #if SIZEOF_LONG != SIZEOF_VOIDP
 #error "Error: InnoDB's ulint must be of the same size as void*"
@@ -298,5 +302,17 @@ typedef void* os_thread_ret_t;
 #include "ut0dbg.h"
 #include "ut0ut.h"
 #include "db0err.h"
+#ifdef UNIV_DEBUG_VALGRIND
+# include <valgrind/memcheck.h>
+# define UNIV_MEM_VALID(addr, size) VALGRIND_MAKE_MEM_DEFINED(addr, size)
+# define UNIV_MEM_INVALID(addr, size) VALGRIND_MAKE_MEM_UNDEFINED(addr, size)
+# define UNIV_MEM_FREE(addr, size) VALGRIND_MAKE_MEM_NOACCESS(addr, size)
+# define UNIV_MEM_ALLOC(addr, size) VALGRIND_MAKE_MEM_UNDEFINED(addr, size)
+#else
+# define UNIV_MEM_VALID(addr, size) do {} while(0)
+# define UNIV_MEM_INVALID(addr, size) do {} while(0)
+# define UNIV_MEM_FREE(addr, size) do {} while(0)
+# define UNIV_MEM_ALLOC(addr, size) do {} while(0)
+#endif
 
 #endif
diff --git a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
index 6f5390145b5..f43752fb5fc 100644
--- a/storage/innobase/lock/lock0lock.c
+++ b/storage/innobase/lock/lock0lock.c
@@ -6,10 +6,14 @@ The transaction lock system
 Created 5/7/1996 Heikki Tuuri
 *******************************************************/
 
+#define LOCK_MODULE_IMPLEMENTATION
+
 #include "lock0lock.h"
+#include "lock0priv.h"
 
 #ifdef UNIV_NONINL
 #include "lock0lock.ic"
+#include "lock0priv.ic"
 #endif
 
 #include "usr0sess.h"
@@ -319,42 +323,6 @@ ibool	lock_print_waits	= FALSE;
 /* The lock system */
 lock_sys_t*	lock_sys	= NULL;
 
-/* A table lock */
-typedef struct lock_table_struct	lock_table_t;
-struct lock_table_struct{
-	dict_table_t*	table;	/* database table in dictionary cache */
-	UT_LIST_NODE_T(lock_t)
-			locks;	/* list of locks on the same table */
-};
-
-/* Record lock for a page */
-typedef struct lock_rec_struct		lock_rec_t;
-struct lock_rec_struct{
-	ulint	space;		/* space id */
-	ulint	page_no;	/* page number */
-	ulint	n_bits;		/* number of bits in the lock bitmap */
-				/* NOTE: the lock bitmap is placed immediately
-				after the lock struct */
-};
-
-/* Lock struct */
-struct lock_struct{
-	trx_t*		trx;		/* transaction owning the lock */
-	UT_LIST_NODE_T(lock_t)
-			trx_locks;	/* list of the locks of the
-					transaction */
-	ulint		type_mode;	/* lock type, mode, LOCK_GAP or
-					LOCK_REC_NOT_GAP,
-					LOCK_INSERT_INTENTION,
-					wait flag, ORed */
-	hash_node_t	hash;		/* hash chain node for a record lock */
-	dict_index_t*	index;		/* index for a record lock */
-	union {
-		lock_table_t	tab_lock;/* table lock */
-		lock_rec_t	rec_lock;/* record lock */
-	} un_member;
-};
-
 /* We store info on the latest deadlock error to this buffer. InnoDB
 Monitor will then fetch it and print */
 ibool	lock_deadlock_found = FALSE;
@@ -400,20 +368,6 @@ lock_deadlock_recursive(
 				LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK, we
 				return LOCK_VICTIM_IS_START */
 
-/*************************************************************************
-Gets the type of a lock. */
-UNIV_INLINE
-ulint
-lock_get_type(
-/*==========*/
-			/* out: LOCK_TABLE or LOCK_REC */
-	lock_t*	lock)	/* in: lock */
-{
-	ut_ad(lock);
-
-	return(lock->type_mode & LOCK_TYPE_MASK);
-}
-
 /*************************************************************************
 Gets the nth bit of a record lock. */
 UNIV_INLINE
@@ -611,8 +565,8 @@ UNIV_INLINE
 ulint
 lock_get_mode(
 /*==========*/
-			/* out: mode */
-	lock_t*	lock)	/* in: lock */
+				/* out: mode */
+	const lock_t*	lock)	/* in: lock */
 {
 	ut_ad(lock);
 
@@ -1017,7 +971,7 @@ lock_rec_has_to_wait(
 
 /*************************************************************************
 Checks if a lock request lock1 has to wait for request lock2. */
-static
+
 ibool
 lock_has_to_wait(
 /*=============*/
@@ -1098,7 +1052,7 @@ lock_rec_set_nth_bit(
 /**************************************************************************
 Looks for a set bit in a record lock bitmap. Returns ULINT_UNDEFINED,
 if none found. */
-static
+
 ulint
 lock_rec_find_set_bit(
 /*==================*/
@@ -1390,7 +1344,7 @@ lock_rec_copy(
 
 /*************************************************************************
 Gets the previous record lock set on a record. */
-static
+
 lock_t*
 lock_rec_get_prev(
 /*==============*/
diff --git a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
index ab5f42e3a13..ce2fc3ed535 100644
--- a/storage/innobase/log/log0recv.c
+++ b/storage/innobase/log/log0recv.c
@@ -57,6 +57,16 @@ ibool		recv_needed_recovery = FALSE;
 
 ibool		recv_lsn_checks_on = FALSE;
 
+/* There are two conditions under which we scan the logs, the first
+is normal startup and the second is when we do a recovery from an
+archive.
+This flag is set if we are doing a scan from the last checkpoint during
+startup. If we find log entries that were written after the last checkpoint
+we know that the server was not cleanly shutdown. We must then initialize
+the crash recovery environment before attempting to store these entries in
+the log hash table. */
+ibool	recv_log_scan_is_startup_type = FALSE;
+
 /* If the following is TRUE, the buffer pool file pages must be invalidated
 after recovery and no ibuf operations are allowed; this becomes TRUE if
 the log record hash table becomes too full, and log records must be merged
@@ -99,6 +109,16 @@ the recovery failed and the database may be corrupt. */
 
 dulint	recv_max_page_lsn;
 
+/* prototypes */
+
+/***********************************************************
+Initialize crash recovery environment. Can be called iff
+recv_needed_recovery == FALSE. */
+static
+void 
+recv_init_crash_recovery(void);
+/*===========================*/
+
 /************************************************************
 Creates the recovery system. */
 
@@ -2284,6 +2304,23 @@ recv_scan_log_recs(
 
 		if (ut_dulint_cmp(scanned_lsn, recv_sys->scanned_lsn) > 0) {
 
+			/* We have found more entries. If this scan is
+ 			of startup type, we must initiate crash recovery
+			environment before parsing these log records. */
+
+			if (recv_log_scan_is_startup_type
+			    && !recv_needed_recovery) {
+
+				fprintf(stderr,
+					"InnoDB: Log scan progressed"
+					" past the checkpoint lsn %lu %lu\n",
+					(ulong) ut_dulint_get_high(
+						recv_sys->scanned_lsn),
+					(ulong) ut_dulint_get_low(
+						recv_sys->scanned_lsn));
+				recv_init_crash_recovery();
+			}
+
 			/* We were able to find more log data: add it to the
 			parsing buffer if parse_start_lsn is already
 			non-zero */
@@ -2405,6 +2442,48 @@ recv_group_scan_log_recs(
 #endif /* UNIV_DEBUG */
 }
 
+/***********************************************************
+Initialize crash recovery environment. Can be called iff
+recv_needed_recovery == FALSE. */
+static
+void
+recv_init_crash_recovery(void)
+/*==========================*/
+{
+	ut_a(!recv_needed_recovery); 
+
+	recv_needed_recovery = TRUE;
+
+	ut_print_timestamp(stderr);
+
+	fprintf(stderr,
+		"  InnoDB: Database was not"
+		" shut down normally!\n"
+		"InnoDB: Starting crash recovery.\n");
+
+	fprintf(stderr,
+		"InnoDB: Reading tablespace information"
+		" from the .ibd files...\n");
+
+	fil_load_single_table_tablespaces();
+
+	/* If we are using the doublewrite method, we will
+	check if there are half-written pages in data files,
+	and restore them from the doublewrite buffer if
+	possible */
+
+	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
+
+		fprintf(stderr,
+			"InnoDB: Restoring possible"
+			" half-written data pages from"
+			" the doublewrite\n"
+			"InnoDB: buffer...\n");
+		trx_sys_doublewrite_init_or_restore_pages(TRUE);
+	}
+	
+}
+
 /************************************************************
 Recovers from a checkpoint. When this function returns, the database is able
 to start processing of new user transactions, but the function
@@ -2532,92 +2611,6 @@ recv_recovery_from_checkpoint_start(
 		recv_sys->recovered_lsn = checkpoint_lsn;
 
 		srv_start_lsn = checkpoint_lsn;
-
-		/* NOTE: we always do a 'recovery' at startup, but only if
-		there is something wrong we will print a message to the
-		user about recovery: */
-
-		if (ut_dulint_cmp(checkpoint_lsn, max_flushed_lsn) != 0
-		    || ut_dulint_cmp(checkpoint_lsn, min_flushed_lsn) != 0) {
-
-			if (ut_dulint_cmp(checkpoint_lsn, max_flushed_lsn)
-			    < 0) {
-				fprintf(stderr,
-					"InnoDB: #########################"
-					"#################################\n"
-					"InnoDB:                          "
-					"WARNING!\n"
-					"InnoDB: The log sequence number"
-					" in ibdata files is higher\n"
-					"InnoDB: than the log sequence number"
-					" in the ib_logfiles! Are you sure\n"
-					"InnoDB: you are using the right"
-					" ib_logfiles to start up"
-					" the database?\n"
-					"InnoDB: Log sequence number in"
-					" ib_logfiles is %lu %lu, log\n"
-					"InnoDB: sequence numbers stamped"
-					" to ibdata file headers are between\n"
-					"InnoDB: %lu %lu and %lu %lu.\n"
-					"InnoDB: #########################"
-					"#################################\n",
-					(ulong) ut_dulint_get_high(
-						checkpoint_lsn),
-					(ulong) ut_dulint_get_low(
-						checkpoint_lsn),
-					(ulong) ut_dulint_get_high(
-						min_flushed_lsn),
-					(ulong) ut_dulint_get_low(
-						min_flushed_lsn),
-					(ulong) ut_dulint_get_high(
-						max_flushed_lsn),
-					(ulong) ut_dulint_get_low(
-						max_flushed_lsn));
-			}
-
-			recv_needed_recovery = TRUE;
-
-			ut_print_timestamp(stderr);
-
-			fprintf(stderr,
-				"  InnoDB: Database was not"
-				" shut down normally!\n"
-				"InnoDB: Starting crash recovery.\n");
-
-			fprintf(stderr,
-				"InnoDB: Reading tablespace information"
-				" from the .ibd files...\n");
-
-			fil_load_single_table_tablespaces();
-
-			/* If we are using the doublewrite method, we will
-			check if there are half-written pages in data files,
-			and restore them from the doublewrite buffer if
-			possible */
-
-			if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
-
-				fprintf(stderr,
-					"InnoDB: Restoring possible"
-					" half-written data pages from"
-					" the doublewrite\n"
-					"InnoDB: buffer...\n");
-				trx_sys_doublewrite_init_or_restore_pages(
-					TRUE);
-			}
-
-			ut_print_timestamp(stderr);
-
-			fprintf(stderr,
-				"  InnoDB: Starting log scan"
-				" based on checkpoint at\n"
-				"InnoDB: log sequence number %lu %lu.\n",
-				(ulong) ut_dulint_get_high(checkpoint_lsn),
-				(ulong) ut_dulint_get_low(checkpoint_lsn));
-		} else {
-			/* Init the doublewrite buffer memory structure */
-			trx_sys_doublewrite_init_or_restore_pages(FALSE);
-		}
 	}
 
 	contiguous_lsn = ut_dulint_align_down(recv_sys->scanned_lsn,
@@ -2670,6 +2663,8 @@ recv_recovery_from_checkpoint_start(
 		group = UT_LIST_GET_NEXT(log_groups, group);
 	}
 
+	/* Set the flag to publish that we are doing startup scan. */
+	recv_log_scan_is_startup_type = (type == LOG_CHECKPOINT);
 	while (group) {
 		old_scanned_lsn = recv_sys->scanned_lsn;
 
@@ -2691,6 +2686,69 @@ recv_recovery_from_checkpoint_start(
 		group = UT_LIST_GET_NEXT(log_groups, group);
 	}
 
+	/* Done with startup scan. Clear the flag. */
+	recv_log_scan_is_startup_type = FALSE;
+	if (type == LOG_CHECKPOINT) {
+		/* NOTE: we always do a 'recovery' at startup, but only if
+		there is something wrong we will print a message to the
+		user about recovery: */
+
+		if (ut_dulint_cmp(checkpoint_lsn, max_flushed_lsn) != 0
+		    || ut_dulint_cmp(checkpoint_lsn, min_flushed_lsn) != 0) {
+
+			if (ut_dulint_cmp(checkpoint_lsn, max_flushed_lsn)
+			    < 0) {
+				fprintf(stderr,
+					"InnoDB: #########################"
+					"#################################\n"
+					"InnoDB:                          "
+					"WARNING!\n"
+					"InnoDB: The log sequence number"
+					" in ibdata files is higher\n"
+					"InnoDB: than the log sequence number"
+					" in the ib_logfiles! Are you sure\n"
+					"InnoDB: you are using the right"
+					" ib_logfiles to start up"
+					" the database?\n"
+					"InnoDB: Log sequence number in"
+					" ib_logfiles is %lu %lu, log\n"
+					"InnoDB: sequence numbers stamped"
+					" to ibdata file headers are between\n"
+					"InnoDB: %lu %lu and %lu %lu.\n"
+					"InnoDB: #########################"
+					"#################################\n",
+					(ulong) ut_dulint_get_high(
+						checkpoint_lsn),
+					(ulong) ut_dulint_get_low(
+						checkpoint_lsn),
+					(ulong) ut_dulint_get_high(
+						min_flushed_lsn),
+					(ulong) ut_dulint_get_low(
+						min_flushed_lsn),
+					(ulong) ut_dulint_get_high(
+						max_flushed_lsn),
+					(ulong) ut_dulint_get_low(
+						max_flushed_lsn));
+
+
+			}
+
+			if (!recv_needed_recovery) {
+				fprintf(stderr,
+					"InnoDB: The log sequence number"
+					" in ibdata files does not match\n"
+					"InnoDB: the log sequence number"
+					" in the ib_logfiles!\n");
+				recv_init_crash_recovery();
+			}
+
+		}
+		if (!recv_needed_recovery) {
+			/* Init the doublewrite buffer memory structure */
+			trx_sys_doublewrite_init_or_restore_pages(FALSE);
+		}
+	}
+
 	/* We currently have only one log group */
 	if (ut_dulint_cmp(group_scanned_lsn, checkpoint_lsn) < 0) {
 		ut_print_timestamp(stderr);
@@ -2747,20 +2805,9 @@ recv_recovery_from_checkpoint_start(
 	recv_synchronize_groups(up_to_date_group);
 
 	if (!recv_needed_recovery) {
-		if (ut_dulint_cmp(checkpoint_lsn, recv_sys->recovered_lsn)
-		    != 0) {
-			fprintf(stderr,
-				"InnoDB: Warning: we did not need to do"
-				" crash recovery, but log scan\n"
-				"InnoDB: progressed past the checkpoint"
-				" lsn %lu %lu up to lsn %lu %lu\n",
-				(ulong) ut_dulint_get_high(checkpoint_lsn),
-				(ulong) ut_dulint_get_low(checkpoint_lsn),
-				(ulong) ut_dulint_get_high(
-					recv_sys->recovered_lsn),
-				(ulong) ut_dulint_get_low(
-					recv_sys->recovered_lsn));
-		}
+		ut_a(ut_dulint_cmp(checkpoint_lsn, 
+				   recv_sys->recovered_lsn) == 0);
+
 	} else {
 		srv_start_lsn = recv_sys->recovered_lsn;
 	}
diff --git a/storage/innobase/mem/mem0mem.c b/storage/innobase/mem/mem0mem.c
index 10b359e8e67..d89a3a55d88 100644
--- a/storage/innobase/mem/mem0mem.c
+++ b/storage/innobase/mem/mem0mem.c
@@ -514,6 +514,7 @@ mem_heap_block_free(
 	mem_erase_buf((byte*)block, len);
 
 #endif
+	UNIV_MEM_FREE(block, len);
 
 	if (init_block) {
 		/* Do not have to free: do nothing */
diff --git a/storage/innobase/mem/mem0pool.c b/storage/innobase/mem/mem0pool.c
index c010ae61160..27da86a0309 100644
--- a/storage/innobase/mem/mem0pool.c
+++ b/storage/innobase/mem/mem0pool.c
@@ -229,6 +229,8 @@ mem_pool_create(
 
 		mem_area_set_size(area, ut_2_exp(i));
 		mem_area_set_free(area, TRUE);
+		UNIV_MEM_FREE(MEM_AREA_EXTRA_SIZE + (byte*) area,
+			      ut_2_exp(i) - MEM_AREA_EXTRA_SIZE);
 
 		UT_LIST_ADD_FIRST(free_list, pool->free_list[i], area);
 
@@ -300,6 +302,7 @@ mem_pool_fill_free_list(
 	UT_LIST_REMOVE(free_list, pool->free_list[i + 1], area);
 
 	area2 = (mem_area_t*)(((byte*)area) + ut_2_exp(i));
+	UNIV_MEM_ALLOC(area2, MEM_AREA_EXTRA_SIZE);
 
 	mem_area_set_size(area2, ut_2_exp(i));
 	mem_area_set_free(area2, TRUE);
@@ -400,6 +403,8 @@ mem_area_alloc(
 	mutex_exit(&(pool->mutex));
 
 	ut_ad(mem_pool_validate(pool));
+	UNIV_MEM_ALLOC(MEM_AREA_EXTRA_SIZE + (byte*)area,
+		       ut_2_exp(n) - MEM_AREA_EXTRA_SIZE);
 
 	return((void*)(MEM_AREA_EXTRA_SIZE + ((byte*)area)));
 }
@@ -482,6 +487,7 @@ mem_area_free(
 	}
 
 	size = mem_area_get_size(area);
+	UNIV_MEM_FREE(ptr, size - MEM_AREA_EXTRA_SIZE);
 
 	if (size == 0) {
 		fprintf(stderr,
diff --git a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
index f496e1127ce..78140cc5ecf 100644
--- a/storage/innobase/os/os0file.c
+++ b/storage/innobase/os/os0file.c
@@ -456,10 +456,9 @@ os_file_handle_error_no_exit(
 
 #undef USE_FILE_LOCK
 #define USE_FILE_LOCK
-#if defined(UNIV_HOTBACKUP) || defined(__WIN__) || defined(__FreeBSD__) || defined(__NETWARE__)
+#if defined(UNIV_HOTBACKUP) || defined(__WIN__) || defined(__NETWARE__)
 /* InnoDB Hot Backup does not lock the data files.
  * On Windows, mandatory locking is used.
- * On FreeBSD with LinuxThreads, advisory locking does not work properly.
  */
 # undef USE_FILE_LOCK
 #endif
diff --git a/storage/innobase/page/page0page.c b/storage/innobase/page/page0page.c
index 4212df7a631..543cf9e34eb 100644
--- a/storage/innobase/page/page0page.c
+++ b/storage/innobase/page/page0page.c
@@ -209,6 +209,18 @@ page_set_max_trx_id(
 	}
 }
 
+/*****************************************************************
+Calculates free space if a page is emptied. */
+
+ulint
+page_get_free_space_of_empty_noninline(
+/*===================================*/
+			/* out: free space */
+	ulint	comp)	/* in: nonzero=compact page format */
+{
+	return(page_get_free_space_of_empty(comp));
+}
+
 /****************************************************************
 Allocates a block of memory from an index page. */
 
diff --git a/storage/innobase/rem/rem0rec.c b/storage/innobase/rem/rem0rec.c
index 3bc73eca9ea..64f8e2d319c 100644
--- a/storage/innobase/rem/rem0rec.c
+++ b/storage/innobase/rem/rem0rec.c
@@ -753,7 +753,11 @@ rec_convert_dtuple_to_rec_old(
 	/* Calculate the offset of the origin in the physical record */
 
 	rec = buf + rec_get_converted_extra_size(data_size, n_fields);
-
+#ifdef UNIV_DEBUG
+	/* Suppress Valgrind warnings of ut_ad()
+	in mach_write_to_1(), mach_write_to_2() et al. */
+	memset(buf, 0xff, rec - buf + data_size);
+#endif /* UNIV_DEBUG */
 	/* Store the number of fields */
 	rec_set_n_fields_old(rec, n_fields);
 
diff --git a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
index 9f88fd8040b..d51b7e1e0b5 100644
--- a/storage/innobase/row/row0mysql.c
+++ b/storage/innobase/row/row0mysql.c
@@ -4059,25 +4059,3 @@ row_check_table_for_mysql(
 
 	return(ret);
 }
-
-/*************************************************************************
-Get the maximum row size. */
-
-ulint
-page_get_free_space_of_empty_noninline(
-/*===================================*/
-					/* out: The (approx) maximum size
-					of a row, this is a conservative
-					estimate, since the size can be
-					slightly larger depending upon
-					the ROW_FORMAT setting.*/
-	dict_table_t*	table)		/* in: table for which max record
-					size is required.*/
-{
-	ibool		compact;
-
-	compact = dict_table_is_comp(table);
-
-	return(page_get_free_space_of_empty(compact) / 2);
-}
-
diff --git a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c
index 34b45e2c1c3..4db780c8b3f 100644
--- a/storage/innobase/sync/sync0rw.c
+++ b/storage/innobase/sync/sync0rw.c
@@ -15,16 +15,34 @@ Created 9/11/1995 Heikki Tuuri
 #include "mem0mem.h"
 #include "srv0srv.h"
 
+/* number of system calls made during shared latching */
 ulint	rw_s_system_call_count	= 0;
+
+/* number of spin waits on rw-latches,
+resulted during shared (read) locks */
 ulint	rw_s_spin_wait_count	= 0;
+
+/* number of OS waits on rw-latches,
+resulted during shared (read) locks */
 ulint	rw_s_os_wait_count	= 0;
 
+/* number of unlocks (that unlock shared locks),
+set only when UNIV_SYNC_PERF_STAT is defined */
 ulint	rw_s_exit_count		= 0;
 
+/* number of system calls made during exclusive latching */
 ulint	rw_x_system_call_count	= 0;
+
+/* number of spin waits on rw-latches,
+resulted during exclusive (write) locks */
 ulint	rw_x_spin_wait_count	= 0;
+
+/* number of OS waits on rw-latches,
+resulted during exclusive (write) locks */
 ulint	rw_x_os_wait_count	= 0;
 
+/* number of unlocks (that unlock exclusive locks),
+set only when UNIV_SYNC_PERF_STAT is defined */
 ulint	rw_x_exit_count		= 0;
 
 /* The global list of rw-locks */
diff --git a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
index 672e1f93aad..bf3f4d1ff20 100644
--- a/storage/innobase/sync/sync0sync.c
+++ b/storage/innobase/sync/sync0sync.c
@@ -115,6 +115,7 @@ ulint	mutex_system_call_count		= 0;
 
 /* Number of spin waits on mutexes: for performance monitoring */
 
+/* round=one iteration of a spin loop */
 ulint	mutex_spin_round_count		= 0;
 ulint	mutex_spin_wait_count		= 0;
 ulint	mutex_os_wait_count		= 0;
diff --git a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c
index 307a03bfbc3..144721150b6 100644
--- a/storage/innobase/trx/trx0sys.c
+++ b/storage/innobase/trx/trx0sys.c
@@ -868,7 +868,16 @@ trx_sysf_create(
 		trx_sysf_rseg_set_page_no(sys_header, i, FIL_NULL, mtr);
 	}
 
-	/* The remaining area (up to the page trailer) is uninitialized. */
+	/* The remaining area (up to the page trailer) is uninitialized.
+	Silence Valgrind warnings about it. */
+	UNIV_MEM_VALID(sys_header + (TRX_SYS_RSEGS
+				     + TRX_SYS_N_RSEGS * TRX_SYS_RSEG_SLOT_SIZE
+				     + TRX_SYS_RSEG_SPACE),
+		       (UNIV_PAGE_SIZE - FIL_PAGE_DATA_END
+			- (TRX_SYS_RSEGS
+			   + TRX_SYS_N_RSEGS * TRX_SYS_RSEG_SLOT_SIZE
+			   + TRX_SYS_RSEG_SPACE))
+		       + page - sys_header);
 
 	/* Create the first rollback segment in the SYSTEM tablespace */
 	page_no = trx_rseg_header_create(TRX_SYS_SPACE, ULINT_MAX, &slot_no,
diff --git a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
index 2d5ce0e1c61..b312e008cd2 100644
--- a/storage/innobase/trx/trx0trx.c
+++ b/storage/innobase/trx/trx0trx.c
@@ -1570,19 +1570,21 @@ trx_commit_for_mysql(
 	the transaction object does not have an InnoDB session object, and we
 	set the dummy session that we use for all MySQL transactions. */
 
-	mutex_enter(&kernel_mutex);
-
 	if (trx->sess == NULL) {
 		/* Open a dummy session */
 
 		if (!trx_dummy_sess) {
-			trx_dummy_sess = sess_open();
+			mutex_enter(&kernel_mutex);
+
+			if (!trx_dummy_sess) {
+				trx_dummy_sess = sess_open();
+			}
+
+			mutex_exit(&kernel_mutex);
 		}
 
 		trx->sess = trx_dummy_sess;
 	}
-	
-	mutex_exit(&kernel_mutex);
 
 	trx_start_if_not_started(trx);
 
diff --git a/storage/innobase/ut/ut0mem.c b/storage/innobase/ut/ut0mem.c
index 4fd515c35e6..b466a5f6872 100644
--- a/storage/innobase/ut/ut0mem.c
+++ b/storage/innobase/ut/ut0mem.c
@@ -162,6 +162,8 @@ retry:
 #endif
 	}
 
+	UNIV_MEM_ALLOC(ret, n + sizeof(ut_mem_block_t));
+
 	((ut_mem_block_t*)ret)->size = n + sizeof(ut_mem_block_t);
 	((ut_mem_block_t*)ret)->magic_n = UT_MEM_MAGIC_N;
 

From 78207030bb8f5dde7d5a0d3e6b84b099b4a8dfba Mon Sep 17 00:00:00 2001
From: unknown <omer@linux.site>
Date: Tue, 24 Jul 2007 21:31:25 -0700
Subject: [PATCH 038/139] Updated/fixed test and result files to 5.0.46 Note
 datadict files do not include wrong is_updatable wrong value      as a result
 of bug 30020.

mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Updated test file
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated test file
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Updated test file
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated test file
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Updated test file
mysql-test/suite/funcs_1/views/func_view.inc:
  Updated test file
---
 .../funcs_1/datadict/datadict_master.inc      |  15 +-
 .../suite/funcs_1/r/innodb__datadict.result   |   3 +-
 .../suite/funcs_1/r/innodb_func_view.result   | 332 +++++++-----------
 .../suite/funcs_1/r/innodb_trig_0102.result   |   2 +-
 .../suite/funcs_1/r/innodb_trig_08.result     |   5 +-
 .../suite/funcs_1/r/innodb_trig_09.result     |   2 +-
 .../suite/funcs_1/r/innodb_views.result       |   3 +-
 .../suite/funcs_1/r/memory__datadict.result   |   3 +-
 .../suite/funcs_1/r/memory_func_view.result   | 332 +++++++-----------
 .../suite/funcs_1/r/memory_trig_0102.result   |   2 +-
 .../suite/funcs_1/r/memory_trig_08.result     |   5 +-
 .../suite/funcs_1/r/memory_trig_09.result     |   2 +-
 .../suite/funcs_1/r/memory_views.result       |   3 +-
 .../suite/funcs_1/r/myisam__datadict.result   |   3 +-
 .../suite/funcs_1/r/myisam_func_view.result   | 332 +++++++-----------
 .../suite/funcs_1/r/myisam_trig_0102.result   |   2 +-
 .../suite/funcs_1/r/myisam_trig_08.result     |   5 +-
 .../suite/funcs_1/r/myisam_trig_09.result     |   2 +-
 .../suite/funcs_1/r/myisam_views.result       |   3 +-
 .../suite/funcs_1/triggers/triggers_0102.inc  |   2 +-
 mysql-test/suite/funcs_1/views/func_view.inc  |   3 +-
 21 files changed, 402 insertions(+), 659 deletions(-)

diff --git a/mysql-test/suite/funcs_1/datadict/datadict_master.inc b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
index 03d3eeb3777..2c8ceb4e68e 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_master.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
@@ -437,19 +437,23 @@ eval SELECT *
 # check also with a 'simple' user
 CREATE USER user_3212@localhost;
 GRANT ALL ON db_datadict.* TO user_3212@localhost;
+# OBN: The following line was added following the fix to bug 28181  
+#      where queries to information_schema will fail if exporting to 
+#      a file without having the FILE attribute
+GRANT FILE ON *.* TO user_3212@localhost;
+
 
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (u3212,localhost,user_3212,,db_datadict);
 --source suite/funcs_1/include/show_connection.inc
 
 # no db given --> db_datadict.schema does not exist
---error 1045
+--error 1146
 eval SELECT *
   INTO OUTFILE '../tmp/out.$ENGINE_TYPE.user.file'
   FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
   LINES TERMINATED BY '\n'
   FROM schemata LIMIT 0, 5;
-# FIXME 3.2.1.2: why do we get different error numbers with and without OUTFILE ?
 --error 1146
 eval SELECT *
   FROM schemata LIMIT 0, 5;
@@ -460,8 +464,6 @@ eval SELECT *
   LINES TERMINATED BY '\n'
   FROM information_schema.schemata
   WHERE schema_name LIKE 'db_%';
-# The above will fail with access error as long as 
-# BUBG#28181 - a regression introduced in 5.0.42 is not fixed
 
 eval SELECT *
   FROM information_schema.schemata
@@ -469,14 +471,11 @@ eval SELECT *
 
 USE information_schema;
 
-# no db given --> db_datadict.schema does not exist
 eval SELECT *
   INTO OUTFILE '../tmp/out.$ENGINE_TYPE.user_2.file'
   FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
   LINES TERMINATED BY '\n'
   FROM schemata LIMIT 0, 5;
-# The above will fail with access error as long as 
-# BUBG#28181 - a regression introduced in 5.0.42 is not fixed
 
 eval SELECT *
   FROM schemata LIMIT 0, 5;
@@ -487,8 +486,6 @@ eval SELECT *
   LINES TERMINATED BY '\n'
   FROM information_schema.schemata
   WHERE schema_name LIKE 'db_%';
-# The above will fail with access error as long as 
-# BUBG#28181 - a regression introduced in 5.0.42 is not fixed
 
 eval SELECT *
   FROM information_schema.schemata
diff --git a/mysql-test/suite/funcs_1/r/innodb__datadict.result b/mysql-test/suite/funcs_1/r/innodb__datadict.result
index 675f30da14a..bbaef83ea59 100644
--- a/mysql-test/suite/funcs_1/r/innodb__datadict.result
+++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result
@@ -4859,6 +4859,7 @@ INTO OUTFILE '../tmp/out.innodb.db.file'
 WHERE schema_name LIKE 'db_%';
 CREATE USER user_3212@localhost;
 GRANT ALL ON db_datadict.* TO user_3212@localhost;
+GRANT FILE ON *.* TO user_3212@localhost;
 connect(localhost,user_3212,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 	
 user_3212@localhost	db_datadict
@@ -4867,7 +4868,7 @@ INTO OUTFILE '../tmp/out.innodb.user.file'
   FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
   LINES TERMINATED BY '\n'
   FROM schemata LIMIT 0, 5;
-ERROR 28000: Access denied for user 'user_3212'@'localhost' (using password: NO)
+ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
 SELECT *
 FROM schemata LIMIT 0, 5;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result
index 5fac88b8f14..f901bcf8246 100644
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -2400,16 +2400,10 @@ my_time, id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2418,16 +2412,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL);
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -2438,16 +2426,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2456,16 +2438,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL);
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2476,15 +2452,10 @@ my_date, id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2493,15 +2464,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL);
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -2512,15 +2478,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2529,15 +2490,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL);
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2780,15 +2736,10 @@ my_time, id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
--838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2797,15 +2748,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL);
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
--838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -2816,16 +2762,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2834,16 +2774,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL);
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2854,15 +2788,10 @@ my_date, id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2871,15 +2800,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL);
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -2890,15 +2814,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2907,15 +2826,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL);
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2926,8 +2840,8 @@ my_decimal, id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
--10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -2941,8 +2855,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL);
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
--10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -3115,12 +3029,12 @@ Warning	1292	Truncated incorrect INTEGER value: ' ---
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values;
-SELECT CAST(my_year AS DECIMAL),
+SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL;
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3128,11 +3042,11 @@ NULL	NULL	1
 2005.00	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal(37,2)) AS `CAST(my_year AS DECIMAL(37,2))`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL);
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3141,12 +3055,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values;
-SELECT CAST(my_time AS DECIMAL),
+SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL;
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3154,11 +3068,11 @@ NULL	NULL	1
 100000.00	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal(37,2)) AS `CAST(my_time AS DECIMAL(37,2))`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL);
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3167,12 +3081,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values;
-SELECT CAST(my_timestamp AS DECIMAL),
+SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL;
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3180,11 +3094,11 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal(37,2)) AS `CAST(my_timestamp AS DECIMAL(37,2))`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL);
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3193,12 +3107,12 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values;
-SELECT CAST(my_date AS DECIMAL),
+SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL;
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3206,11 +3120,11 @@ NULL	NULL	1
 20050628.00	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal(37,2)) AS `CAST(my_date AS DECIMAL(37,2))`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL);
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3219,12 +3133,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values;
-SELECT CAST(my_datetime AS DECIMAL),
+SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL;
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3232,11 +3146,11 @@ NULL	NULL	1
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal(37,2)) AS `CAST(my_datetime AS DECIMAL(37,2))`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL);
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3245,12 +3159,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values;
-SELECT CAST(my_decimal AS DECIMAL),
+SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL;
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3258,11 +3172,11 @@ NULL	NULL	1
 -1.00	-1.000000000000000000000000000000	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal(37,2)) AS `CAST(my_decimal AS DECIMAL(37,2))`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL);
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3271,12 +3185,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values;
-SELECT CAST(my_bigint AS DECIMAL),
+SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL;
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3284,11 +3198,11 @@ NULL	NULL	1
 -1.00	-1	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal(37,2)) AS `CAST(my_bigint AS DECIMAL(37,2))`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL);
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3297,12 +3211,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values;
-SELECT CAST(my_varbinary_1000 AS DECIMAL),
+SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL;
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3315,11 +3229,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL);
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3333,12 +3247,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values;
-SELECT CAST(my_binary_30 AS DECIMAL),
+SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL;
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3356,11 +3270,11 @@ Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL);
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3379,12 +3293,12 @@ Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values;
-SELECT CAST(my_varchar_1000 AS DECIMAL),
+SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL;
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3397,11 +3311,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL);
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3415,12 +3329,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values;
-SELECT CAST(my_char_30 AS DECIMAL),
+SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL;
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3436,11 +3350,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$--           '
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL);
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
index a2bb203b294..56f20781995 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
@@ -237,7 +237,7 @@ create table t1 (f1 integer) engine = innodb;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 
 for each row set @ret_trg6_2 = 5;
-ERROR HY000: Trigger in wrong schema
+ERROR 42S02: Table 'trig_db.tb3' doesn't exist
 use trig_db;
 CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 
 for each row set @ret_trg6_3 = 18;
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_08.result b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
index 0f2d54f01ba..bb087d5882e 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
@@ -484,9 +484,8 @@ BEGIN
 WHILE @counter1 < new.f136 
 SET @counter1 = @counter1 + 1; 
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136 
-SET @counter1 = @counter1 + 1; 
-END' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; 
+END' at line 4
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;
 
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_09.result b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
index 54b191e401e..685de95db51 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
@@ -194,7 +194,7 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig';
 f118	f121	f122	f136	f151	f163
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
index 63d1c8a3131..3bb56a82612 100644
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -10202,7 +10202,8 @@ SHOW FIELDS  FROM v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 CHECK TABLE v1;
 Table	Op	Msg_type	Msg_text
-test.v1	check	error	Table 'test.v1' doesn't exist
+test.v1	check	Error	Table 'test.v1' doesn't exist
+test.v1	check	error	Corrupt
 DESCRIBE v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 EXPLAIN SELECT * FROM v1;
diff --git a/mysql-test/suite/funcs_1/r/memory__datadict.result b/mysql-test/suite/funcs_1/r/memory__datadict.result
index 1dea8a5f4a9..fda7cc6e76e 100644
--- a/mysql-test/suite/funcs_1/r/memory__datadict.result
+++ b/mysql-test/suite/funcs_1/r/memory__datadict.result
@@ -4842,6 +4842,7 @@ INTO OUTFILE '../tmp/out.memory.db.file'
 WHERE schema_name LIKE 'db_%';
 CREATE USER user_3212@localhost;
 GRANT ALL ON db_datadict.* TO user_3212@localhost;
+GRANT FILE ON *.* TO user_3212@localhost;
 connect(localhost,user_3212,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 	
 user_3212@localhost	db_datadict
@@ -4850,7 +4851,7 @@ INTO OUTFILE '../tmp/out.memory.user.file'
   FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
   LINES TERMINATED BY '\n'
   FROM schemata LIMIT 0, 5;
-ERROR 28000: Access denied for user 'user_3212'@'localhost' (using password: NO)
+ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
 SELECT *
 FROM schemata LIMIT 0, 5;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result
index 08e49d1bf6f..552b549a1a0 100644
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -2400,16 +2400,10 @@ my_time, id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2418,16 +2412,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL);
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -2438,16 +2426,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2456,16 +2438,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL);
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2476,15 +2452,10 @@ my_date, id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2493,15 +2464,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL);
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -2512,15 +2478,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2529,15 +2490,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL);
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2780,15 +2736,10 @@ my_time, id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
--838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2797,15 +2748,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL);
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
--838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -2816,16 +2762,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2834,16 +2774,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL);
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2854,15 +2788,10 @@ my_date, id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2871,15 +2800,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL);
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -2890,15 +2814,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2907,15 +2826,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL);
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2926,8 +2840,8 @@ my_decimal, id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
--10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -2941,8 +2855,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL);
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
--10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -3115,12 +3029,12 @@ Warning	1292	Truncated incorrect INTEGER value: ' ---
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values;
-SELECT CAST(my_year AS DECIMAL),
+SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL;
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3128,11 +3042,11 @@ NULL	NULL	1
 2005.00	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal(37,2)) AS `CAST(my_year AS DECIMAL(37,2))`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL);
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3141,12 +3055,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values;
-SELECT CAST(my_time AS DECIMAL),
+SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL;
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3154,11 +3068,11 @@ NULL	NULL	1
 100000.00	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal(37,2)) AS `CAST(my_time AS DECIMAL(37,2))`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL);
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3167,12 +3081,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values;
-SELECT CAST(my_timestamp AS DECIMAL),
+SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL;
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3180,11 +3094,11 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal(37,2)) AS `CAST(my_timestamp AS DECIMAL(37,2))`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL);
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3193,12 +3107,12 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values;
-SELECT CAST(my_date AS DECIMAL),
+SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL;
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3206,11 +3120,11 @@ NULL	NULL	1
 20050628.00	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal(37,2)) AS `CAST(my_date AS DECIMAL(37,2))`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL);
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3219,12 +3133,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values;
-SELECT CAST(my_datetime AS DECIMAL),
+SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL;
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3232,11 +3146,11 @@ NULL	NULL	1
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal(37,2)) AS `CAST(my_datetime AS DECIMAL(37,2))`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL);
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3245,12 +3159,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values;
-SELECT CAST(my_decimal AS DECIMAL),
+SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL;
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3258,11 +3172,11 @@ NULL	NULL	1
 -1.00	-1.000000000000000000000000000000	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal(37,2)) AS `CAST(my_decimal AS DECIMAL(37,2))`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL);
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3271,12 +3185,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values;
-SELECT CAST(my_bigint AS DECIMAL),
+SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL;
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3284,11 +3198,11 @@ NULL	NULL	1
 -1.00	-1	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal(37,2)) AS `CAST(my_bigint AS DECIMAL(37,2))`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL);
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3297,12 +3211,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values;
-SELECT CAST(my_varbinary_1000 AS DECIMAL),
+SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL;
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3315,11 +3229,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL);
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3333,12 +3247,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values;
-SELECT CAST(my_binary_30 AS DECIMAL),
+SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL;
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3356,11 +3270,11 @@ Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL);
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3379,12 +3293,12 @@ Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values;
-SELECT CAST(my_varchar_1000 AS DECIMAL),
+SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL;
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3397,11 +3311,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL);
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3415,12 +3329,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values;
-SELECT CAST(my_char_30 AS DECIMAL),
+SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL;
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3436,11 +3350,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$--           '
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL);
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0102.result b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
index 0a640201d76..e7fec297ca7 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
@@ -233,7 +233,7 @@ create table t1 (f1 integer) engine = memory;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 
 for each row set @ret_trg6_2 = 5;
-ERROR HY000: Trigger in wrong schema
+ERROR 42S02: Table 'trig_db.tb3' doesn't exist
 use trig_db;
 CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 
 for each row set @ret_trg6_3 = 18;
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_08.result b/mysql-test/suite/funcs_1/r/memory_trig_08.result
index 9a14845d0eb..a842bbc3ac7 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result
@@ -480,9 +480,8 @@ BEGIN
 WHILE @counter1 < new.f136 
 SET @counter1 = @counter1 + 1; 
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136 
-SET @counter1 = @counter1 + 1; 
-END' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; 
+END' at line 4
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;
 
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_09.result b/mysql-test/suite/funcs_1/r/memory_trig_09.result
index c1b9ec6d33f..3dbe64958e3 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result
@@ -190,7 +190,7 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig';
 f118	f121	f122	f136	f151	f163
diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
index 516eef24439..69dee081446 100644
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -10207,7 +10207,8 @@ SHOW FIELDS  FROM v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 CHECK TABLE v1;
 Table	Op	Msg_type	Msg_text
-test.v1	check	error	Table 'test.v1' doesn't exist
+test.v1	check	Error	Table 'test.v1' doesn't exist
+test.v1	check	error	Corrupt
 DESCRIBE v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 EXPLAIN SELECT * FROM v1;
diff --git a/mysql-test/suite/funcs_1/r/myisam__datadict.result b/mysql-test/suite/funcs_1/r/myisam__datadict.result
index e9082e7aee7..b95d51f3801 100644
--- a/mysql-test/suite/funcs_1/r/myisam__datadict.result
+++ b/mysql-test/suite/funcs_1/r/myisam__datadict.result
@@ -4912,6 +4912,7 @@ INTO OUTFILE '../tmp/out.myisam.db.file'
 WHERE schema_name LIKE 'db_%';
 CREATE USER user_3212@localhost;
 GRANT ALL ON db_datadict.* TO user_3212@localhost;
+GRANT FILE ON *.* TO user_3212@localhost;
 connect(localhost,user_3212,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 	
 user_3212@localhost	db_datadict
@@ -4920,7 +4921,7 @@ INTO OUTFILE '../tmp/out.myisam.user.file'
   FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
   LINES TERMINATED BY '\n'
   FROM schemata LIMIT 0, 5;
-ERROR 28000: Access denied for user 'user_3212'@'localhost' (using password: NO)
+ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
 SELECT *
 FROM schemata LIMIT 0, 5;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result
index 4f8a1b23bc0..94cba9796a2 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -2400,16 +2400,10 @@ my_time, id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2418,16 +2412,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL);
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -2438,16 +2426,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2456,16 +2438,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL);
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2476,15 +2452,10 @@ my_date, id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2493,15 +2464,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL);
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -2512,15 +2478,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2529,15 +2490,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL);
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2780,15 +2736,10 @@ my_time, id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
--838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2797,15 +2748,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL);
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
--838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -2816,16 +2762,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2834,16 +2774,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL);
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2854,15 +2788,10 @@ my_date, id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2871,15 +2800,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL);
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -2890,15 +2814,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2907,15 +2826,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL);
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -2926,8 +2840,8 @@ my_decimal, id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
--10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -2941,8 +2855,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL);
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
--10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -3115,12 +3029,12 @@ Warning	1292	Truncated incorrect INTEGER value: ' ---
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values;
-SELECT CAST(my_year AS DECIMAL),
+SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL;
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3128,11 +3042,11 @@ NULL	NULL	1
 2005.00	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal(37,2)) AS `CAST(my_year AS DECIMAL(37,2))`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL);
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3141,12 +3055,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values;
-SELECT CAST(my_time AS DECIMAL),
+SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL;
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3154,11 +3068,11 @@ NULL	NULL	1
 100000.00	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal(37,2)) AS `CAST(my_time AS DECIMAL(37,2))`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL);
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3167,12 +3081,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values;
-SELECT CAST(my_timestamp AS DECIMAL),
+SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL;
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3180,11 +3094,11 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal(37,2)) AS `CAST(my_timestamp AS DECIMAL(37,2))`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL);
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3193,12 +3107,12 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values;
-SELECT CAST(my_date AS DECIMAL),
+SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL;
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3206,11 +3120,11 @@ NULL	NULL	1
 20050628.00	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal(37,2)) AS `CAST(my_date AS DECIMAL(37,2))`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL);
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3219,12 +3133,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values;
-SELECT CAST(my_datetime AS DECIMAL),
+SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL;
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3232,11 +3146,11 @@ NULL	NULL	1
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal(37,2)) AS `CAST(my_datetime AS DECIMAL(37,2))`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL);
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3245,12 +3159,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values;
-SELECT CAST(my_decimal AS DECIMAL),
+SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL;
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3258,11 +3172,11 @@ NULL	NULL	1
 -1.00	-1.000000000000000000000000000000	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal(37,2)) AS `CAST(my_decimal AS DECIMAL(37,2))`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL);
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3271,12 +3185,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values;
-SELECT CAST(my_bigint AS DECIMAL),
+SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL;
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3284,11 +3198,11 @@ NULL	NULL	1
 -1.00	-1	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal(37,2)) AS `CAST(my_bigint AS DECIMAL(37,2))`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL);
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3297,12 +3211,12 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values;
-SELECT CAST(my_varbinary_1000 AS DECIMAL),
+SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL;
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3315,11 +3229,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL);
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3333,12 +3247,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values;
-SELECT CAST(my_binary_30 AS DECIMAL),
+SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL;
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3356,11 +3270,11 @@ Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL);
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3379,12 +3293,12 @@ Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values;
-SELECT CAST(my_varchar_1000 AS DECIMAL),
+SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL;
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3397,11 +3311,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL);
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3415,12 +3329,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values;
-SELECT CAST(my_char_30 AS DECIMAL),
+SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL;
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3436,11 +3350,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$--           '
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL);
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
index 4bbee8aa133..6dd56a1e912 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
@@ -237,7 +237,7 @@ create table t1 (f1 integer) engine = myisam;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 
 for each row set @ret_trg6_2 = 5;
-ERROR HY000: Trigger in wrong schema
+ERROR 42S02: Table 'trig_db.tb3' doesn't exist
 use trig_db;
 CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 
 for each row set @ret_trg6_3 = 18;
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_08.result b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
index ec8e12ff32d..8a13e91d71d 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
@@ -484,9 +484,8 @@ BEGIN
 WHILE @counter1 < new.f136 
 SET @counter1 = @counter1 + 1; 
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136 
-SET @counter1 = @counter1 + 1; 
-END' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; 
+END' at line 4
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;
 
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_09.result b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
index 9643aa567e3..b7a5933e2f7 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
@@ -194,7 +194,7 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig';
 f118	f121	f122	f136	f151	f163
diff --git a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result
index 1dbebbccb29..83af04dcd2c 100644
--- a/mysql-test/suite/funcs_1/r/myisam_views.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result
@@ -10224,7 +10224,8 @@ SHOW FIELDS  FROM v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 CHECK TABLE v1;
 Table	Op	Msg_type	Msg_text
-test.v1	check	error	Table 'test.v1' doesn't exist
+test.v1	check	Error	Table 'test.v1' doesn't exist
+test.v1	check	error	Corrupt
 DESCRIBE v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 EXPLAIN SELECT * FROM v1;
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
index 26a5dab3370..b11455c07d3 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
@@ -265,7 +265,7 @@ let $message= Testcase 3.5.1.8:;
 
 	# Can't create a trigger in a different database
 	use test;
-	--error 1435
+	--error 1146
 	CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 
 		for each row set @ret_trg6_2 = 5;
 
diff --git a/mysql-test/suite/funcs_1/views/func_view.inc b/mysql-test/suite/funcs_1/views/func_view.inc
index 4479db22e70..c477eafc610 100644
--- a/mysql-test/suite/funcs_1/views/func_view.inc
+++ b/mysql-test/suite/funcs_1/views/func_view.inc
@@ -609,7 +609,8 @@ let $col_type= my_year;
 
 
 # 1.1.6. CAST --> DECIMAL
-let $target_type= DECIMAL;
+# Set the following to (37,2) since the default was changed to (10,0) - OBN
+let $target_type= DECIMAL(37,2);
 #
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_cast.inc

From cfdd203549bf8676d4aefb527bb43f8429a39c4d Mon Sep 17 00:00:00 2001
From: unknown <thek@adventure.(none)>
Date: Wed, 25 Jul 2007 09:43:49 +0200
Subject: [PATCH 039/139] Bug#28641 CREATE EVENT with '2038.01.18 03:00:00' let
 server crash.

Creating an EVENT to be executed at a time close to the end of the allowed
range (2038.01.19 03:14:07 UTC) would cause the server to crash. The
expected behavior is to accept all calendar times within the interval and
reject all other values without crashing.

This patch replaces the function 'sec_to_epoch_TIME' with a Time_zone API call.
This function was broken because it invoked the internal function 'sec_to_epoch'
without respecting the restrictions on the function parameters (and this caused
assertion failure). It also was used as a reverse function to
Time_zone_utc::gmt_sec_to_TIME which it isn't.


mysql-test/r/events_bugs.result:
  Added test case
mysql-test/t/events_bugs.test:
  Added test case
sql/event_data_objects.cc:
  Replaced function 'sec_since_epoch_TIME' since it was implemented as
  a wrapper around 'sec_since_epoch' without taking parameter restrictions
  into account. The function was used to load information about event
  execution time from mysql.events table. Further more, the function wasn't
  the inverse function of Time_zone_utc::gmt_sec_to_TIME() which was used
  by events code to store information about event execution time.
sql/event_db_repository.cc:
  Replaced my_tz_UTC object with my_tz_OFFSET0 object because the first one
  doesn't supply us with a bijective MYSQL_TIME<->my_time_t translation. Instead
  the function sec_since_epoch_TIME was used as a reverse function to the method
  my_tz_UTC::gmt_sec_to_TIME.
sql/event_queue.cc:
  Replaced my_tz_UTC object with my_tz_OFFSET0 object because the first one
  doesn't supply us with a bijective MYSQL_TIME<->my_time_t translation. Instead
  the function sec_since_epoch_TIME was used as a reverse function to the method
  my_tz_UTC::gmt_sec_to_TIME.
sql/tztime.cc:
  * Remove function 'sec_since_epoch_TIME' since it was implemented as
  a wrapper around 'sec_since_epoch' without taking parameter restrictions
  into account. The function was used to load information about event
  execution time from mysql.events table. Further more, the function wasn't
  the inverse function of Time_zone_utc::gmt_sec_to_TIME() which was used
  by events code to store information about event execution time.

  * Added static Time_zone object for UTC+0 time zone.
sql/tztime.h:
  Include extern pointer to static Time_zone object.
---
 mysql-test/r/events_bugs.result |  7 +++++++
 mysql-test/t/events_bugs.test   | 15 +++++++++++++++
 sql/event_data_objects.cc       |  9 +++++----
 sql/event_db_repository.cc      |  8 ++++----
 sql/event_queue.cc              |  2 +-
 sql/tztime.cc                   | 15 ++-------------
 sql/tztime.h                    |  1 +
 7 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result
index 557c8e0b477..1bfa0e84f72 100644
--- a/mysql-test/r/events_bugs.result
+++ b/mysql-test/r/events_bugs.result
@@ -611,3 +611,10 @@ id	ev_nm	ev_cnt
 DROP TABLE event_log;
 SET GLOBAL event_scheduler = OFF;
 DROP DATABASE events_test;
+SET GLOBAL event_scheduler= ON;
+CREATE EVENT bug28641 ON SCHEDULE AT '2038.01.18 03:00:00'
+            DO BEGIN
+SELECT 1;
+END;|
+SET GLOBAL event_scheduler= OFF;
+DROP EVENT bug28641;
diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test
index 4186b4701fa..36052fdb9af 100644
--- a/mysql-test/t/events_bugs.test
+++ b/mysql-test/t/events_bugs.test
@@ -722,3 +722,18 @@ let $wait_condition=
 --source include/wait_condition.inc
 
 DROP DATABASE events_test;
+
+
+#
+# Bug#28641 CREATE EVENT with '2038.01.18 03:00:00' let server crash.
+#
+SET GLOBAL event_scheduler= ON;
+DELIMITER |;
+CREATE EVENT bug28641 ON SCHEDULE AT '2038.01.18 03:00:00'
+            DO BEGIN
+		SELECT 1;
+               END;|
+
+DELIMITER ;|
+SET GLOBAL event_scheduler= OFF;
+DROP EVENT bug28641;
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index 7b58c10079a..144a87e13f6 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -979,17 +979,18 @@ Event_queue_element::load_from_row(THD *thd, TABLE *table)
     DBUG_RETURN(TRUE);
 
   starts_null= table->field[ET_FIELD_STARTS]->is_null();
+  my_bool not_used= FALSE;
   if (!starts_null)
   {
     table->field[ET_FIELD_STARTS]->get_date(&time, TIME_NO_ZERO_DATE);
-    starts= sec_since_epoch_TIME(&time);
+    starts= my_tz_OFFSET0->TIME_to_gmt_sec(&time,&not_used);
   }
 
   ends_null= table->field[ET_FIELD_ENDS]->is_null();
   if (!ends_null)
   {
     table->field[ET_FIELD_ENDS]->get_date(&time, TIME_NO_ZERO_DATE);
-    ends= sec_since_epoch_TIME(&time);
+    ends= my_tz_OFFSET0->TIME_to_gmt_sec(&time,&not_used);
   }
 
   if (!table->field[ET_FIELD_INTERVAL_EXPR]->is_null())
@@ -1007,7 +1008,7 @@ Event_queue_element::load_from_row(THD *thd, TABLE *table)
     if (table->field[ET_FIELD_EXECUTE_AT]->get_date(&time,
                                                     TIME_NO_ZERO_DATE))
       DBUG_RETURN(TRUE);
-    execute_at= sec_since_epoch_TIME(&time);
+    execute_at= my_tz_OFFSET0->TIME_to_gmt_sec(&time,&not_used);
   }
 
   /*
@@ -1039,7 +1040,7 @@ Event_queue_element::load_from_row(THD *thd, TABLE *table)
   {
     table->field[ET_FIELD_LAST_EXECUTED]->get_date(&time,
                                                    TIME_NO_ZERO_DATE);
-    last_executed= sec_since_epoch_TIME(&time);
+    last_executed= my_tz_OFFSET0->TIME_to_gmt_sec(&time,&not_used);
   }
   last_executed_changed= FALSE;
 
diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc
index a16a04739e2..b7bcb6344fd 100644
--- a/sql/event_db_repository.cc
+++ b/sql/event_db_repository.cc
@@ -250,7 +250,7 @@ mysql_event_fill_row(THD *thd,
     if (!et->starts_null)
     {
       MYSQL_TIME time;
-      my_tz_UTC->gmt_sec_to_TIME(&time, et->starts);
+      my_tz_OFFSET0->gmt_sec_to_TIME(&time, et->starts);
 
       fields[ET_FIELD_STARTS]->set_notnull();
       fields[ET_FIELD_STARTS]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
@@ -259,7 +259,7 @@ mysql_event_fill_row(THD *thd,
     if (!et->ends_null)
     {
       MYSQL_TIME time;
-      my_tz_UTC->gmt_sec_to_TIME(&time, et->ends);
+      my_tz_OFFSET0->gmt_sec_to_TIME(&time, et->ends);
 
       fields[ET_FIELD_ENDS]->set_notnull();
       fields[ET_FIELD_ENDS]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
@@ -278,7 +278,7 @@ mysql_event_fill_row(THD *thd,
     fields[ET_FIELD_ENDS]->set_null();
 
     MYSQL_TIME time;
-    my_tz_UTC->gmt_sec_to_TIME(&time, et->execute_at);
+    my_tz_OFFSET0->gmt_sec_to_TIME(&time, et->execute_at);
 
     fields[ET_FIELD_EXECUTE_AT]->set_notnull();
     fields[ET_FIELD_EXECUTE_AT]->
@@ -1004,7 +1004,7 @@ update_timing_fields_for_event(THD *thd,
   if (update_last_executed)
   {
     MYSQL_TIME time;
-    my_tz_UTC->gmt_sec_to_TIME(&time, last_executed);
+    my_tz_OFFSET0->gmt_sec_to_TIME(&time, last_executed);
 
     fields[ET_FIELD_LAST_EXECUTED]->set_notnull();
     fields[ET_FIELD_LAST_EXECUTED]->store_time(&time,
diff --git a/sql/event_queue.cc b/sql/event_queue.cc
index 634cc764d74..04449dd48a1 100644
--- a/sql/event_queue.cc
+++ b/sql/event_queue.cc
@@ -740,7 +740,7 @@ Event_queue::dump_internal_status()
   printf("WOC             : %s\n", waiting_on_cond? "YES":"NO");
 
   MYSQL_TIME time;
-  my_tz_UTC->gmt_sec_to_TIME(&time, next_activation_at);
+  my_tz_OFFSET0->gmt_sec_to_TIME(&time, next_activation_at);
   if (time.year != 1970)
     printf("Next activation : %04d-%02d-%02d %02d:%02d:%02d\n",
            time.year, time.month, time.day, time.hour, time.minute, time.second);
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 0c717dd2ece..14192d06978 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -807,19 +807,6 @@ sec_since_epoch(int year, int mon, int mday, int hour, int min ,int sec)
          SECS_PER_MIN + sec;
 }
 
-
- /*
-  Works like sec_since_epoch but expects MYSQL_TIME structure as parameter.
-*/
-
-my_time_t
-sec_since_epoch_TIME(MYSQL_TIME *t)
-{
-  return sec_since_epoch(t->year, t->month, t->day,
-                         t->hour, t->minute, t->second);
-}
-
-
 /*
   Converts local time in broken down MYSQL_TIME representation to my_time_t
   representation.
@@ -1425,7 +1412,9 @@ Time_zone_offset::get_name() const
 
 static Time_zone_utc tz_UTC;
 static Time_zone_system tz_SYSTEM;
+static Time_zone_offset tz_OFFSET0(0);
 
+Time_zone *my_tz_OFFSET0= &tz_OFFSET0;
 Time_zone *my_tz_UTC= &tz_UTC;
 Time_zone *my_tz_SYSTEM= &tz_SYSTEM;
 
diff --git a/sql/tztime.h b/sql/tztime.h
index f7cc7042d79..ddd80b88bf2 100644
--- a/sql/tztime.h
+++ b/sql/tztime.h
@@ -59,6 +59,7 @@ public:
 
 extern Time_zone * my_tz_UTC;
 extern Time_zone * my_tz_SYSTEM;
+extern Time_zone * my_tz_OFFSET0;
 extern Time_zone * my_tz_find(THD *thd, const String *name);
 extern my_bool     my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap);
 extern void        my_tz_free();

From ba559de4bed282d0f5adc31366001774e950a561 Mon Sep 17 00:00:00 2001
From: unknown <jperkin@production.mysql.com>
Date: Wed, 25 Jul 2007 10:44:45 +0200
Subject: [PATCH 040/139] Fix for bug#29641 - $CC on Open Server is set to
 contain arguments for enabling threads.  However, duplicate AC_PROG_* macros
 in the innobase plug.in file were resetting $CC and causing link errors.

As AC_PROG_* macros are already used in the main configure.in file
there should be no need for them to be duplicated here too.


storage/innobase/plug.in:
  Remove AC_PROG_* macros
---
 storage/innobase/plug.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/storage/innobase/plug.in b/storage/innobase/plug.in
index 6e26a7d3376..b252d471fba 100644
--- a/storage/innobase/plug.in
+++ b/storage/innobase/plug.in
@@ -6,10 +6,6 @@ MYSQL_PLUGIN_DYNAMIC(innobase,  [ha_innodb.la])
 MYSQL_PLUGIN_ACTIONS(innobase,  [
   AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
   AC_SUBST(innodb_system_libs)
-  AC_PROG_CC
-  AC_PROG_RANLIB
-  AC_PROG_INSTALL
-  AC_PROG_LIBTOOL
   AC_CHECK_HEADERS(aio.h sched.h)
   AC_CHECK_SIZEOF(int, 4)
   AC_CHECK_SIZEOF(long, 4)

From 5e0e5e5e3b6e63018e4e355c6c046357df19c546 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Wed, 25 Jul 2007 13:31:46 +0400
Subject: [PATCH 041/139] Temporary enable IM tests in 5.1-runtime tree. Enable
 assert in Thread_registry.

mysql-test/t/disabled.def:
  Temporary enable IM tests in the team tree.
server-tools/instance-manager/thread_registry.cc:
  Uncomment assert.
---
 mysql-test/t/disabled.def                     | 20 +++++++++++--------
 .../instance-manager/thread_registry.cc       |  3 +--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 07c5b4d56a3..b41875fe740 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -11,14 +11,18 @@
 ##############################################################################
 user_limits     : Bug#23921 random failure of user_limits.test
 
-im_options               : Bug#20294 2006-07-24 stewart   Instance manager test im_options fails randomly
-im_daemon_life_cycle     : Bug#20294 2007-05-14 alik      Instance manager tests fail randomly
-im_cmd_line              : Bug#20294 2007-05-14 alik      Instance manager tests fail randomly
-im_utils                 : Bug#20294 2007-05-30 alik      Instance manager tests fail randomly
-im_instance_conf         : Bug#20294 2007-05-30 alik      Instance manager tests fail randomly
-im_life_cycle            : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance.
-im_instance_conf         : BUG#28743 Instance manager generates warnings in test suite
-im_utils                 : BUG#28743 Instance manager generates warnings in test suite
+#
+# Temporary enable IM tests to catch the assert.
+#
+# im_options               : Bug#20294 2006-07-24 stewart   Instance manager test im_options fails randomly
+# im_daemon_life_cycle     : Bug#20294 2007-05-14 alik      Instance manager tests fail randomly
+# im_cmd_line              : Bug#20294 2007-05-14 alik      Instance manager tests fail randomly
+# im_utils                 : Bug#20294 2007-05-30 alik      Instance manager tests fail randomly
+# im_instance_conf         : Bug#20294 2007-05-30 alik      Instance manager tests fail randomly
+# im_life_cycle            : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance.
+# im_instance_conf         : BUG#28743 Instance manager generates warnings in test suite
+# im_utils                 : BUG#28743 Instance manager generates warnings in test suite
+
 concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
 ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper
 
diff --git a/server-tools/instance-manager/thread_registry.cc b/server-tools/instance-manager/thread_registry.cc
index b06c1240d92..700ed22afe7 100644
--- a/server-tools/instance-manager/thread_registry.cc
+++ b/server-tools/instance-manager/thread_registry.cc
@@ -67,8 +67,7 @@ Thread_registry::~Thread_registry()
   if (head.next != &head)
     log_error("Not all threads died properly\n");
   /* All threads must unregister */
-  // Disabled assert temporarily - BUG#28030
-  // DBUG_ASSERT(head.next == &head);
+  DBUG_ASSERT(head.next == &head);
 
   pthread_mutex_unlock(&LOCK_thread_registry);
   pthread_cond_destroy(&COND_thread_registry_is_empty);

From 696b001ab719f3ecc50da7b72580dddb0e216d8a Mon Sep 17 00:00:00 2001
From: unknown <Kristofer.Pettersson@naruto.>
Date: Wed, 25 Jul 2007 12:15:29 +0200
Subject: [PATCH 042/139] Fix of build errors for windows.

server-tools/instance-manager/parse_output.cc:
  * Fixed merge error: retval -> op_status
  * Fixed warning: unsigned compared with signed.
---
 server-tools/instance-manager/parse_output.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server-tools/instance-manager/parse_output.cc b/server-tools/instance-manager/parse_output.cc
index 4dc67657512..3511589acd6 100644
--- a/server-tools/instance-manager/parse_output.cc
+++ b/server-tools/instance-manager/parse_output.cc
@@ -300,7 +300,7 @@ bool Mysqld_output_parser_win::run_command(const char *command)
                            &si_start_info, /* STARTUPINFO pointer. */
                            &pi_proc_info); /* Rec. PROCESS_INFORMATION. */
 
-  if (!retval)
+  if (!op_status)
   {
     CloseHandle(m_h_child_stdout_rd);
     CloseHandle(m_h_child_stdout_wr);
@@ -324,7 +324,7 @@ bool Mysqld_output_parser_win::read_line(char *line_buffer,
   char *buff_ptr= line_buffer;
   char ch;
 
-  while (buff_ptr - line_buffer < line_buffer_size)
+  while ((unsigned)(buff_ptr - line_buffer) < line_buffer_size)
   {
     do
     {

From 48e879f9ac3d57b6c931c36a7d590e16229ae1a4 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Wed, 25 Jul 2007 18:38:52 +0400
Subject: [PATCH 043/139] Allow mysql.proc to have extra (unknown) fields. This
 allows 5.0 to work with 5.1 databases.

---
 sql/sp.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sp.cc b/sql/sp.cc
index c0e7d5e2271..75d6fa4618f 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -273,7 +273,7 @@ db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp)
   if ((ret= db_find_routine_aux(thd, type, name, table)) != SP_OK)
     goto done;
 
-  if (table->s->fields != MYSQL_PROC_FIELD_COUNT)
+  if (table->s->fields < MYSQL_PROC_FIELD_COUNT)
   {
     ret= SP_GET_FIELD_FAILED;
     goto done;
@@ -523,7 +523,7 @@ db_create_routine(THD *thd, int type, sp_head *sp)
     strxmov(definer, thd->lex->definer->user.str, "@",
             thd->lex->definer->host.str, NullS);
 
-    if (table->s->fields != MYSQL_PROC_FIELD_COUNT)
+    if (table->s->fields < MYSQL_PROC_FIELD_COUNT)
     {
       ret= SP_GET_FIELD_FAILED;
       goto done;

From 4537a0c9e97e19b34bd4cc1969ce388f4ac48ccc Mon Sep 17 00:00:00 2001
From: unknown <svoj@mysql.com/april.(none)>
Date: Wed, 25 Jul 2007 19:56:17 +0500
Subject: [PATCH 044/139] BUG#29806 - binlog_innodb.test creates a server log

Stopping mysql server could result in an entry in mysql error
file: "InnoDB: Error: MySQL is freeing a thd".

This happened because InnoDB assumes that the server will never
call external_lock(F_UNLCK) in case external_lock(READ/WRITE)
failed.

Prior to this patch we haven't had strict definition whether
external_lock(F_UNLCK) must be called in case external_lock(READ/WRITE)
fails.

This patch states that we never call external_lock(F_UNLCK) in case
external_lock(READ/WRITE) fails.


mysql-test/suite/binlog/t/disabled.def:
  Re-enabled binlog_innodb and binlog_killed tests.
sql/ha_ndbcluster.cc:
  Restore handler state in case external_lock() failed.
sql/ha_partition.cc:
  Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed.
sql/lock.cc:
  Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed.
storage/myisammrg/myrg_locking.c:
  Restore handler state in case external_lock() failed.
---
 mysql-test/suite/binlog/t/disabled.def |  3 ---
 sql/ha_ndbcluster.cc                   |  6 ++++++
 sql/ha_partition.cc                    | 15 ++++++++++++++-
 sql/lock.cc                            |  8 +++++++-
 storage/myisammrg/myrg_locking.c       |  8 ++++++++
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/mysql-test/suite/binlog/t/disabled.def b/mysql-test/suite/binlog/t/disabled.def
index 76eeb5b00ef..888298bbb09 100644
--- a/mysql-test/suite/binlog/t/disabled.def
+++ b/mysql-test/suite/binlog/t/disabled.def
@@ -9,6 +9,3 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-
-binlog_innodb        : Bug#29806 2007-07-15 ingo master.err: InnoDB: Error: MySQL is freeing a thd
-binlog_killed        : Bug#29806 2007-07-17 ingo master.err: InnoDB: Error: MySQL is freeing a thd
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 89b8b2bcaad..42872983d65 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -4383,7 +4383,10 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
 
         trans= ndb->startTransaction();
         if (trans == NULL)
+        {
+          thd_ndb->lock_count= 0;
           ERR_RETURN(ndb->getNdbError());
+        }
         thd_ndb->init_open_tables();
         thd_ndb->stmt= trans;
 	thd_ndb->query_state&= NDB_QUERY_NORMAL;
@@ -4409,7 +4412,10 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
           
           trans= ndb->startTransaction();
           if (trans == NULL)
+          {
+            thd_ndb->lock_count= 0;
             ERR_RETURN(ndb->getNdbError());
+          }
           thd_ndb->init_open_tables();
           thd_ndb->all= trans; 
 	  thd_ndb->query_state&= NDB_QUERY_NORMAL;
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index e4924e8e8f2..d46b3a3bb08 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -1142,6 +1142,12 @@ int ha_partition::prepare_new_partition(TABLE *table,
   create_flag= TRUE;
   if ((error= file->ha_open(table, part_name, m_mode, m_open_test_lock)))
     goto error;
+  /*
+    Note: if you plan to add another call that may return failure,
+    better to do it before external_lock() as cleanup_new_partition()
+    assumes that external_lock() is last call that may fail here.
+    Otherwise see description for cleanup_new_partition().
+  */
   if ((error= file->external_lock(current_thd, m_lock_type)))
     goto error;
 
@@ -1164,6 +1170,14 @@ error:
     NONE
 
   DESCRIPTION
+    This function is called immediately after prepare_new_partition() in
+    case the latter fails.
+
+    In prepare_new_partition() last call that may return failure is
+    external_lock(). That means if prepare_new_partition() fails,
+    partition does not have external lock. Thus no need to call
+    external_lock(F_UNLCK) here.
+
   TODO:
     We must ensure that in the case that we get an error during the process
     that we call external_lock with F_UNLCK, close the table and delete the
@@ -1182,7 +1196,6 @@ void ha_partition::cleanup_new_partition(uint part_count)
     m_file= m_added_file;
     m_added_file= NULL;
 
-    external_lock(current_thd, F_UNLCK);
     /* delete_table also needed, a bit more complex */
     close();
 
diff --git a/sql/lock.cc b/sql/lock.cc
index 50922a682a2..a1985f0b217 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -60,6 +60,11 @@
   - When calling UNLOCK TABLES we call mysql_unlock_tables() for all
     tables used in LOCK TABLES
 
+  If table_handler->external_lock(thd, locktype) fails, we call
+  table_handler->external_lock(thd, F_UNLCK) for each table that was locked,
+  excluding one that caused failure. That means handler must cleanup itself
+  in case external_lock() fails.
+
 TODO:
   Change to use my_malloc() ONLY when using LOCK TABLES command or when
   we are forced to use mysql_lock_merge.
@@ -269,8 +274,9 @@ static int lock_external(THD *thd, TABLE **tables, uint count)
     if ((error=(*tables)->file->ha_external_lock(thd,lock_type)))
     {
       print_lock_error(error, (*tables)->file->table_type());
-      for (; i-- ; tables--)
+      while (--i)
       {
+        tables--;
 	(*tables)->file->ha_external_lock(thd, F_UNLCK);
 	(*tables)->current_lock=F_UNLCK;
       }
diff --git a/storage/myisammrg/myrg_locking.c b/storage/myisammrg/myrg_locking.c
index a07833bc829..4f1e3f844a1 100644
--- a/storage/myisammrg/myrg_locking.c
+++ b/storage/myisammrg/myrg_locking.c
@@ -37,7 +37,15 @@ int myrg_lock_database(MYRG_INFO *info, int lock_type)
     (file->table)->owned_by_merge = TRUE;
 #endif
     if ((new_error=mi_lock_database(file->table,lock_type)))
+    {
       error=new_error;
+      if (lock_type != F_UNLCK)
+      {
+        while (--file >= info->open_tables)
+          mi_lock_database(file->table, F_UNLCK);
+        break;
+      }
+    }
   }
   return(error);
 }

From 2612fc43b53a69320ba41011aa632ec35b734211 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Wed, 25 Jul 2007 19:46:50 +0400
Subject: [PATCH 045/139] Patch inspired by BUG#10491: Server returns data as
 charset binary SHOW CREATE TABLE or SELECT FROM I_S.

The problem is that mysqldump generates incorrect dump for a table
with non-ASCII column name if the mysqldump's character set is
ASCII.

The fix is to:
  1. Switch character_set_client for the mysqldump's connection
  to binary before issuing SHOW CREATE TABLE statement in order
  to avoid conversion.

  2. Dump switch character_set_client statements to UTF8 and back
  for CREATE TABLE statement.


client/mysqldump.c:
  1. Switch character_set_client for the mysqldump's connection
  to binary before issuing SHOW CREATE TABLE statement in order
  to avoid conversion.

  2. Dump switch character_set_client statements to UTF8 and back
  for CREATE TABLE statement.
mysql-test/r/mysqldump-max.result:
  Update result file.
mysql-test/r/mysqldump.result:
  Update result file.
mysql-test/r/openssl_1.result:
  Update result file.
mysql-test/r/show_check.result:
  Update result file.
mysql-test/t/show_check.test:
  Test case:
    - create a table with non-ASCII column name;
    - dump the database by mysqldump using ASCII character set;
    - drop the database;
    - load the dump;
    - check that the table has been re-created properly.
---
 client/mysqldump.c                |  30 ++++-
 mysql-test/r/mysqldump-max.result |  36 ++++++
 mysql-test/r/mysqldump.result     | 180 ++++++++++++++++++++++++++++++
 mysql-test/r/openssl_1.result     |   9 ++
 mysql-test/r/show_check.result    |  20 ++++
 mysql-test/t/show_check.test      |  57 ++++++++++
 6 files changed, 329 insertions(+), 3 deletions(-)

diff --git a/client/mysqldump.c b/client/mysqldump.c
index f72cb0171e1..c745ca10272 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -992,6 +992,21 @@ static int mysql_query_with_error_report(MYSQL *mysql_con, MYSQL_RES **res,
   return 0;
 }
 
+
+static int switch_character_set_results(MYSQL *mysql, const char *cs_name)
+{
+  char query_buffer[QUERY_LENGTH];
+  size_t query_length;
+
+  query_length= my_snprintf(query_buffer,
+                            sizeof (query_buffer),
+                            "SET SESSION character_set_results = '%s'",
+                            (const char *) cs_name);
+
+  return mysql_real_query(mysql, query_buffer, query_length);
+}
+
+
 /*
   Open a new .sql file to dump the table or view into
 
@@ -1671,7 +1686,10 @@ static uint get_table_structure(char *table, char *db, char *table_type,
       MYSQL_FIELD *field;
 
       my_snprintf(buff, sizeof(buff), "show create table %s", result_table);
-      if (mysql_query_with_error_report(mysql, 0, buff))
+
+      if (switch_character_set_results(mysql, "binary") ||
+          mysql_query_with_error_report(mysql, &result, buff) ||
+          switch_character_set_results(mysql, default_charset))
         DBUG_RETURN(0);
 
       if (path)
@@ -1702,7 +1720,6 @@ static uint get_table_structure(char *table, char *db, char *table_type,
         check_io(sql_file);
       }
 
-      result= mysql_store_result(mysql);
       field= mysql_fetch_field_direct(result, 0);
       if (strcmp(field->name, "View") == 0)
       {
@@ -1794,7 +1811,14 @@ static uint get_table_structure(char *table, char *db, char *table_type,
       }
 
       row= mysql_fetch_row(result);
-      fprintf(sql_file, "%s;\n", row[1]);
+
+      fprintf(sql_file,
+              "SET @saved_cs_client     = @@character_set_client;\n"
+              "SET character_set_client = utf8;\n"
+              "%s;\n"
+              "SET character_set_client = @saved_cs_client;\n",
+              row[1]);
+
       check_io(sql_file);
       mysql_free_result(result);
     }
diff --git a/mysql-test/r/mysqldump-max.result b/mysql-test/r/mysqldump-max.result
index 9ae3e368e28..261c7a7f197 100644
--- a/mysql-test/r/mysqldump-max.result
+++ b/mysql-test/r/mysqldump-max.result
@@ -93,55 +93,73 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t3`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t3` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t3` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t4`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t4` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t4` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t4` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t5`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t5` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t5` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t5` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t6`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t6` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t6` DISABLE KEYS */;
 INSERT  IGNORE INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
@@ -172,55 +190,73 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 INSERT  DELAYED INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 INSERT  DELAYED INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t3`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t3` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
 INSERT  DELAYED INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t3` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t4`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t4` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t4` DISABLE KEYS */;
 INSERT  DELAYED INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t4` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t5`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t5` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t5` DISABLE KEYS */;
 INSERT  DELAYED INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t5` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t6`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t6` (
   `id` int(8) default NULL,
   `name` varchar(32) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t6` DISABLE KEYS */;
 INSERT INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index da05fe7bc5b..73841a2150f 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -28,9 +28,12 @@ DROP TABLE t1;
 CREATE TABLE t1 (a decimal(64, 20));
 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
 ("0987654321098765432109876543210987654321");
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` decimal(64,20) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('987654321098765432109876543210987654321.00000000000000000000');
 DROP TABLE t1;
 #
@@ -40,9 +43,12 @@ CREATE TABLE t1 (a double);
 INSERT INTO t1 VALUES ('-9e999999');
 Warnings:
 Warning	1264	Out of range value adjusted for column 'a' at row 1
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` double default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES (RES);
 DROP TABLE t1;
 #
@@ -58,15 +64,21 @@ INSERT INTO t1 VALUES ('1.2345', 2.3456);
 INSERT INTO t1 VALUES ("1.2345", 2.3456);
 ERROR 42S22: Unknown column '1.2345' in 'field list'
 SET SQL_MODE=@OLD_SQL_MODE;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` decimal(10,5) default NULL,
   `b` float default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` decimal(10,5) default NULL,
   `b` float default NULL
 );
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
@@ -80,10 +92,13 @@ INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456)
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` decimal(10,5) default NULL,
   `b` float default NULL
 );
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -106,10 +121,13 @@ UNLOCK TABLES;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` decimal(10,5) default NULL,
   `b` float default NULL
 );
+SET character_set_client = @saved_cs_client;
 
 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -185,9 +203,12 @@ INSERT INTO t1  VALUES (_koi8r x'C1C2C3C4C5'), (NULL);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` varchar(255) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=koi8r;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -218,9 +239,12 @@ INSERT INTO t1 VALUES (1), (2);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL40' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) TYPE=MyISAM;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -241,9 +265,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) TYPE=MyISAM;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -262,9 +289,12 @@ DROP TABLE t1;
 # Bug #2592 'mysqldump doesn't quote "tricky" names correctly'
 #
 create table ```a` (i int);
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE ```a` (
   `i` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 drop table ```a`;
 #
 # Bug #2591 "mysqldump quotes names inconsistently"
@@ -282,9 +312,12 @@ create table t1(a int);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -307,9 +340,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t1" (
   "a" int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
@@ -335,9 +371,12 @@ set global sql_mode='ANSI_QUOTES';
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -360,9 +399,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t1" (
   "a" int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
@@ -392,9 +434,12 @@ insert into t1 values (1),(2),(3);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
@@ -483,9 +528,12 @@ INSERT INTO t1  VALUES (_latin1 '
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` char(10) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -516,9 +564,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` char(10) default NULL
 ) TYPE=MyISAM;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -539,9 +590,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` char(10) default NULL
 ) TYPE=MyISAM;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -562,9 +616,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` char(10) default NULL
 ) TYPE=MyISAM;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -598,9 +655,12 @@ INSERT INTO t2 VALUES (4),(5),(6);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -636,9 +696,12 @@ INSERT INTO `t1` VALUES (0x602010000280100005E71A);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -674,9 +737,12 @@ INSERT INTO t1 VALUES (4),(5),(6);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -705,9 +771,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
@@ -1071,6 +1140,8 @@ insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `F_c4ca4238a0b923820dcc509a6f75849b` int(11) default NULL,
   `F_c81e728d9d4c2f636f067f89cc14862c` int(11) default NULL,
@@ -1403,6 +1474,7 @@ CREATE TABLE `t1` (
   `F_6faa8040da20ef399b63a72d0e4ab575` int(11) default NULL,
   `F_fe73f687e5bc5280214e0486b273a5f9` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -1443,9 +1515,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -1484,13 +1559,19 @@ INSERT INTO t2 VALUES (1), (2);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1513,13 +1594,19 @@ CREATE TABLE `t2` (
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1719,17 +1806,26 @@ create table t3(a int);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t3`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t3` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1759,9 +1855,12 @@ mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manu
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
@@ -1792,12 +1891,15 @@ insert into t1 values (0815, 4711, 2006);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t1" (
   "a b" int(11) NOT NULL default '0',
   "c""d" int(11) NOT NULL default '0',
   "e`f" int(11) NOT NULL default '0',
   PRIMARY KEY  ("a b","c""d","e`f")
 );
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
@@ -1823,12 +1925,15 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a b` int(11) NOT NULL default '0',
   `c"d` int(11) NOT NULL default '0',
   `e``f` int(11) NOT NULL default '0',
   PRIMARY KEY  (`a b`,`c"d`,`e``f`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -1874,10 +1979,13 @@ create view v2 as select * from t2 where a like 'a%' with check option;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` varchar(30) default NULL,
   KEY `a` (`a`(5))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -1955,9 +2063,12 @@ create view v1 as select * from t1;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2012,10 +2123,13 @@ create view v2 as select * from t2 where a like 'a%' with check option;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` varchar(30) default NULL,
   KEY `a` (`a`(5))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -2064,9 +2178,12 @@ INSERT INTO t1 VALUES ('\'');
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` char(10) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2107,11 +2224,14 @@ select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL,
   `b` int(11) default NULL,
   `c` varchar(30) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2227,10 +2347,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL,
   `b` bigint(20) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2262,9 +2385,12 @@ end */;;
 DELIMITER ;
 /*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -2307,10 +2433,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL,
   `b` bigint(20) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2318,9 +2447,12 @@ INSERT INTO `t1` VALUES (1,NULL),(2,NULL),(4,NULL),(11,NULL);
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -2444,9 +2576,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `id` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2534,10 +2669,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `d` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   UNIQUE KEY `d` (`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2568,10 +2706,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `d` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   UNIQUE KEY `d` (`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2618,9 +2759,12 @@ a2
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1 test";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t1 test" (
   "a1" int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES "t1 test" WRITE;
 /*!40000 ALTER TABLE "t1 test" DISABLE KEYS */;
@@ -2636,9 +2780,12 @@ INSERT INTO `t2 test` SET a2 = NEW.a1; END */;;
 DELIMITER ;
 /*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;
 DROP TABLE IF EXISTS "t2 test";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t2 test" (
   "a2" int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES "t2 test" WRITE;
 /*!40000 ALTER TABLE "t2 test" DISABLE KEYS */;
@@ -2687,11 +2834,14 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL,
   `b` varchar(32) default NULL,
   `c` varchar(32) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2779,9 +2929,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2825,10 +2978,13 @@ insert into t1 values ('','');
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` binary(1) default NULL,
   `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2857,10 +3013,13 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` binary(1) default NULL,
   `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3015,9 +3174,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CH
 
 USE `mysqldump_test_db`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `id` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3062,11 +3224,14 @@ create view nasishnasifu as select mysqldump_tables.basetable.id from mysqldump_
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 */;
 
 USE `mysqldump_tables`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `basetable` (
   `id` bigint(20) unsigned NOT NULL auto_increment,
   `tag` varchar(64) default NULL,
   UNIQUE KEY `id` (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_views` /*!40100 DEFAULT CHARACTER SET latin1 */;
 
@@ -3134,10 +3299,13 @@ mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SU
 mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227)
 grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
 CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=537;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL,
   `b` varchar(34) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 drop table t1;
 drop user mysqltest_1@localhost;
 #
@@ -3226,22 +3394,31 @@ CREATE TABLE t1 (a int) ENGINE=merge UNION=(t2, t3);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t2`,`t3`);
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `t3`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t3` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t3` WRITE;
 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
@@ -3317,10 +3494,13 @@ drop database mysqldump_test_db;
 #
 CREATE TABLE t1 (c1 INT, c2 LONGBLOB);
 INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `c1` int(11) default NULL,
   `c2` longblob
 );
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171);
 DROP TABLE t1;
 #
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result
index 3f10eed7ad7..9c6c29eea47 100644
--- a/mysql-test/r/openssl_1.result
+++ b/mysql-test/r/openssl_1.result
@@ -77,9 +77,12 @@ INSERT INTO t1 VALUES (1), (2);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -108,9 +111,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -139,9 +145,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index e4cdd4f183b..7e5dc7e61c1 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1088,6 +1088,26 @@ DROP TABLE t1;
 DROP VIEW v1;
 DROP PROCEDURE p1;
 DROP FUNCTION f1;
+set names koi8r;
+DROP DATABASE IF EXISTS mysqltest1;
+CREATE DATABASE mysqltest1;
+use mysqltest1;
+CREATE TABLE t1(ËÏÌÏÎËÁ1 INT);
+
+---> Dumping mysqltest1 to show_check.mysqltest1.sql
+
+
+DROP DATABASE mysqltest1;
+
+
+---> Restoring mysqltest1...
+SHOW CREATE TABLE mysqltest1.t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `ËÏÌÏÎËÁ1` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP DATABASE mysqltest1;
+use test;
 flush status;
 show variables like "log_queries_not_using_indexes";
 Variable_name	Value
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index a58d81a414b..4d470ee4233 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -559,6 +559,10 @@ show status like 'slow_queries';
 # FROM I_S.
 #
 
+#
+# Part 1: check that meta-data specifies not-binary character set.
+#
+
 # Ensure that all needed objects are dropped.
 
 --disable_warnings
@@ -766,6 +770,59 @@ DROP VIEW v1;
 DROP PROCEDURE p1;
 DROP FUNCTION f1;
 
+#
+# Part 2: check that table with non-latin1 characters are dumped/restored
+# correctly.
+#
+
+# Ensure that all needed objects are dropped.
+
+set names koi8r;
+
+--disable_warnings
+DROP DATABASE IF EXISTS mysqltest1;
+--enable_warnings
+
+# Create objects.
+
+CREATE DATABASE mysqltest1;
+
+use mysqltest1;
+
+CREATE TABLE t1(ËÏÌÏÎËÁ1 INT);
+
+# Check:
+#   - Dump mysqltest1;
+
+--echo
+--echo ---> Dumping mysqltest1 to show_check.mysqltest1.sql
+
+--exec $MYSQL_DUMP --default-character-set=latin1 --character-sets-dir=$CHARSETSDIR --databases mysqltest1 > $MYSQLTEST_VARDIR/tmp/show_check.mysqltest1.sql
+
+#   - Clean mysqltest1;
+
+--echo
+--echo
+
+DROP DATABASE mysqltest1;
+
+#   - Restore mysqltest1;
+
+--echo
+--echo
+
+--echo ---> Restoring mysqltest1...
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/show_check.mysqltest1.sql
+
+#   - Check definition of the table.
+
+SHOW CREATE TABLE mysqltest1.t1;
+
+# Cleanup.
+
+DROP DATABASE mysqltest1;
+use test;
+
 #
 # Bug #28808: log_queries_not_using_indexes variable dynamic change is ignored
 #

From a34879ebd2c6c02f77a2df080c4696f0039ebffa Mon Sep 17 00:00:00 2001
From: unknown <iggy@amd64.(none)>
Date: Wed, 25 Jul 2007 13:18:12 -0400
Subject: [PATCH 046/139] Bug#24732 Executables do not include Vista manifests
 - Sign executables with MySQL AB security certificate.

BitKeeper/etc/ignore:
  Bug#24732 Executables do not include Vista manifests
  - Ignore security catalog descriptions
CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Search for additional tools necessary to embed, catalog and sign
  targets.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Add internal only note to EMBED_MANIFESTS option.
win/create_manifest.js:
  Bug#24732 Executables do not include Vista manifests
  - Added publicKeyToken attribute to manifest.
win/mysql_manifest.cmake:
  Bug#24732 Executables do not include Vista manifests
  - Add additional commands to create security catalog and sign
  targets.
  - Add parameters to add appropiate hash attribute to manifest
  and create security content description of the security catalog.
---
 .bzrignore               |  1 +
 CMakeLists.txt           | 38 ++++++++++++++++++++++++++++++++------
 win/README               |  3 ++-
 win/create_manifest.js   |  2 +-
 win/mysql_manifest.cmake |  7 ++++---
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index e7a7a1c27dc..759ca4a20bf 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -6,6 +6,7 @@
 *.bin
 *.vcproj.cmake
 cmake_install.cmake
+*.cdf
 *.core
 *.d
 *.da
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdd0cde8b8d..3703548ebc3 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,21 +139,47 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
 ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE")
 
 IF(EMBED_MANIFESTS)
-    # Search for the Manifest tool.  CMake will first search it's defaults
-    # (CMAKE_FRAMEWORK_PATH, CMAKE_APPBUNDLE_PATH, CMAKE_PROGRAM_PATH and
-    # the system PATH) followed by the listed paths which are the current
-    # possible defaults and should be updated when necessary.  The custom
-    # manifests are designed to be compatible with all mt versions.
+    # Search for the tools (mt, makecat, signtool) necessary for embedding
+    # manifests and signing executables with the MySQL AB authenticode cert.
+    #
+    # CMake will first search it's defaults (CMAKE_FRAMEWORK_PATH, 
+    # CMAKE_APPBUNDLE_PATH, CMAKE_PROGRAM_PATH and the system PATH) followed 
+    # by the listed paths which are the current possible defaults and should be
+    # updated when necessary.  
+    # 
+    # The custom manifests are designed to be compatible with all mt versions.
+    # The MySQL AB Authenticode certificate is available only internally.  
+    # Others should store a single signing certificate in a local cryptographic
+    # service provider and alter the signtool command as necessary.
     FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt
                  PATHS
                  "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"
                  "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
                  "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
+    FIND_PROGRAM(HAVE_CATALOG_TOOL NAMES makecat
+                 PATHS
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin")
+    FIND_PROGRAM(HAVE_SIGN_TOOL NAMES signtool
+                 PATHS
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
+
     IF(HAVE_MANIFEST_TOOL)
-        MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.")
+        MESSAGE(STATUS "Found Mainfest Tool.")
     ELSE(HAVE_MANIFEST_TOOL)
         MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.")
     ENDIF(HAVE_MANIFEST_TOOL)
+    IF(HAVE_CATALOG_TOOL)
+        MESSAGE(STATUS "Found Catalog Tool.")
+    ELSE(HAVE_CATALOG_TOOL)
+        MESSAGE(FATAL_ERROR "Catalog tool, makecat.exe, can't be found.")
+    ENDIF(HAVE_CATALOG_TOOL)
+    IF(HAVE_SIGN_TOOL)
+        MESSAGE(STATUS "Found Sign Tool. Embedding custom manifests and signing executables.")
+    ELSE(HAVE_SIGN_TOOL)
+        MESSAGE(FATAL_ERROR "Sign tool, signtool.exe, can't be found.")
+    ENDIF(HAVE_SIGN_TOOL)
+
     # Disable automatic manifest generation.
     STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
     	   ${CMAKE_EXE_LINKER_FLAGS})
diff --git a/win/README b/win/README
index 118d619226a..d13f37965c1 100644
--- a/win/README
+++ b/win/README
@@ -51,7 +51,8 @@ The options right now are
     DISABLE_GRANT_OPTIONS                Disables the use of --init-file and --skip-grant-tables
                                          options of mysqld.exe
     EMBED_MANIFESTS                      Embed custom manifests into final exes, otherwise VS
-                                         default will be used.
+                                         default will be used. (Note - This option should only be
+                                         used by MySQL AB.)
                                 
 
 So the command line could look like:
diff --git a/win/create_manifest.js b/win/create_manifest.js
index 8569bd508ff..dec8f6e62e2 100755
--- a/win/create_manifest.js
+++ b/win/create_manifest.js
@@ -56,7 +56,7 @@ try
   manifest_xml+= "\t<assemblyIdentity name=\'" + app_name + "\'";
   manifest_xml+= " version=\'" + app_version + "\'"; 
   manifest_xml+= " processorArchitecture=\'" + app_arch + "\'";
-  // TOADD - Add publicKeyToken attribute once we have Authenticode key.
+  manifest_xml+= " publicKeyToken=\'02ad33b422233ae3\'";
   manifest_xml+= " type=\'win32\' />\r\n";
   // Identify the application security requirements.
   manifest_xml+= "\t<trustInfo xmlns=\'urn:schemas-microsoft-com:asm.v2\'>\r\n"; 
diff --git a/win/mysql_manifest.cmake b/win/mysql_manifest.cmake
index 4c88be1d800..0d429e438d6 100755
--- a/win/mysql_manifest.cmake
+++ b/win/mysql_manifest.cmake
@@ -14,7 +14,8 @@ MACRO(MYSQL_EMBED_MANIFEST _target_name _required_privs)
   ADD_CUSTOM_COMMAND(
     TARGET ${_target_name}
     POST_BUILD
-    COMMAND mt.exe 
-    ARGS -nologo -manifest $(IntDir)\\$(TargetFileName).intermediate.manifest -outputresource:$(TargetPath) 
-    COMMENT "Embeds the manifest contents.")
+    COMMAND mt.exe       ARGS -nologo -hashupdate -makecdfs -manifest $(IntDir)\\$(TargetFileName).intermediate.manifest -outputresource:$(TargetPath) 
+    COMMAND makecat.exe  ARGS $(IntDir)\\$(TargetFileName).intermediate.manifest.cdf
+    COMMAND signtool.exe ARGS sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll $(TargetPath)
+    COMMENT "Embeds the manifest contents, creates a cryptographic catalog, signs the target with Authenticode certificate.")
 ENDMACRO(MYSQL_EMBED_MANIFEST)

From 2336151be8f297ec7a922af74c87d5ebbf782cc3 Mon Sep 17 00:00:00 2001
From: unknown <iggy@amd64.(none)>
Date: Wed, 25 Jul 2007 13:33:39 -0400
Subject: [PATCH 047/139] Bug#24732 Executables do not include Vista manifests
 - Required manual merge.

CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Search for additional tools necessary to embed, catalog and sign
  targets.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Add internal only note to EMBED_MANIFESTS option.
---
 CMakeLists.txt | 38 ++++++++++++++++++++++++++++++++------
 win/README     |  4 +++-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bdb1e01612..6395ae17a14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,21 +149,47 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
 ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")
 
 IF(EMBED_MANIFESTS)
-    # Search for the Manifest tool.  CMake will first search it's defaults
-    # (CMAKE_FRAMEWORK_PATH, CMAKE_APPBUNDLE_PATH, CMAKE_PROGRAM_PATH and
-    # the system PATH) followed by the listed paths which are the current
-    # possible defaults and should be updated when necessary.  The custom
-    # manifests are designed to be compatible with all mt versions.
+    # Search for the tools (mt, makecat, signtool) necessary for embedding
+    # manifests and signing executables with the MySQL AB authenticode cert.
+    #
+    # CMake will first search it's defaults (CMAKE_FRAMEWORK_PATH, 
+    # CMAKE_APPBUNDLE_PATH, CMAKE_PROGRAM_PATH and the system PATH) followed 
+    # by the listed paths which are the current possible defaults and should be
+    # updated when necessary.  
+    # 
+    # The custom manifests are designed to be compatible with all mt versions.
+    # The MySQL AB Authenticode certificate is available only internally.  
+    # Others should store a single signing certificate in a local cryptographic
+    # service provider and alter the signtool command as necessary.
     FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt
                  PATHS
                  "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"
                  "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
                  "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
+    FIND_PROGRAM(HAVE_CATALOG_TOOL NAMES makecat
+                 PATHS
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin")
+    FIND_PROGRAM(HAVE_SIGN_TOOL NAMES signtool
+                 PATHS
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
+
     IF(HAVE_MANIFEST_TOOL)
-        MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.")
+        MESSAGE(STATUS "Found Mainfest Tool.")
     ELSE(HAVE_MANIFEST_TOOL)
         MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.")
     ENDIF(HAVE_MANIFEST_TOOL)
+    IF(HAVE_CATALOG_TOOL)
+        MESSAGE(STATUS "Found Catalog Tool.")
+    ELSE(HAVE_CATALOG_TOOL)
+        MESSAGE(FATAL_ERROR "Catalog tool, makecat.exe, can't be found.")
+    ENDIF(HAVE_CATALOG_TOOL)
+    IF(HAVE_SIGN_TOOL)
+        MESSAGE(STATUS "Found Sign Tool. Embedding custom manifests and signing executables.")
+    ELSE(HAVE_SIGN_TOOL)
+        MESSAGE(FATAL_ERROR "Sign tool, signtool.exe, can't be found.")
+    ENDIF(HAVE_SIGN_TOOL)
+
     # Disable automatic manifest generation.
     STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
     	   ${CMAKE_EXE_LINKER_FLAGS})
diff --git a/win/README b/win/README
index fbcdfd068b8..afa4bd65163 100644
--- a/win/README
+++ b/win/README
@@ -63,7 +63,9 @@ The options right now are:
     MYSQL_TCP_PORT=<port>                Server port, default 3306
     CYBOZU                               Default character set is UTF8
     EMBED_MANIFESTS                      Embed custom manifests into final exes, otherwise VS
-                                         default will be used.
+                                         default will be used. (Note - This option should only be
+                                         used by MySQL AB.)
+                                
 
 So the command line could look like:
 

From b42247bca84d7ae76e0d46420ee03fc8e31b3de2 Mon Sep 17 00:00:00 2001
From: unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org>
Date: Wed, 25 Jul 2007 12:23:24 -0700
Subject: [PATCH 048/139] Bug#25679   "Federated Denial of Service"   Federated
 storage engine used to attempt to open connections within   the ::create()
 and ::open() methods which are invoked while LOCK_open   mutex is being held
 by mysqld. As a result, no other client sessions   can open tables while
 Federated is attempting to open a connection.   Long DNS lookup times would
 stall mysqld's operation and a rogue   connection string which connects to a
 remote server which simply   stalls during handshake can stall mysqld for a
 much longer period of   time.   This patch moves the opening of the
 connection much later, when the   federated actually issues queries, by which
 time the LOCK_open mutex is   no longer being held.

mysql-test/r/federated.result:
  change of test/results due to patch for bug25679
mysql-test/t/federated.test:
  change of test/results due to patch for bug25679
sql/ha_federated.cc:
  bug25679
    remove function check_foreign_fata_source()
    ha_federated::open() no longer opens the federated connection.
    ha_federated::create() no longer opens and tests connection.
    ha_federated::real_connect() opens connection and tests presence of table.
    ha_federated::real_query() sends query, calling real_connect() if neccessary.
sql/ha_federated.h:
  bug25679
    new methods real_query() and real_connect()
---
 mysql-test/r/federated.result |  11 +-
 mysql-test/t/federated.test   |   9 +-
 sql/ha_federated.cc           | 295 ++++++++++++++++------------------
 sql/ha_federated.h            |   2 +
 4 files changed, 154 insertions(+), 163 deletions(-)

diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index 4bef92319fb..f4750fed201 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -40,17 +40,18 @@ CREATE TABLE federated.t1 (
     )
 ENGINE="FEDERATED" DEFAULT CHARSET=latin1
 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t3';
-ERROR HY000: Can't create federated table. Foreign data src error:  error: 1146  'Table 'federated.t3' doesn't exist'
+SELECT * FROM federated.t1;
+ERROR HY000: The foreign data source you are trying to reference does not exist. Data source error:  error: 1146  'Table 'federated.t3' doesn't exist'
+DROP TABLE federated.t1;
 CREATE TABLE federated.t1 (
 `id` int(20) NOT NULL,
 `name` varchar(32) NOT NULL default ''
     )
 ENGINE="FEDERATED" DEFAULT CHARSET=latin1
 CONNECTION='mysql://user:pass@127.0.0.1:SLAVE_PORT/federated/t1';
-ERROR HY000: Unable to connect to foreign data source: database: 'federated'  username: 'user'  hostname: '127.0.0.1'
-DROP TABLE IF EXISTS federated.t1;
-Warnings:
-Note	1051	Unknown table 't1'
+SELECT * FROM federated.t1;
+ERROR HY000: Unable to connect to foreign data source: Access denied for user 'user'@'localhost' (using password: YES)
+DROP TABLE federated.t1;
 CREATE TABLE federated.t1 (
 `id` int(20) NOT NULL,
 `name` varchar(32) NOT NULL default ''
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index bedb6b36d61..a3750cb572d 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -30,25 +30,28 @@ CREATE TABLE federated.t1 (
 
 # test non-existant table
 --replace_result $SLAVE_MYPORT SLAVE_PORT
---error 1434
 eval CREATE TABLE federated.t1 (
     `id` int(20) NOT NULL,
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
   CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t3';
+--error 1431
+SELECT * FROM federated.t1;
+DROP TABLE federated.t1;
 
 # test bad user/password 
 --replace_result $SLAVE_MYPORT SLAVE_PORT
---error 1429
 eval CREATE TABLE federated.t1 (
     `id` int(20) NOT NULL,
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
   CONNECTION='mysql://user:pass@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+--error 1429
+SELECT * FROM federated.t1;
+DROP TABLE federated.t1;
 
-DROP TABLE IF EXISTS federated.t1;
 # # correct connection, same named tables
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE federated.t1 (
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index b669be78ebb..efef01071a6 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -497,105 +497,6 @@ err:
 }
 
 
-/*
- Check (in create) whether the tables exists, and that it can be connected to
-
-  SYNOPSIS
-    check_foreign_data_source()
-      share               pointer to FEDERATED share
-      table_create_flag   tells us that ::create is the caller, 
-                          therefore, return CANT_CREATE_FEDERATED_TABLE
-
-  DESCRIPTION
-    This method first checks that the connection information that parse url
-    has populated into the share will be sufficient to connect to the foreign
-    table, and if so, does the foreign table exist.
-*/
-
-static int check_foreign_data_source(FEDERATED_SHARE *share,
-                                     bool table_create_flag)
-{
-  char query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
-  char error_buffer[FEDERATED_QUERY_BUFFER_SIZE];
-  uint error_code;
-  String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
-  MYSQL *mysql;
-  DBUG_ENTER("ha_federated::check_foreign_data_source");
-
-  /* Zero the length, otherwise the string will have misc chars */
-  query.length(0);
-
-  /* error out if we can't alloc memory for mysql_init(NULL) (per Georg) */
-  if (!(mysql= mysql_init(NULL)))
-    DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-  /* check if we can connect */
-  if (!mysql_real_connect(mysql,
-                          share->hostname,
-                          share->username,
-                          share->password,
-                          share->database,
-                          share->port,
-                          share->socket, 0))
-  {
-    /*
-      we want the correct error message, but it to return
-      ER_CANT_CREATE_FEDERATED_TABLE if called by ::create
-    */
-    error_code= (table_create_flag ?
-                 ER_CANT_CREATE_FEDERATED_TABLE :
-                 ER_CONNECT_TO_FOREIGN_DATA_SOURCE);
-
-    my_sprintf(error_buffer,
-               (error_buffer,
-                "database: '%s'  username: '%s'  hostname: '%s'",
-                share->database, share->username, share->hostname));
-
-    my_error(ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), error_buffer);
-    goto error;
-  }
-  else
-  {
-    /*
-      Since we do not support transactions at this version, we can let the 
-      client API silently reconnect. For future versions, we will need more 
-      logic to deal with transactions
-    */
-    mysql->reconnect= 1;
-    /*
-      Note: I am not using INORMATION_SCHEMA because this needs to work with 
-      versions prior to 5.0
-      
-      if we can connect, then make sure the table exists 
-
-      the query will be: SELECT * FROM `tablename` WHERE 1=0
-    */
-    query.append(FEDERATED_SELECT);
-    query.append(FEDERATED_STAR);
-    query.append(FEDERATED_FROM);
-    append_ident(&query, share->table_name, share->table_name_length,
-                 ident_quote_char);
-    query.append(FEDERATED_WHERE);
-    query.append(FEDERATED_FALSE);
-
-    if (mysql_real_query(mysql, query.ptr(), query.length()))
-    {
-      error_code= table_create_flag ?
-        ER_CANT_CREATE_FEDERATED_TABLE : ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST;
-      my_sprintf(error_buffer, (error_buffer, "error: %d  '%s'",
-                                mysql_errno(mysql), mysql_error(mysql)));
-
-      my_error(error_code, MYF(0), error_buffer);
-      goto error;
-    }
-  }
-  error_code=0;
-
-error:
-    mysql_close(mysql);
-    DBUG_RETURN(error_code);
-}
-
-
 static int parse_url_error(FEDERATED_SHARE *share, TABLE *table, int error_num)
 {
   char buf[FEDERATED_QUERY_BUFFER_SIZE];
@@ -1478,36 +1379,7 @@ int ha_federated::open(const char *name, int mode, uint test_if_locked)
     DBUG_RETURN(1);
   thr_lock_data_init(&share->lock, &lock, NULL);
 
-  /* Connect to foreign database mysql_real_connect() */
-  mysql= mysql_init(0);
-
-  /*
-    BUG# 17044 Federated Storage Engine is not UTF8 clean
-    Add set names to whatever charset the table is at open
-    of table
-  */
-  /* this sets the csname like 'set names utf8' */
-  mysql_options(mysql,MYSQL_SET_CHARSET_NAME,
-                this->table->s->table_charset->csname);
-
-  if (!mysql || !mysql_real_connect(mysql,
-                                   share->hostname,
-                                   share->username,
-                                   share->password,
-                                   share->database,
-                                   share->port,
-                                   share->socket, 0))
-  {
-    free_share(share);
-    DBUG_RETURN(stash_remote_error());
-  }
-  /*
-    Since we do not support transactions at this version, we can let the client
-    API silently reconnect. For future versions, we will need more logic to
-    deal with transactions
-  */
-
-  mysql->reconnect= 1;
+  DBUG_ASSERT(mysql == NULL);
 
   ref_length= (table->s->primary_key != MAX_KEY ?
                table->key_info[table->s->primary_key].key_length :
@@ -1543,8 +1415,8 @@ int ha_federated::close(void)
     stored_result= 0;
   }
   /* Disconnect from mysql */
-  if (mysql)                                    // QQ is this really needed
-    mysql_close(mysql);
+  mysql_close(mysql);
+  mysql= NULL;
   retval= free_share(share);
   DBUG_RETURN(retval);
 
@@ -1774,7 +1646,7 @@ int ha_federated::write_row(byte *buf)
     if (bulk_insert.length + values_string.length() + bulk_padding >
         mysql->net.max_packet_size && bulk_insert.length)
     {
-      error= mysql_real_query(mysql, bulk_insert.str, bulk_insert.length);
+      error= real_query(bulk_insert.str, bulk_insert.length);
       bulk_insert.length= 0;
     }
     else
@@ -1798,8 +1670,7 @@ int ha_federated::write_row(byte *buf)
   }  
   else
   {
-    error= mysql_real_query(mysql, values_string.ptr(), 
-                            values_string.length());
+    error= real_query(values_string.ptr(), values_string.length());
   }
   
   if (error)
@@ -1847,6 +1718,13 @@ void ha_federated::start_bulk_insert(ha_rows rows)
   if (rows == 1)
     DBUG_VOID_RETURN;
 
+  /*
+    Make sure we have an open connection so that we know the 
+    maximum packet size.
+  */
+  if (!mysql && real_connect())
+    DBUG_VOID_RETURN;
+
   page_size= (uint) my_getpagesize();
 
   if (init_dynamic_string(&bulk_insert, NULL, page_size, page_size))
@@ -1875,7 +1753,7 @@ int ha_federated::end_bulk_insert()
   
   if (bulk_insert.str && bulk_insert.length)
   {
-    if (mysql_real_query(mysql, bulk_insert.str, bulk_insert.length))
+    if (real_query(bulk_insert.str, bulk_insert.length))
       error= stash_remote_error();
     else
     if (table->next_number_field)
@@ -1921,7 +1799,7 @@ int ha_federated::optimize(THD* thd, HA_CHECK_OPT* check_opt)
   append_ident(&query, share->table_name, share->table_name_length, 
                ident_quote_char);
 
-  if (mysql_real_query(mysql, query.ptr(), query.length()))
+  if (real_query(query.ptr(), query.length()))
   {
     DBUG_RETURN(stash_remote_error());
   }
@@ -1949,7 +1827,7 @@ int ha_federated::repair(THD* thd, HA_CHECK_OPT* check_opt)
   if (check_opt->sql_flags & TT_USEFRM)
     query.append(FEDERATED_USE_FRM);
 
-  if (mysql_real_query(mysql, query.ptr(), query.length()))
+  if (real_query(query.ptr(), query.length()))
   {
     DBUG_RETURN(stash_remote_error());
   }
@@ -2087,7 +1965,7 @@ int ha_federated::update_row(const byte *old_data, byte *new_data)
   if (!has_a_primary_key)
     update_string.append(FEDERATED_LIMIT1);
 
-  if (mysql_real_query(mysql, update_string.ptr(), update_string.length()))
+  if (real_query(update_string.ptr(), update_string.length()))
   {
     DBUG_RETURN(stash_remote_error());
   }
@@ -2152,7 +2030,7 @@ int ha_federated::delete_row(const byte *buf)
   delete_string.append(FEDERATED_LIMIT1);
   DBUG_PRINT("info",
              ("Delete sql: %s", delete_string.c_ptr_quick()));
-  if (mysql_real_query(mysql, delete_string.ptr(), delete_string.length()))
+  if (real_query(delete_string.ptr(), delete_string.length()))
   {
     DBUG_RETURN(stash_remote_error());
   }
@@ -2261,7 +2139,7 @@ int ha_federated::index_read_idx_with_result_set(byte *buf, uint index,
                         NULL, 0);
   sql_query.append(index_string);
 
-  if (mysql_real_query(mysql, sql_query.ptr(), sql_query.length()))
+  if (real_query(sql_query.ptr(), sql_query.length()))
   {
     my_sprintf(error_buffer, (error_buffer, "error: %d '%s'",
                               mysql_errno(mysql), mysql_error(mysql)));
@@ -2327,7 +2205,7 @@ int ha_federated::read_range_first(const key_range *start_key,
     mysql_free_result(stored_result);
     stored_result= 0;
   }
-  if (mysql_real_query(mysql, sql_query.ptr(), sql_query.length()))
+  if (real_query(sql_query.ptr(), sql_query.length()))
   {
     retval= ER_QUERY_ON_FOREIGN_DATA_SOURCE;
     goto error;
@@ -2427,9 +2305,7 @@ int ha_federated::rnd_init(bool scan)
       stored_result= 0;
     }
 
-    if (mysql_real_query(mysql,
-                         share->select_query,
-                         strlen(share->select_query)))
+    if (real_query(share->select_query, strlen(share->select_query)))
       goto error;
 
     stored_result= mysql_store_result(mysql);
@@ -2646,8 +2522,7 @@ int ha_federated::info(uint flag)
     append_ident(&status_query_string, share->table_name,
                  share->table_name_length, value_quote_char);
 
-    if (mysql_real_query(mysql, status_query_string.ptr(),
-                         status_query_string.length()))
+    if (real_query(status_query_string.ptr(), status_query_string.length()))
       goto error;
 
     status_query_string.length(0);
@@ -2702,12 +2577,18 @@ int ha_federated::info(uint flag)
   DBUG_RETURN(0);
 
 error:
-  if (result)
-    mysql_free_result(result);
-
-  my_sprintf(error_buffer, (error_buffer, ": %d : %s",
-                            mysql_errno(mysql), mysql_error(mysql)));
-  my_error(error_code, MYF(0), error_buffer);
+  mysql_free_result(result);
+  if (mysql)
+  {
+    my_sprintf(error_buffer, (error_buffer, ": %d : %s",
+                              mysql_errno(mysql), mysql_error(mysql)));
+    my_error(error_code, MYF(0), error_buffer);
+  }
+  else
+  {
+    error_code= remote_error_number;
+    my_error(error_code, MYF(0), ER(error_code));
+  }
   DBUG_RETURN(error_code);
 }
 
@@ -2785,7 +2666,7 @@ int ha_federated::delete_all_rows()
   /*
     TRUNCATE won't return anything in mysql_affected_rows
   */
-  if (mysql_real_query(mysql, query.ptr(), query.length()))
+  if (real_query(query.ptr(), query.length()))
   {
     DBUG_RETURN(stash_remote_error());
   }
@@ -2874,8 +2755,7 @@ int ha_federated::create(const char *name, TABLE *table_arg,
   FEDERATED_SHARE tmp_share; // Only a temporary share, to test the url
   DBUG_ENTER("ha_federated::create");
 
-  if (!(retval= parse_url(&tmp_share, table_arg, 1)))
-    retval= check_foreign_data_source(&tmp_share, 1);
+  retval= parse_url(&tmp_share, table_arg, 1);
 
   my_free((gptr) tmp_share.scheme, MYF(MY_ALLOW_ZERO_PTR));
   DBUG_RETURN(retval);
@@ -2883,9 +2763,114 @@ int ha_federated::create(const char *name, TABLE *table_arg,
 }
 
 
+int ha_federated::real_connect()
+{
+  char buffer[FEDERATED_QUERY_BUFFER_SIZE];
+  String sql_query(buffer, sizeof(buffer), &my_charset_bin);
+  DBUG_ENTER("ha_federated::real_connect");
+
+  /* 
+    Bug#25679
+    Ensure that we do not hold the LOCK_open mutex while attempting
+    to establish Federated connection to guard against a trivial
+    Denial of Service scenerio.
+  */
+  safe_mutex_assert_not_owner(&LOCK_open);
+
+  DBUG_ASSERT(mysql == NULL);
+
+  if (!(mysql= mysql_init(NULL)))
+  {
+    remote_error_number= HA_ERR_OUT_OF_MEM;
+    DBUG_RETURN(-1);
+  }
+
+  /*
+    BUG# 17044 Federated Storage Engine is not UTF8 clean
+    Add set names to whatever charset the table is at open
+    of table
+  */
+  /* this sets the csname like 'set names utf8' */
+  mysql_options(mysql,MYSQL_SET_CHARSET_NAME,
+                this->table->s->table_charset->csname);
+
+  sql_query.length(0);
+
+  if (!mysql_real_connect(mysql,
+                          share->hostname,
+                          share->username,
+                          share->password,
+                          share->database,
+                          share->port,
+                          share->socket, 0))
+  {
+    stash_remote_error();
+    mysql_close(mysql);
+    mysql= NULL;
+    my_error(ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), remote_error_buf);
+    remote_error_number= -1;
+    DBUG_RETURN(-1);
+  }
+
+  /*
+    We have established a connection, lets try a simple dummy query just 
+    to check that the table and expected columns are present.
+  */
+  sql_query.append(share->select_query);
+  sql_query.append(FEDERATED_WHERE);
+  sql_query.append(FEDERATED_FALSE);
+  if (mysql_real_query(mysql, sql_query.ptr(), sql_query.length()))
+  {
+    sql_query.length(0);
+    sql_query.append("error: ");
+    sql_query.qs_append(mysql_errno(mysql));
+    sql_query.append("  '");
+    sql_query.append(mysql_error(mysql));
+    sql_query.append("'");
+    mysql_close(mysql);
+    mysql= NULL;
+    my_error(ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST, MYF(0), sql_query.ptr());
+    remote_error_number= -1;
+    DBUG_RETURN(-1);
+  }
+
+  /* Just throw away the result, no rows anyways but need to keep in sync */
+  mysql_free_result(mysql_store_result(mysql));
+
+  /*
+    Since we do not support transactions at this version, we can let the client
+    API silently reconnect. For future versions, we will need more logic to
+    deal with transactions
+  */
+
+  mysql->reconnect= 1;
+  DBUG_RETURN(0);
+}
+
+
+int ha_federated::real_query(const char *query, uint length)
+{
+  int rc= 0;
+  DBUG_ENTER("ha_federated::real_query");
+
+  if (!mysql && (rc= real_connect()))
+    goto end;
+
+  if (!query || !length)
+    goto end;
+
+  rc= mysql_real_query(mysql, query, length);
+  
+end:
+  DBUG_RETURN(rc);
+}
+
+
 int ha_federated::stash_remote_error()
 {
   DBUG_ENTER("ha_federated::stash_remote_error()");
+  if (!mysql)
+    DBUG_RETURN(remote_error_number);
   remote_error_number= mysql_errno(mysql);
   strmake(remote_error_buf, mysql_error(mysql), sizeof(remote_error_buf)-1);
   if (remote_error_number == ER_DUP_ENTRY ||
diff --git a/sql/ha_federated.h b/sql/ha_federated.h
index b5e1c217eb5..ef7072f8c70 100644
--- a/sql/ha_federated.h
+++ b/sql/ha_federated.h
@@ -182,6 +182,8 @@ private:
                                      uint key_len,
                                      ha_rkey_function find_flag,
                                      MYSQL_RES **result);
+  int real_query(const char *query, uint length);
+  int real_connect();
 public:
   ha_federated(TABLE *table_arg);
   ~ha_federated()

From 31dffd10c0ebbc791ea53bf959718cd0d9d2658e Mon Sep 17 00:00:00 2001
From: unknown <tsmith@ramayana.hindu.god>
Date: Wed, 25 Jul 2007 13:29:57 -0600
Subject: [PATCH 049/139] Apply snapshot innodb-51-ss1644: Part #2.

I forgot to check in some new files: lock0priv.h lock0priv.ic lock0iter.c lock0iter.h


storage/innobase/include/lock0iter.h:
  BitKeeper file /home/tsmith/m/bk/inno/jul24/51/storage/innobase/include/lock0iter.h
storage/innobase/include/lock0priv.h:
  BitKeeper file /home/tsmith/m/bk/inno/jul24/51/storage/innobase/include/lock0priv.h
storage/innobase/include/lock0priv.ic:
  BitKeeper file /home/tsmith/m/bk/inno/jul24/51/storage/innobase/include/lock0priv.ic
storage/innobase/lock/lock0iter.c:
  BitKeeper file /home/tsmith/m/bk/inno/jul24/51/storage/innobase/lock/lock0iter.c
---
 storage/innobase/include/lock0iter.h  |  52 +++++++++++++
 storage/innobase/include/lock0priv.h  | 101 ++++++++++++++++++++++++++
 storage/innobase/include/lock0priv.ic |  32 ++++++++
 storage/innobase/lock/lock0iter.c     |  91 +++++++++++++++++++++++
 4 files changed, 276 insertions(+)
 create mode 100644 storage/innobase/include/lock0iter.h
 create mode 100644 storage/innobase/include/lock0priv.h
 create mode 100644 storage/innobase/include/lock0priv.ic
 create mode 100644 storage/innobase/lock/lock0iter.c

diff --git a/storage/innobase/include/lock0iter.h b/storage/innobase/include/lock0iter.h
new file mode 100644
index 00000000000..d063a360c1f
--- /dev/null
+++ b/storage/innobase/include/lock0iter.h
@@ -0,0 +1,52 @@
+/******************************************************
+Lock queue iterator type and function prototypes.
+
+(c) 2007 Innobase Oy
+
+Created July 16, 2007 Vasil Dimov
+*******************************************************/
+
+#ifndef lock0iter_h
+#define lock0iter_h
+
+#include "univ.i"
+#include "lock0types.h"
+
+typedef struct lock_queue_iterator_struct {
+	lock_t*	current_lock;
+	/* In case this is a record lock queue (not table lock queue)
+	then bit_no is the record number within the heap in which the
+	record is stored. */
+	ulint	bit_no;
+} lock_queue_iterator_t;
+
+/***********************************************************************
+Initialize lock queue iterator so that it starts to iterate from
+"lock". bit_no specifies the record number within the heap where the
+record is stored. It can be undefined (ULINT_UNDEFINED) in two cases:
+1. If the lock is a table lock, thus we have a table lock queue;
+2. If the lock is a record lock and it is a wait lock. In this case
+   bit_no is calculated in this function by using
+   lock_rec_find_set_bit(). There is exactly one bit set in the bitmap
+   of a wait lock. */
+
+void
+lock_queue_iterator_reset(
+/*======================*/
+	lock_queue_iterator_t*	iter,	/* out: iterator */
+	lock_t*			lock,	/* in: lock to start from */
+	ulint			bit_no);/* in: record number in the
+					heap */
+
+/***********************************************************************
+Gets the previous lock in the lock queue, returns NULL if there are no
+more locks (i.e. the current lock is the first one). The iterator is
+receded (if not-NULL is returned). */
+
+lock_t*
+lock_queue_iterator_get_prev(
+/*=========================*/
+					/* out: previous lock or NULL */
+	lock_queue_iterator_t*	iter);	/* in/out: iterator */
+
+#endif /* lock0iter_h */
diff --git a/storage/innobase/include/lock0priv.h b/storage/innobase/include/lock0priv.h
new file mode 100644
index 00000000000..7703a2b7def
--- /dev/null
+++ b/storage/innobase/include/lock0priv.h
@@ -0,0 +1,101 @@
+/******************************************************
+Lock module internal structures and methods.
+
+(c) 2007 Innobase Oy
+
+Created July 12, 2007 Vasil Dimov
+*******************************************************/
+
+#ifndef lock0priv_h
+#define lock0priv_h
+
+#ifndef LOCK_MODULE_IMPLEMENTATION
+/* If you need to access members of the structures defined in this
+file, please write appropriate functions that retrieve them and put
+those functions in lock/ */
+#error Do not include lock0priv.h outside of the lock/ module
+#endif
+
+#include "univ.i"
+#include "dict0types.h"
+#include "hash0hash.h"
+#include "trx0types.h"
+#include "ut0lst.h"
+
+/* A table lock */
+typedef struct lock_table_struct	lock_table_t;
+struct lock_table_struct {
+	dict_table_t*	table;		/* database table in dictionary
+					cache */
+	UT_LIST_NODE_T(lock_t)
+			locks;		/* list of locks on the same
+					table */
+};
+
+/* Record lock for a page */
+typedef struct lock_rec_struct		lock_rec_t;
+struct lock_rec_struct {
+	ulint	space;			/* space id */
+	ulint	page_no;		/* page number */
+	ulint	n_bits;			/* number of bits in the lock
+					bitmap; NOTE: the lock bitmap is
+					placed immediately after the
+					lock struct */
+};
+
+/* Lock struct */
+struct lock_struct {
+	trx_t*		trx;		/* transaction owning the
+					lock */
+	UT_LIST_NODE_T(lock_t)
+			trx_locks;	/* list of the locks of the
+					transaction */
+	ulint		type_mode;	/* lock type, mode, LOCK_GAP or
+					LOCK_REC_NOT_GAP,
+					LOCK_INSERT_INTENTION,
+					wait flag, ORed */
+	hash_node_t	hash;		/* hash chain node for a record
+					lock */
+	dict_index_t*	index;		/* index for a record lock */
+	union {
+		lock_table_t	tab_lock;/* table lock */
+		lock_rec_t	rec_lock;/* record lock */
+	} un_member;
+};
+
+/*************************************************************************
+Gets the type of a lock. */
+UNIV_INLINE
+ulint
+lock_get_type(
+/*==========*/
+				/* out: LOCK_TABLE or LOCK_REC */
+	const lock_t*	lock);	/* in: lock */
+
+/**************************************************************************
+Looks for a set bit in a record lock bitmap. Returns ULINT_UNDEFINED,
+if none found. */
+
+ulint
+lock_rec_find_set_bit(
+/*==================*/
+			/* out: bit index == heap number of the record, or
+			ULINT_UNDEFINED if none found */
+	lock_t*	lock);	/* in: record lock with at least one bit set */
+
+/*************************************************************************
+Gets the previous record lock set on a record. */
+
+lock_t*
+lock_rec_get_prev(
+/*==============*/
+			/* out: previous lock on the same record, NULL if
+			none exists */
+	lock_t*	in_lock,/* in: record lock */
+	ulint	heap_no);/* in: heap number of the record */
+
+#ifndef UNIV_NONINL
+#include "lock0priv.ic"
+#endif
+
+#endif /* lock0priv_h */
diff --git a/storage/innobase/include/lock0priv.ic b/storage/innobase/include/lock0priv.ic
new file mode 100644
index 00000000000..4bc8397509d
--- /dev/null
+++ b/storage/innobase/include/lock0priv.ic
@@ -0,0 +1,32 @@
+/******************************************************
+Lock module internal inline methods.
+
+(c) 2007 Innobase Oy
+
+Created July 16, 2007 Vasil Dimov
+*******************************************************/
+
+/* This file contains only methods which are used in
+lock/lock0* files, other than lock/lock0lock.c.
+I.e. lock/lock0lock.c contains more internal inline
+methods but they are used only in that file. */
+
+#ifndef LOCK_MODULE_IMPLEMENTATION
+#error Do not include lock0priv.ic outside of the lock/ module
+#endif
+
+/*************************************************************************
+Gets the type of a lock. */
+UNIV_INLINE
+ulint
+lock_get_type(
+/*==========*/
+				/* out: LOCK_TABLE or LOCK_REC */
+	const lock_t*	lock)	/* in: lock */
+{
+	ut_ad(lock);
+
+	return(lock->type_mode & LOCK_TYPE_MASK);
+}
+
+/* vim: set filetype=c: */
diff --git a/storage/innobase/lock/lock0iter.c b/storage/innobase/lock/lock0iter.c
new file mode 100644
index 00000000000..cad227e3f8e
--- /dev/null
+++ b/storage/innobase/lock/lock0iter.c
@@ -0,0 +1,91 @@
+/******************************************************
+Lock queue iterator. Can iterate over table and record
+lock queues.
+
+(c) 2007 Innobase Oy
+
+Created July 16, 2007 Vasil Dimov
+*******************************************************/
+
+#define LOCK_MODULE_IMPLEMENTATION
+
+#include "univ.i"
+#include "lock0iter.h"
+#include "lock0lock.h"
+#include "lock0priv.h"
+#include "ut0dbg.h"
+#include "ut0lst.h"
+
+/***********************************************************************
+Initialize lock queue iterator so that it starts to iterate from
+"lock". bit_no specifies the record number within the heap where the
+record is stored. It can be undefined (ULINT_UNDEFINED) in two cases:
+1. If the lock is a table lock, thus we have a table lock queue;
+2. If the lock is a record lock and it is a wait lock. In this case
+   bit_no is calculated in this function by using
+   lock_rec_find_set_bit(). There is exactly one bit set in the bitmap
+   of a wait lock. */
+
+void
+lock_queue_iterator_reset(
+/*======================*/
+	lock_queue_iterator_t*	iter,	/* out: iterator */
+	lock_t*			lock,	/* in: lock to start from */
+	ulint			bit_no)	/* in: record number in the
+					heap */
+{
+	iter->current_lock = lock;
+
+	if (bit_no != ULINT_UNDEFINED) {
+
+		iter->bit_no = bit_no;
+	} else {
+
+		switch (lock_get_type(lock)) {
+		case LOCK_TABLE:
+			iter->bit_no = ULINT_UNDEFINED;
+			break;
+		case LOCK_REC:
+			iter->bit_no = lock_rec_find_set_bit(lock);
+			ut_a(iter->bit_no != ULINT_UNDEFINED);
+			break;
+		default:
+			ut_error;
+		}
+	}
+}
+
+/***********************************************************************
+Gets the previous lock in the lock queue, returns NULL if there are no
+more locks (i.e. the current lock is the first one). The iterator is
+receded (if not-NULL is returned). */
+
+lock_t*
+lock_queue_iterator_get_prev(
+/*=========================*/
+					/* out: previous lock or NULL */
+	lock_queue_iterator_t*	iter)	/* in/out: iterator */
+{
+	ulint	bit_no;
+	lock_t*	prev_lock;
+
+	switch (lock_get_type(iter->current_lock)) {
+	case LOCK_REC:
+		prev_lock = lock_rec_get_prev(
+			iter->current_lock, iter->bit_no);
+		break;
+	case LOCK_TABLE:
+		prev_lock = UT_LIST_GET_PREV(
+			un_member.tab_lock.locks, iter->current_lock);
+		break;
+	default:
+		ut_error;
+	}
+
+	if (prev_lock != NULL) {
+
+		iter->current_lock = prev_lock;
+	}
+
+	return(prev_lock);
+}

From 43bc432e8fce15d8a52f569727b1c2c3b7745485 Mon Sep 17 00:00:00 2001
From: unknown <tsmith@ramayana.hindu.god>
Date: Wed, 25 Jul 2007 14:06:18 -0600
Subject: [PATCH 050/139] lock0iter.c:   remove unused variable "bit_no"

storage/innobase/lock/lock0iter.c:
  remove unused variable "bit_no"
---
 storage/innobase/lock/lock0iter.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/storage/innobase/lock/lock0iter.c b/storage/innobase/lock/lock0iter.c
index cad227e3f8e..0afa7019c86 100644
--- a/storage/innobase/lock/lock0iter.c
+++ b/storage/innobase/lock/lock0iter.c
@@ -66,7 +66,6 @@ lock_queue_iterator_get_prev(
 					/* out: previous lock or NULL */
 	lock_queue_iterator_t*	iter)	/* in/out: iterator */
 {
-	ulint	bit_no;
 	lock_t*	prev_lock;
 
 	switch (lock_get_type(iter->current_lock)) {

From 37b6be0806a6350f63c5d60965f24923506d72ef Mon Sep 17 00:00:00 2001
From: unknown <gbichot@production.mysql.com>
Date: Wed, 25 Jul 2007 22:29:53 +0200
Subject: [PATCH 051/139] tmp_table_size is not about user-created temporary
 tables, only internal ones (like those of GROUP BY): fixing the --help text.

sql/mysqld.cc:
  tmp_table_size is not about user-created temporary tables, only
  internal ones (like those of GROUP BY)
---
 sql/mysqld.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 61980fa1887..9eb3d157dcf 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6181,7 +6181,8 @@ The minimum value for this variable is 4096.",
     (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_TIME],
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"tmp_table_size", OPT_TMP_TABLE_SIZE,
-   "If an in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM table.",
+   "If an internal in-memory temporary table exceeds this size, MySQL will"
+   " automatically convert it to an on-disk MyISAM table.",
    (gptr*) &global_system_variables.tmp_table_size,
    (gptr*) &max_system_variables.tmp_table_size, 0, GET_ULL,
    REQUIRED_ARG, 32*1024*1024L, 1024, MAX_MEM_TABLE_SIZE, 0, 1, 0},

From b37ca18ab9381835b45eced1228a044f1f523bbc Mon Sep 17 00:00:00 2001
From: unknown <antony@pcg5ppc.xiphis.org>
Date: Wed, 25 Jul 2007 16:01:43 -0700
Subject: [PATCH 052/139] Bug#29522   "log.cc:1448: failed assertion
 `mysql_bin_log.is_open() && rex_data->empty()'"   When Federated's
 transaction support was disabled by bug29875,   this assertion became
 unreproducable.

mysql-test/t/disabled.def:
  bug29522
    reenable federated_innodb test
---
 mysql-test/t/disabled.def | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index f04809b668d..368a659d939 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -24,5 +24,4 @@ ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Do
 
 
 mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
-federated_innodb     : Bug#29522 failed assertion in binlog_close_connection()
 federated_transactions   : Bug#29523 Transactions do not work

From c59488321d894dbaa5fb158972ccd93748927375 Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Thu, 26 Jul 2007 04:08:58 +0500
Subject: [PATCH 053/139] sql_select.cc:   Post-merge fix.

sql/sql_select.cc:
  Post-merge fix.
---
 sql/sql_select.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index b1954620800..0973971de1c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -12312,8 +12312,8 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
         the primary key as a suffix.
       */
       if (!on_primary_key &&
-          (table->file->table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
-          table->s->db_type == DB_TYPE_INNODB &&
+          (table->file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
+          table->s->db_type()->db_type == DB_TYPE_INNODB &&
           table->s->primary_key != MAX_KEY)
       {
         on_primary_key= TRUE;

From ddd728990802dc2e043312d291a69bee71fd851b Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Thu, 26 Jul 2007 04:41:48 +0500
Subject: [PATCH 054/139] table.cc, sql_select.cc:   Post-merge fix.

sql/sql_select.cc:
  Post-merge fix.
sql/table.cc:
  Post-merge fix.
---
 sql/sql_select.cc | 2 +-
 sql/table.cc      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 0973971de1c..668b7e99549 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -12313,7 +12313,7 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
       */
       if (!on_primary_key &&
           (table->file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
-          table->s->db_type()->db_type == DB_TYPE_INNODB &&
+          ha_legacy_type(table->s->db_type()) == DB_TYPE_INNODB &&
           table->s->primary_key != MAX_KEY)
       {
         on_primary_key= TRUE;
diff --git a/sql/table.cc b/sql/table.cc
index a7ab27f0760..fb88b46972c 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1351,7 +1351,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
           if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX)
           {
             field->part_of_key= share->keys_in_use;
-            if (share->db_type == DB_TYPE_INNODB && 
+            if (ha_legacy_type(share->db_type()) == DB_TYPE_INNODB &&
                 field->part_of_sortkey.is_set(key))
               field->part_of_sortkey= share->keys_in_use;
           }

From 85af6ba9e387b30ecb4eec53fd88918c50845e02 Mon Sep 17 00:00:00 2001
From: unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org>
Date: Wed, 25 Jul 2007 17:22:52 -0700
Subject: [PATCH 055/139] fix pushbuild failures

sql/ha_federated.cc:
  remote_error_number is set to -1 when an error was already reported
  with my_error(). ER(-1) will also cause a crash on 64bit arch and only
  worked on 32bit arch by luck
---
 sql/ha_federated.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index efef01071a6..d8ffd6c55f8 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -2585,6 +2585,7 @@ error:
     my_error(error_code, MYF(0), error_buffer);
   }
   else
+  if (remote_error_number != -1 /* error already reported */)
   {
     error_code= remote_error_number;
     my_error(error_code, MYF(0), ER(error_code));

From 365bbf9814c98292b0ae0a69ad9c448971c53b99 Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Thu, 26 Jul 2007 13:07:01 +0500
Subject: [PATCH 056/139] Fix for bug #29980: 5.1.20 ate my table

Problem: trying to repair an old (e.g. with "old" varstring fields) corrupted
table with use_frm option we don't actually repair the table, just altering it
which may couse data loss.

Fix: if use_frm repair option is set, do repair instead of altering even
if the table needs upgrade.


sql/sql_table.cc:
  Fix for bug #29980: 5.1.20 ate my table
---
 sql/sql_table.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 70bd549612c..fe62ac858ac 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4132,7 +4132,8 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
         goto err;
     }
 
-    if (operator_func == &handler::ha_repair)
+    if (operator_func == &handler::ha_repair &&
+        !(check_opt->sql_flags & TT_USEFRM))
     {
       if ((table->table->file->check_old_types() == HA_ADMIN_NEEDS_ALTER) ||
           (table->table->file->ha_check_for_upgrade(check_opt) ==

From 5babac539d03b4bb9aff2f74965b98c8506726e5 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Thu, 26 Jul 2007 11:31:10 +0300
Subject: [PATCH 057/139] Bug #29571: INSERT DELAYED IGNORE written to binary
 log on  the master but on the slave

MySQL can decide to "downgrade" a INSERT DELAYED statement
to normal insert in certain situations.
One such situation is when the slave is replaying a
replication feed.
However INSERT DELAYED is logged even if there're no updates
whereas the NORMAL INSERT is not logged in such cases.

Fixed by always logging a "downgraded" INSERT DELAYED: even
if there were no updates.


mysql-test/r/rpl_insert_delayed.result:
  Bug #29571: test case
mysql-test/t/rpl_insert_delayed.test:
  Bug #29571: test case
sql/sql_insert.cc:
  Bug #29571: log INSERT DELAYED even if it was
  "downgraded" to INSERT (and there were no updates)
---
 mysql-test/r/rpl_insert_delayed.result | 20 ++++++++++++++++++
 mysql-test/t/rpl_insert_delayed.test   | 29 ++++++++++++++++++++++++++
 sql/sql_insert.cc                      |  9 +++++---
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/rpl_insert_delayed.result b/mysql-test/r/rpl_insert_delayed.result
index 38e2cddd650..ddf6e9c2165 100644
--- a/mysql-test/r/rpl_insert_delayed.result
+++ b/mysql-test/r/rpl_insert_delayed.result
@@ -29,3 +29,23 @@ id	name
 10	my name
 20	is Bond
 drop table t1;
+CREATE TABLE t1(a int, UNIQUE(a));
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+show binlog events limit 11,100;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+select * from t1;
+a
+1
+On slave
+show binlog events limit 12,100;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+select * from t1;
+a
+1
+drop table t1;
+End of 5.0 tests
diff --git a/mysql-test/t/rpl_insert_delayed.test b/mysql-test/t/rpl_insert_delayed.test
index 3f72f3a3625..141f36a694a 100644
--- a/mysql-test/t/rpl_insert_delayed.test
+++ b/mysql-test/t/rpl_insert_delayed.test
@@ -65,3 +65,32 @@ connection master;
 drop table t1;
 sync_slave_with_master;
 connection master;
+
+#
+# Bug #29571: INSERT DELAYED IGNORE written to binary log on the master but
+# on the slave
+#
+CREATE TABLE t1(a int, UNIQUE(a));
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+
+#must show two INSERT DELAYED
+--replace_column 1 x 2 x 3 x 4 x 5 x
+show binlog events limit 11,100;
+select * from t1;
+
+sync_slave_with_master;
+echo On slave;
+#must show two INSERT DELAYED
+--replace_column 1 x 2 x 3 x 4 x 5 x
+show binlog events limit 12,100;
+select * from t1;
+
+
+# clean up
+connection master;
+drop table t1;
+sync_slave_with_master;
+connection master;
+
+--echo End of 5.0 tests
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 73f8c5e4418..618ba62ef19 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -560,6 +560,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   int error, res;
   bool transactional_table, joins_freed= FALSE;
   bool changed;
+  bool was_insert_delayed= (table_list->lock_type ==  TL_WRITE_DELAYED);
   uint value_count;
   ulong counter = 1;
   ulonglong id;
@@ -859,14 +860,16 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
 
     transactional_table= table->file->has_transactions();
 
-    if ((changed= (info.copied || info.deleted || info.updated)))
+    if ((changed= (info.copied || info.deleted || info.updated)) ||
+        was_insert_delayed)
     {
       /*
         Invalidate the table in the query cache if something changed.
         For the transactional algorithm to work the invalidation must be
         before binlog writing and ha_autocommit_or_rollback
       */
-      query_cache_invalidate3(thd, table_list, 1);
+      if (changed)
+        query_cache_invalidate3(thd, table_list, 1);
       if (error <= 0 || !transactional_table)
       {
         if (mysql_bin_log.is_open())
@@ -904,7 +907,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
           if (mysql_bin_log.write(&qinfo) && transactional_table)
             error=1;
         }
-        if (!transactional_table)
+        if (!transactional_table && changed)
           thd->no_trans_update.all= TRUE;
       }
     }

From 00d694a900c6fcb2f7f1fe37b3a3c189c7f711dd Mon Sep 17 00:00:00 2001
From: unknown <joerg@debian.(none)>
Date: Thu, 26 Jul 2007 12:52:13 +0200
Subject: [PATCH 058/139] Raise the 64 character limit for path names in the
 error messages to 150 or 107 characters for those messages which are
 generated by the embedded server during release builds.

This fixes bug#16635:
   Error messages wrong: absolute path names, "%s" format code

See the bug report or the changelog for "sql/share/english/errmsg.txt"
for instructions how to do that with other languages,
even at the customer site, and for the restrictions to keep.


sql/share/english/errmsg.txt:
  The embedded server uses absolute path names in its error messages,
  in the release build environment these exceed the 64 character limit
  which the format strings for the error messages impose (bug#16635).

  But when the messages are output, the server does the "printf()"
  internally in a 256 character buffer; the constant text and the
  expanded variables (strings, error number) must fit into this.

  (If the buffer would overflow, a format specification will not be
  expanded but just copied with its code, and the message output
  will just contain '%s' or '%d' where a value is expected.)

  So the string lengths are increased to 150 characters in those messages
  which are issued by the embedded server during release tests
  and contain 1 (one) path name,
  but only to 107 in the "rename" message which contains 2 (two).

  This solves bug#16635 for the release builds.

  For other languages used by OEM customers, similar fixes may be needed,
  but we cannot test them.

  These fixes can be done even in a binary installation at the customer site
  by following these steps:
     cd <<install-root>>/share
     $EDITOR <<lang>>/errmsg.txt
     ../../bin/comp_err -C./charsets/ <<lang>>/errmsg.txt <<lang>>/errmsg.sys
  and then restarting the server.
---
 sql/share/english/errmsg.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 62c8f4f9991..d3a611529f2 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -21,7 +21,7 @@ character-set=latin1
 "NO",
 "YES",
 "Can't create file '%-.64s' (errno: %d)",
-"Can't create table '%-.64s' (errno: %d)",
+"Can't create table '%-.150s' (errno: %d)",
 "Can't create database '%-.64s' (errno: %d)",
 "Can't create database '%-.64s'; database exists",
 "Can't drop database '%-.64s'; database doesn't exist",
@@ -33,7 +33,7 @@ character-set=latin1
 "Can't get working directory (errno: %d)",
 "Can't lock file (errno: %d)",
 "Can't open file: '%-.64s' (errno: %d)",
-"Can't find file: '%-.64s' (errno: %d)",
+"Can't find file: '%-.150s' (errno: %d)",
 "Can't read dir of '%-.64s' (errno: %d)",
 "Can't change dir to '%-.64s' (errno: %d)",
 "Record has changed since last read in table '%-.64s'",
@@ -41,7 +41,7 @@ character-set=latin1
 "Can't write; duplicate key in table '%-.64s'",
 "Error on close of '%-.64s' (errno: %d)",
 "Error reading file '%-.64s' (errno: %d)",
-"Error on rename of '%-.64s' to '%-.64s' (errno: %d)",
+"Error on rename of '%-.107s' to '%-.107s' (errno: %d)",
 "Error writing file '%-.64s' (errno: %d)",
 "'%-.64s' is locked against change",
 "Sort aborted",

From 17136906c68846618c846a5723a16d683aa8e0a0 Mon Sep 17 00:00:00 2001
From: unknown <jperkin@production.mysql.com>
Date: Thu, 26 Jul 2007 12:57:46 +0200
Subject: [PATCH 059/139] Clean up the mysql_install_db script to ensure that a
 sane environment is available and reduce the chance of failure.  This should
 fix bug#28585 which is caused by the script being quite random in how it
 finds files it requires and not giving very good feedback to the user about
 what went wrong.

Also update make_binary_distribution so that it provides the correct path
to the required SQL scripts when generating mysql_install_db.  The script
only previously worked because of the permissive behaviour which looked
around the current working directory before the "correct" location.  This
could lead to severe problems if the user happened to run the script from
a location which contained older or even broken copies of the SQL scripts.

We now require either a complete binary release (and the mysql_install_db
script ran from inside the extracted archive), or an installed compiled
tree, as this is the only way we can be sure everything that we need is
available and ready to run.

While working on this fix, also clean up the mysql_install_db script a lot
to make it simpler, easier to read, and hopefully less prone to bugs in
the future.


scripts/make_binary_distribution.sh:
  SQL files live in ./share not ./support-files in binary distribution.
scripts/mysql_install_db.sh:
  Use a consistent shell indentation style.
---
 scripts/make_binary_distribution.sh |   2 +-
 scripts/mysql_install_db.sh         | 274 ++++++++++++++--------------
 2 files changed, 136 insertions(+), 140 deletions(-)

diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 9584721682f..dab1bbec956 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -318,7 +318,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then
   copyfileto $BASE/bin scripts/*
   $BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ \
       ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ \
-      @HOSTNAME@ \@pkgdatadir\@ ./support-files \
+      @HOSTNAME@ \@pkgdatadir\@ ./share \
       < scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
   $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \
       \@sbindir\@ ./bin \@libexecdir\@ ./bin \
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 934d245db15..c5d532ee4ed 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -18,26 +18,65 @@
 #
 # All unrecognized arguments to this script are passed to mysqld.
 
+force=0
 in_rpm=0
+ip_only=0
 windows=0
-defaults=""
-user=""
 
 case "$1" in
-    --no-defaults|--defaults-file=*|--defaults-extra-file=*)
-      defaults="$1"; shift
-      ;;
+  --no-defaults|--defaults-file=*|--defaults-extra-file=*)
+    defaults="$1"; shift
+    ;;
 esac
 
+usage()
+{
+  cat <<EOF
+Usage: $0 [OPTIONS]
+  --basedir=path       The path to the MySQL installation directory.
+  --datadir=path       The path to the MySQL data directory.
+  --force              Causes mysql_install_db to run even if DNS does not
+                       work.  In that case, grant table entries that normally
+                       use hostnames will use IP addresses.
+  --ldata=path         The path to the MySQL data directory.
+  --rpm                For internal use.  This option is used by RPM files
+                       during the MySQL installation process.
+  --skip-name-resolve  Use IP addresses rather than hostnames when creating
+                       grant table entries.  This option can be useful if
+                       your DNS does not work.
+  --srcdir=path        For internal use.  The directory under which
+                       mysql_install_db looks for support files such as the
+                       error message file and the file for popoulating the
+                       help tables.
+  --user=user_name     The login username to use for running mysqld.  Files
+                       and directories created by mysqld will be owned by this
+                       user.  You must be root to use this option.  By default
+                       mysqld runs using your current login name and files and
+                       directories that it creates will be owned by you.
+  --windows            For internal use.  This option is used for creating
+                       Windows distributions.
+
+All other options are passed to the mysqld program
+
+EOF
+  exit 1
+}
+
 s_echo()
 {
   if test "$in_rpm" -eq 0 -a "$windows" -eq 0
   then
-    echo $1
+    echo "$1"
   fi
 }
 
-parse_arguments() {
+parse_arg()
+{
+  echo "$1" | sed -e 's/^[^=]*=//'
+}
+
+parse_arguments()
+{
   # We only need to pass arguments through to the server if we don't
   # handle them here.  So, we collect unrecognized options (passed on
   # the command line) into the args variable.
@@ -51,17 +90,18 @@ parse_arguments() {
   for arg do
     case "$arg" in
       --force) force=1 ;;
-      --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-      --srcdir=*)  srcdir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-      --ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+      --basedir=*) basedir=`parse_arg "$arg"` ;;
+      --srcdir=*)  srcdir=`parse_arg "$arg"` ;;
+      --ldata=*|--datadir=*) ldata=`parse_arg "$arg"` ;;
       --user=*)
         # Note that the user will be passed to mysqld so that it runs
         # as 'user' (crucial e.g. if log-bin=/some_other_path/
         # where a chown of datadir won't help)
-	 user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+	 user=`parse_arg "$arg"` ;;
       --skip-name-resolve) ip_only=1 ;;
       --verbose) verbose=1 ;; # Obsolete
       --rpm) in_rpm=1 ;;
+      --help) usage ;;
 
       --windows)
 	# This is actually a "cross bootstrap" argument used when
@@ -89,137 +129,100 @@ parse_arguments() {
   done
 }
 
-# Get first arguments from the my.cfg file, groups [mysqld] and
-# [mysql_install_db], and then merge with the command line arguments
-if test -x ./bin/my_print_defaults
+# Sanity check - make sure we can find my_print_defaults either in the binary
+# distribution or within the installed source compile.
+print_defaults="@bindir@/my_print_defaults"
+if ! test -x $print_defaults
 then
-  print_defaults="./bin/my_print_defaults"
-elif test -x ./extra/my_print_defaults
-then
-  print_defaults="./extra/my_print_defaults"
-elif test -x @bindir@/my_print_defaults
-then
-  print_defaults="@bindir@/my_print_defaults"
-elif test -x @bindir@/mysql_print_defaults
-then
-  print_defaults="@bindir@/mysql_print_defaults"
-else
-  print_defaults="my_print_defaults"
+  echo "FATAL ERROR: Could not find $print_defaults"
+  echo
+  echo "If you are using a binary release, you must run this script from"
+  echo "within the directory the archive extracted into.  If you compiled"
+  echo "MySQL yourself you must run 'make install' first."
+  exit 1
 fi
 
-args=
-ldata=
-execdir=
-bindir=
-basedir=
-srcdir=
-force=0
-
+# Firstly, get arguments from the groups [mysqld] and [mysql_install_db]
+# in the my.cfg file, then re-run to merge with command line arguments.
 parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
-test -z "$ldata" && ldata=@localstatedir@
+# Path to MySQL installation directory
 if test -z "$basedir"
 then
-  basedir=@prefix@
-  bindir=@bindir@
-  execdir=@libexecdir@
-  pkgdatadir=@pkgdatadir@
+  basedir="@prefix@"
+  bindir="@bindir@"
+  mysqld="@libexecdir@/mysqld"
 else
   bindir="$basedir/bin"
-  if test -x "$basedir/libexec/mysqld"
-  then
-    execdir="$basedir/libexec"
-  elif test -x "$basedir/sbin/mysqld"
-  then
-    execdir="$basedir/sbin"
-  else
-    execdir="$basedir/bin"
-  fi
-fi
-
-# Find SQL scripts needed for bootstrap
-fill_help_tables="fill_help_tables.sql"
-create_system_tables="mysql_system_tables.sql"
-fill_system_tables="mysql_system_tables_data.sql"
-if test -n "$srcdir"
-then
-  fill_help_tables=$srcdir/scripts/$fill_help_tables
-  create_system_tables=$srcdir/scripts/$create_system_tables
-  fill_system_tables=$srcdir/scripts/$fill_system_tables
-else
-  for i in $basedir/support-files $basedir/share $basedir/share/mysql \
-           $basedir/scripts `pwd` `pwd`/scripts @pkgdatadir@
+  for dir in libexec sbin bin
   do
-    if test -f $i/$fill_help_tables
+    if test -x "$basedir/$dir/mysqld"
     then
-      pkgdatadir=$i
+      mysqld="$basedir/$dir/mysqld"
       break
     fi
   done
-
-  fill_help_tables=$pkgdatadir/$fill_help_tables
-  create_system_tables=$pkgdatadir/$create_system_tables
-  fill_system_tables=$pkgdatadir/$fill_system_tables
+  if test -z "$mysqld"
+  then
+    echo "FATAL ERROR: Could not find mysqld inside supplied --basedir"
+    exit 1
+  fi
 fi
 
-if test ! -f $create_system_tables
+# Path to data directory
+if test -z "$ldata"
 then
-  echo "FATAL ERROR: Could not find SQL file '$create_system_tables' in"
-  echo "@pkgdatadir@ or inside $basedir"
-  exit 1;
+  ldata="@localstatedir@"
 fi
 
-if test ! -f $fill_help_tables
+# Set up paths to SQL scripts required for bootstrap and ensure they exist.
+if test -n "$srcdir"
 then
-  echo "FATAL ERROR: Could not find help file '$fill_help_tables' in"
-  echo "@pkgdatadir@ or inside $basedir"
-  exit 1;
+  pkgdatadir="$srcdir/scripts"
+else
+  pkgdatadir="@pkgdatadir@"
 fi
 
-if test ! -f $fill_system_tables
-then
-  echo "FATAL ERROR: Could not find help file '$fill_system_tables' in"
-  echo "@pkgdatadir@ or inside $basedir"
-  exit 1;
-fi
+fill_help_tables="$pkgdatadir/fill_help_tables.sql"
+create_system_tables="$pkgdatadir/mysql_system_tables.sql"
+fill_system_tables="$pkgdatadir/mysql_system_tables_data.sql"
 
-# Find executables and paths
-mysqld=$execdir/mysqld
-mysqld_opt=""
-scriptdir=$bindir
+for f in $fill_help_tables $create_system_tables $fill_system_tables
+do
+  if test ! -f "$f"
+  then
+    echo "FATAL ERROR: Could not find SQL file '$f'"
+    exit 1
+  fi
+done
 
-if test "$windows" = 1
+# Set up Windows-specific paths
+if test "$windows" -eq 1
 then
   mysqld="./sql/mysqld"
-  if test -n "$srcdir" -a -f $srcdir/sql/share/english/errmsg.sys
+  if test -n "$srcdir" -a -f "$srcdir/sql/share/english/errmsg.sys"
   then
-    langdir=$srcdir/sql/share/english
+    langdir="$srcdir/sql/share/english"
   else
-    langdir=./sql/share/english
+    langdir="./sql/share/english"
   fi
   mysqld_opt="--language=$langdir"
-  scriptdir="./scripts"
 fi
 
-if test ! -x $mysqld
+# Make sure mysqld is available in default location (--basedir option is
+# already tested above).
+if test ! -x "$mysqld"
 then
-  if test "$in_rpm" = 1
-  then
-    echo "FATAL ERROR $mysqld not found!"
-    exit 1
-  else
-    echo "FATAL ERROR Didn't find $mysqld"
-    echo "You should do a 'make install' before executing this script"
-    exit 1
-  fi
+  echo "FATAL ERROR: $mysqld not found!"
+  exit 1
 fi
 
 # Try to determine the hostname
 hostname=`@HOSTNAME@`
 
 # Check if hostname is valid
-if test "$windows" = 0 -a "$in_rpm" = 0 -a $force = 0
+if test "$windows" -eq 0 -a "$in_rpm" -eq 0 -a "$force" -eq 0
 then
   resolved=`$bindir/resolveip $hostname 2>&1`
   if [ $? -ne 0 ]
@@ -244,39 +247,35 @@ then
   fi
 fi
 
-if test "$ip_only" = "1"
+if test "$ip_only" -eq 1
 then
-  ip=`echo "$resolved" | awk '/ /{print $6}'`
-  hostname=$ip
+  hostname=`echo "$resolved" | awk '/ /{print $6}'`
 fi
 
 # Create database directories mysql & test
-if test ! -d $ldata; then
-  mkdir $ldata;
-  chmod 700 $ldata ;
-fi
-if test ! -d $ldata/mysql; then
-  mkdir $ldata/mysql;
-  chmod 700 $ldata/mysql ;
-fi
-if test ! -d $ldata/test; then
-  mkdir $ldata/test;
-  chmod 700 $ldata/test ;
-fi
-if test -w / -a ! -z "$user"; then
-  chown $user $ldata $ldata/mysql $ldata/test;
-fi
+for dir in $ldata $ldata/mysql $ldata/test
+do
+  if test ! -d $dir
+  then
+    mkdir -p $dir
+    chmod 700 $dir
+  fi
+  if test -w / -a ! -z "$user"
+  then
+    chown $user $dir
+  fi
+done
 
-if test -n "$user"; then
+if test -n "$user"
+then
   args="$args --user=$user"
 fi
 
 # Peform the install of system tables
 mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}"
 mysqld_install_cmd_line="$mysqld_bootstrap $defaults $mysqld_opt --bootstrap \
---basedir=$basedir --datadir=$ldata --skip-innodb \
---skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M \
---net_buffer_length=16K"
+  --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb \
+  --skip-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K"
 
 # Pipe mysql_system_tables.sql to "mysqld --bootstrap"
 s_echo "Installing MySQL system tables..."
@@ -284,23 +283,20 @@ if `(echo "use mysql;"; cat $create_system_tables $fill_system_tables) | $mysqld
 then
   s_echo "OK"
 
-  if test -n "$fill_help_tables"
+  s_echo "Filling help tables..."
+  # Pipe fill_help_tables.sql to "mysqld --bootstrap"
+  if `(echo "use mysql;"; cat $fill_help_tables) | $mysqld_install_cmd_line`
   then
-    s_echo "Filling help tables..."
-    # Pipe fill_help_tables.sql to "mysqld --bootstrap"
-    if `(echo "use mysql;"; cat $fill_help_tables) | $mysqld_install_cmd_line`
-    then
-      # Fill suceeded
-      s_echo "OK"
-    else
-      echo ""
-      echo "WARNING: HELP FILES ARE NOT COMPLETELY INSTALLED!"
-      echo "The \"HELP\" command might not work properly"
-      echo ""
-    fi
+    # Fill suceeded
+    s_echo "OK"
+  else
+    echo
+    echo "WARNING: HELP FILES ARE NOT COMPLETELY INSTALLED!"
+    echo "The \"HELP\" command might not work properly"
+    echo
   fi
 
-  s_echo ""
+  s_echo
   s_echo "To start mysqld at boot time you have to copy"
   s_echo "support-files/mysql.server to the right place for your system"
   s_echo
@@ -319,7 +315,7 @@ then
     echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
     echo "See the manual for more instructions."
 
-    if test "$in_rpm" = "0"
+    if test "$in_rpm" -eq 0
     then
       echo "You can start the MySQL daemon with:"
       echo "cd @prefix@ ; $bindir/mysqld_safe &"

From 82bbaaf6b1d228aaf162749882830a21b45e41d4 Mon Sep 17 00:00:00 2001
From: unknown <jperkin@production.mysql.com>
Date: Thu, 26 Jul 2007 14:27:36 +0200
Subject: [PATCH 060/139] Apply a few more cleanups to improve the robustness
 of mysql_install_db

scripts/mysql_install_db.sh:
  Put back variable initialisation for those which could be passed
  in via the environment and confuse the script.
---
 scripts/mysql_install_db.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index c5d532ee4ed..760ece5aaed 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -18,6 +18,15 @@
 #
 # All unrecognized arguments to this script are passed to mysqld.
 
+basedir=""
+ldata=""
+srcdir=""
+
+args=""
+defaults=""
+mysqld_opt=""
+user=""
+
 force=0
 in_rpm=0
 ip_only=0
@@ -87,7 +96,8 @@ parse_arguments()
     shift
   fi
 
-  for arg do
+  for arg
+  do
     case "$arg" in
       --force) force=1 ;;
       --basedir=*) basedir=`parse_arg "$arg"` ;;
@@ -203,11 +213,10 @@ then
   mysqld="./sql/mysqld"
   if test -n "$srcdir" -a -f "$srcdir/sql/share/english/errmsg.sys"
   then
-    langdir="$srcdir/sql/share/english"
+    mysqld_opt="--language=$srcdir/sql/share/english"
   else
-    langdir="./sql/share/english"
+    mysqld_opt="./sql/share/english"
   fi
-  mysqld_opt="--language=$langdir"
 fi
 
 # Make sure mysqld is available in default location (--basedir option is

From 8f5b02541e6000d920c17ad000342d512e8aca5d Mon Sep 17 00:00:00 2001
From: unknown <jperkin@production.mysql.com>
Date: Thu, 26 Jul 2007 14:31:11 +0200
Subject: [PATCH 061/139] mysql_install_db.sh:   Fix error in previous change,
 correct --language argument.

scripts/mysql_install_db.sh:
  Fix error in previous change, correct --language argument.
---
 scripts/mysql_install_db.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 760ece5aaed..7e1f6217b7b 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -215,7 +215,7 @@ then
   then
     mysqld_opt="--language=$srcdir/sql/share/english"
   else
-    mysqld_opt="./sql/share/english"
+    mysqld_opt="--language=./sql/share/english"
   fi
 fi
 

From f2a91e55c8c522877c1af0dd99b6300b3f4d5f01 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Thu, 26 Jul 2007 16:59:21 +0300
Subject: [PATCH 062/139] Addendum to bug 29571: wait for INSERT DELAYED to
 finish on master

---
 mysql-test/r/rpl_insert_delayed.result | 3 +++
 mysql-test/t/rpl_insert_delayed.test   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/mysql-test/r/rpl_insert_delayed.result b/mysql-test/r/rpl_insert_delayed.result
index ddf6e9c2165..6815a727fd7 100644
--- a/mysql-test/r/rpl_insert_delayed.result
+++ b/mysql-test/r/rpl_insert_delayed.result
@@ -32,10 +32,12 @@ drop table t1;
 CREATE TABLE t1(a int, UNIQUE(a));
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
+flush table t1;
 show binlog events limit 11,100;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
 x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; flush table t1
 select * from t1;
 a
 1
@@ -44,6 +46,7 @@ show binlog events limit 12,100;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
 x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; flush table t1
 select * from t1;
 a
 1
diff --git a/mysql-test/t/rpl_insert_delayed.test b/mysql-test/t/rpl_insert_delayed.test
index 141f36a694a..09e0c5cc2e9 100644
--- a/mysql-test/t/rpl_insert_delayed.test
+++ b/mysql-test/t/rpl_insert_delayed.test
@@ -73,6 +73,7 @@ connection master;
 CREATE TABLE t1(a int, UNIQUE(a));
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
+flush table t1; # to wait for INSERT DELAYED to be done
 
 #must show two INSERT DELAYED
 --replace_column 1 x 2 x 3 x 4 x 5 x

From d8c8c3437f0ee875f9738bb065d8d64a195af43a Mon Sep 17 00:00:00 2001
From: unknown <joerg@debian.(none)>
Date: Thu, 26 Jul 2007 17:25:03 +0200
Subject: [PATCH 063/139] Remove the "row_lock" suite from the sources.

For more information, see WL#3866 and the bugs numbered 28685 and 20390.


BitKeeper/deleted/.del-readme.txt:
  Delete: mysql-test/suite/row_lock/readme.txt
BitKeeper/deleted/.del-summary_of_sel_test.txt:
  Delete: mysql-test/suite/row_lock/summary_of_sel_test.txt
BitKeeper/deleted/.del-innodb_row_lock_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_1.result
BitKeeper/deleted/.del-innodb_row_lock_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_2.result
BitKeeper/deleted/.del-innodb_row_lock_3.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_3.result
BitKeeper/deleted/.del-innodb_row_lock_4.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_4.result
BitKeeper/deleted/.del-innodb_row_lock_5.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_5.result
BitKeeper/deleted/.del-innodb_row_lock_big_tab.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
BitKeeper/deleted/.del-innodb_row_lock_trig_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
BitKeeper/deleted/.del-innodb_row_lock_trig_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
BitKeeper/deleted/.del-innodb_row_lock_view_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
BitKeeper/deleted/.del-row_lock.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock.inc
BitKeeper/deleted/.del-row_lock_big_tab.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_big_tab.inc
BitKeeper/deleted/.del-row_lock_big_tab_1.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
BitKeeper/deleted/.del-row_lock_big_tab_2.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
BitKeeper/deleted/.del-row_lock_trig.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_trig.inc
BitKeeper/deleted/.del-row_lock_view.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_view.inc
BitKeeper/deleted/.del-row_lock_view_mix.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_view_mix.inc
BitKeeper/deleted/.del-row_lock_view_storedp.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
BitKeeper/deleted/.del-row_lock_view_trig.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_view_trig.inc
BitKeeper/deleted/.del-innodb_row_lock_view_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
BitKeeper/deleted/.del-ndb_row_lock_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_1.result
BitKeeper/deleted/.del-ndb_row_lock_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_2.result
BitKeeper/deleted/.del-ndb_row_lock_3.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_3.result
BitKeeper/deleted/.del-ndb_row_lock_4.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_4.result
BitKeeper/deleted/.del-ndb_row_lock_5.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_5.result
BitKeeper/deleted/.del-ndb_row_lock_big_tab.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
BitKeeper/deleted/.del-ndb_row_lock_trig_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
BitKeeper/deleted/.del-ndb_row_lock_trig_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
BitKeeper/deleted/.del-ndb_row_lock_view_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
BitKeeper/deleted/.del-ndb_row_lock_view_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
BitKeeper/deleted/.del-innodb_row_lock_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_1.test
BitKeeper/deleted/.del-innodb_row_lock_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_2.test
BitKeeper/deleted/.del-innodb_row_lock_3.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_3.test
BitKeeper/deleted/.del-innodb_row_lock_4.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_4.test
BitKeeper/deleted/.del-innodb_row_lock_5.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_5.test
BitKeeper/deleted/.del-innodb_row_lock_big_tab.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test
BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test
BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test
BitKeeper/deleted/.del-innodb_row_lock_trig_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test
BitKeeper/deleted/.del-innodb_row_lock_trig_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test
BitKeeper/deleted/.del-innodb_row_lock_view_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test
BitKeeper/deleted/.del-innodb_row_lock_view_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test
BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test
BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result
BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result
BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result
BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result
BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result
BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result
BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test
BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test
BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test
BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test
BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test
BitKeeper/deleted/.del-ndb_row_lock_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_1.test
BitKeeper/deleted/.del-ndb_row_lock_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_2.test
BitKeeper/deleted/.del-ndb_row_lock_3.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_3.test
BitKeeper/deleted/.del-ndb_row_lock_4.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_4.test
BitKeeper/deleted/.del-ndb_row_lock_5.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_5.test
BitKeeper/deleted/.del-ndb_row_lock_big_tab.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test
BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test
BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test
BitKeeper/deleted/.del-ndb_row_lock_trig_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test
BitKeeper/deleted/.del-ndb_row_lock_trig_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test
BitKeeper/deleted/.del-ndb_row_lock_view_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test
BitKeeper/deleted/.del-ndb_row_lock_view_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test
BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test
BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test
BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test
BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test
BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test
BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test
Makefile.am:
  Remove the "row_lock" suite from the "test-bt" target.

  Also, a formatting change: empty line for better readability.
---
 Makefile.am                                   |   3 +-
 .../suite/row_lock/include/row_lock.inc       |  83 ----
 .../row_lock/include/row_lock_big_tab.inc     |  94 -----
 .../row_lock/include/row_lock_big_tab_1.inc   |  93 -----
 .../row_lock/include/row_lock_big_tab_2.inc   |  93 -----
 .../suite/row_lock/include/row_lock_trig.inc  |  96 -----
 .../suite/row_lock/include/row_lock_view.inc  |  89 -----
 .../row_lock/include/row_lock_view_mix.inc    |  92 -----
 .../include/row_lock_view_storedp.inc         | 126 -------
 .../row_lock/include/row_lock_view_trig.inc   |  99 -----
 .../suite/row_lock/r/innodb_row_lock_1.result | 142 -------
 .../suite/row_lock/r/innodb_row_lock_2.result |  32 --
 .../suite/row_lock/r/innodb_row_lock_3.result |  32 --
 .../suite/row_lock/r/innodb_row_lock_4.result | 142 -------
 .../suite/row_lock/r/innodb_row_lock_5.result |  32 --
 .../row_lock/r/innodb_row_lock_big_tab.result |  97 -----
 .../r/innodb_row_lock_big_tab_1.result        | 145 -------
 .../r/innodb_row_lock_big_tab_2.result        | 113 ------
 .../row_lock/r/innodb_row_lock_trig_1.result  | 151 --------
 .../row_lock/r/innodb_row_lock_trig_2.result  |  37 --
 .../row_lock/r/innodb_row_lock_view_1.result  |  34 --
 .../row_lock/r/innodb_row_lock_view_2.result  |  40 --
 .../r/innodb_row_lock_view_mix_1.result       |  48 ---
 .../r/innodb_row_lock_view_mix_2.result       |  40 --
 .../r/innodb_row_lock_view_storedp_1.result   | 312 ---------------
 .../r/innodb_row_lock_view_storedp_2.result   |  47 ---
 .../r/innodb_row_lock_view_trig_1.result      | 183 ---------
 .../r/innodb_row_lock_view_trig_2.result      |  38 --
 .../suite/row_lock/r/ndb_row_lock_1.result    | 139 -------
 .../suite/row_lock/r/ndb_row_lock_2.result    |  31 --
 .../suite/row_lock/r/ndb_row_lock_3.result    |  30 --
 .../suite/row_lock/r/ndb_row_lock_4.result    | 139 -------
 .../suite/row_lock/r/ndb_row_lock_5.result    |  30 --
 .../row_lock/r/ndb_row_lock_big_tab.result    | 177 ---------
 .../row_lock/r/ndb_row_lock_big_tab_1.result  | 357 ------------------
 .../row_lock/r/ndb_row_lock_big_tab_2.result  | 255 -------------
 .../row_lock/r/ndb_row_lock_trig_1.result     | 148 --------
 .../row_lock/r/ndb_row_lock_trig_2.result     |  35 --
 .../row_lock/r/ndb_row_lock_view_1.result     | 194 ----------
 .../row_lock/r/ndb_row_lock_view_2.result     | 200 ----------
 .../row_lock/r/ndb_row_lock_view_mix_1.result | 169 ---------
 .../row_lock/r/ndb_row_lock_view_mix_2.result |  38 --
 .../r/ndb_row_lock_view_storedp_1.result      | 309 ---------------
 .../r/ndb_row_lock_view_storedp_2.result      |  46 ---
 .../r/ndb_row_lock_view_trig_1.result         | 180 ---------
 .../r/ndb_row_lock_view_trig_2.result         |  36 --
 mysql-test/suite/row_lock/readme.txt          |   9 -
 .../suite/row_lock/summary_of_sel_test.txt    |  36 --
 .../suite/row_lock/t/innodb_row_lock_1.test   |   9 -
 .../suite/row_lock/t/innodb_row_lock_2.test   |   9 -
 .../suite/row_lock/t/innodb_row_lock_3.test   |   9 -
 .../suite/row_lock/t/innodb_row_lock_4.test   |   9 -
 .../suite/row_lock/t/innodb_row_lock_5.test   |   9 -
 .../row_lock/t/innodb_row_lock_big_tab.test   |   9 -
 .../row_lock/t/innodb_row_lock_big_tab_1.test |  10 -
 .../row_lock/t/innodb_row_lock_big_tab_2.test |  10 -
 .../row_lock/t/innodb_row_lock_trig_1.test    |   9 -
 .../row_lock/t/innodb_row_lock_trig_2.test    |   9 -
 .../row_lock/t/innodb_row_lock_view_1.test    |   9 -
 .../row_lock/t/innodb_row_lock_view_2.test    |   9 -
 .../t/innodb_row_lock_view_mix_1.test         |   9 -
 .../t/innodb_row_lock_view_mix_2.test         |  10 -
 .../t/innodb_row_lock_view_storedp_1.test     |   9 -
 .../t/innodb_row_lock_view_storedp_2.test     |   9 -
 .../t/innodb_row_lock_view_trig_1.test        |   9 -
 .../t/innodb_row_lock_view_trig_2.test        |   9 -
 .../suite/row_lock/t/ndb_row_lock_1.test      |   6 -
 .../suite/row_lock/t/ndb_row_lock_2.test      |   6 -
 .../suite/row_lock/t/ndb_row_lock_3.test      |   6 -
 .../suite/row_lock/t/ndb_row_lock_4.test      |   6 -
 .../suite/row_lock/t/ndb_row_lock_5.test      |   6 -
 .../row_lock/t/ndb_row_lock_big_tab.test      |   6 -
 .../row_lock/t/ndb_row_lock_big_tab_1.test    |   7 -
 .../row_lock/t/ndb_row_lock_big_tab_2.test    |   7 -
 .../suite/row_lock/t/ndb_row_lock_trig_1.test |   6 -
 .../suite/row_lock/t/ndb_row_lock_trig_2.test |   6 -
 .../suite/row_lock/t/ndb_row_lock_view_1.test |   7 -
 .../suite/row_lock/t/ndb_row_lock_view_2.test |   6 -
 .../row_lock/t/ndb_row_lock_view_mix_1.test   |   6 -
 .../row_lock/t/ndb_row_lock_view_mix_2.test   |   6 -
 .../t/ndb_row_lock_view_storedp_1.test        |   6 -
 .../t/ndb_row_lock_view_storedp_2.test        |   6 -
 .../row_lock/t/ndb_row_lock_view_trig_1.test  |   6 -
 .../row_lock/t/ndb_row_lock_view_trig_2.test  |   6 -
 84 files changed, 1 insertion(+), 5366 deletions(-)
 delete mode 100644 mysql-test/suite/row_lock/include/row_lock.inc
 delete mode 100644 mysql-test/suite/row_lock/include/row_lock_big_tab.inc
 delete mode 100644 mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
 delete mode 100644 mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
 delete mode 100644 mysql-test/suite/row_lock/include/row_lock_trig.inc
 delete mode 100644 mysql-test/suite/row_lock/include/row_lock_view.inc
 delete mode 100644 mysql-test/suite/row_lock/include/row_lock_view_mix.inc
 delete mode 100644 mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
 delete mode 100644 mysql-test/suite/row_lock/include/row_lock_view_trig.inc
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_3.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_4.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_5.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_3.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_4.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_5.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result
 delete mode 100644 mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result
 delete mode 100644 mysql-test/suite/row_lock/readme.txt
 delete mode 100644 mysql-test/suite/row_lock/summary_of_sel_test.txt
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_3.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_4.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_5.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_3.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_4.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_5.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test
 delete mode 100644 mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test

diff --git a/Makefile.am b/Makefile.am
index 186a3ec2453..66daff4bd68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@ AUTOMAKE_OPTIONS =	foreign
 # These are built from source in the Docs directory
 EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \
 			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
+
 SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 			@readline_topdir@ sql-common scripts \
 			@thread_dirs@ pstack \
@@ -157,8 +158,6 @@ test-bt:
 	@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
-	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	@PERL@ ./mysql-test-run.pl --force --comment=rowlock --suite=row_lock
 	-if [ -d mysql-test/suite/nist ] ; then \
 	  cd mysql-test ; MTR_BUILD_THREAD=auto \
 	  @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \
diff --git a/mysql-test/suite/row_lock/include/row_lock.inc b/mysql-test/suite/row_lock/include/row_lock.inc
deleted file mode 100644
index 8572bc0246e..00000000000
--- a/mysql-test/suite/row_lock/include/row_lock.inc
+++ /dev/null
@@ -1,83 +0,0 @@
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
---enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
---echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-eval $indext2;
-COMMIT;
-SELECT @@global.tx_isolation;
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
---echo connection root1;
-CONNECTION root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE t1,t2 SET t1.i=223,t2.i=223 WHERE t1.i=123 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE t1,t2 SET t1.i=224,t2.i=224 WHERE t1.i=124 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
---echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
---echo connection default;
-CONNECTION default;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
---echo connection default;
-CONNECTION default;
-DROP TABLE t1, t2;
-
diff --git a/mysql-test/suite/row_lock/include/row_lock_big_tab.inc b/mysql-test/suite/row_lock/include/row_lock_big_tab.inc
deleted file mode 100644
index f0823067eac..00000000000
--- a/mysql-test/suite/row_lock/include/row_lock_big_tab.inc
+++ /dev/null
@@ -1,94 +0,0 @@
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
---enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
---echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext2;
-DELIMITER |;
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT count(*)/2 INTO res FROM t1;
-    RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT count(*)/2 INTO res FROM t2;
-    RETURN  res;
-END;
-|
-DELIMITER ;|
-CALL fill_t1 (10);
-CALL fill_t2 (10);
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
---echo connection root1;
-CONNECTION root1;
-SELECT k from t1 WHERE k < half_t1();
-SELECT k from t1 WHERE k >= half_t1();
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k < half_t1() AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k >= half_t1() AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
---echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
---echo connection default;
-CONNECTION default;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
---echo connection default;
-CONNECTION default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
-#DROP VIEW v1;
-
diff --git a/mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc b/mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
deleted file mode 100644
index 8535c016819..00000000000
--- a/mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
+++ /dev/null
@@ -1,93 +0,0 @@
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
---enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
---echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext2;
-DELIMITER |;
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT MOD(k,2) INTO res FROM t1;
-    RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT MOD(k,2) INTO res FROM t2;
-    RETURN  res;
-END;
-|
-DELIMITER ;|
-eval CALL fill_t1 ($nbrows);
-eval CALL fill_t2 ($nbrows);
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
---echo connection root1;
-CONNECTION root1;
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 1 AND t1.k = t2.k LOCK IN SHARE MODE;
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k % 2 = 1 AND t1.k = t2.k;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k % 2 = 0 AND t1.k = t2.k;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-
-COMMIT;
-
---echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
---echo connection default;
-CONNECTION default;
-SELECT * FROM t1 WHERE k < 40 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 40 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 WHERE k < 40 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 40 ORDER BY t2.k;
-DISCONNECT root1;
---echo connection default;
-CONNECTION default;
-DROP TABLE t1, t2;
-
-
diff --git a/mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc b/mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
deleted file mode 100644
index 050f2a54016..00000000000
--- a/mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
+++ /dev/null
@@ -1,93 +0,0 @@
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
---enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
---echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext2;
-DELIMITER |;
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT MOD(k,2) INTO res FROM t1;
-    RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT MOD(k,2) INTO res FROM t2;
-    RETURN  res;
-END;
-|
-DELIMITER ;|
-eval CALL fill_t1 ($nbrows);
-eval CALL fill_t2 ($nbrows);
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
---echo connection root1;
-CONNECTION root1;
-#SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 1 AND t1.k = t2.k FOR UPDATE;
-DELETE FROM t1 WHERE t1.k % 2 = 1;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k % 2 = 0 AND t1.k = t2.k;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-
-COMMIT;
-
---echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
---echo connection default;
-CONNECTION default;
-SELECT * FROM t1 WHERE k < 40 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 40 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 WHERE k < 40 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 40 ORDER BY t2.k;
-DISCONNECT root1;
---echo connection default;
-CONNECTION default;
-DROP TABLE t1, t2;
-
-
diff --git a/mysql-test/suite/row_lock/include/row_lock_trig.inc b/mysql-test/suite/row_lock/include/row_lock_trig.inc
deleted file mode 100644
index 384f00f243e..00000000000
--- a/mysql-test/suite/row_lock/include/row_lock_trig.inc
+++ /dev/null
@@ -1,96 +0,0 @@
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
---enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
---echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-eval $indext2;
-DELIMITER |;
-
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-  FOR EACH ROW BEGIN
-    UPDATE t1 SET l = NEW.i WHERE i = OLD.i;
-  END;
-|
-
-DELIMITER ;|
-
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
---echo connection root1;
-CONNECTION root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
---echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
---echo connection default;
-CONNECTION default;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
---echo connection default;
-CONNECTION default;
-DROP TABLE t1, t2;
-#DROP VIEW v1;
-
diff --git a/mysql-test/suite/row_lock/include/row_lock_view.inc b/mysql-test/suite/row_lock/include/row_lock_view.inc
deleted file mode 100644
index fbed8f64d3a..00000000000
--- a/mysql-test/suite/row_lock/include/row_lock_view.inc
+++ /dev/null
@@ -1,89 +0,0 @@
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
---enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
---echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-eval $indext2;
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
---echo connection root1;
-CONNECTION root1;
-UPDATE v1 SET i=325 where i=125;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE v1 SET i=323 where i=123;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
---echo connection root1;
-CONNECTION root1;
-UPDATE v1 SET i=326 where i=126;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE v1 SET i=324 where i=124;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
---echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
---echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
---echo connection default;
-CONNECTION default;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
---echo connection default;
-CONNECTION default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
-#DROP VIEW v1;
-
diff --git a/mysql-test/suite/row_lock/include/row_lock_view_mix.inc b/mysql-test/suite/row_lock/include/row_lock_view_mix.inc
deleted file mode 100644
index 9e8cf3d34fc..00000000000
--- a/mysql-test/suite/row_lock/include/row_lock_view_mix.inc
+++ /dev/null
@@ -1,92 +0,0 @@
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
---enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
---echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-eval $indext2;
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
---echo connection root1;
-CONNECTION root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-#UPDATE v1 SET i=325 where i=125;
-#SELECT * FROM v1 ORDER BY i,l;
-#SELECT * FROM t1 ORDER BY t1.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE v1 SET i=323 where i=123;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
---echo connection root1;
-CONNECTION root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE v1 SET i=324 where i=124;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
---echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
---echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
---echo connection default;
-CONNECTION default;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
---echo connection default;
-CONNECTION default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
-#DROP VIEW v1;
-
diff --git a/mysql-test/suite/row_lock/include/row_lock_view_storedp.inc b/mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
deleted file mode 100644
index 479392098be..00000000000
--- a/mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
+++ /dev/null
@@ -1,126 +0,0 @@
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-DROP PROCEDURE IF EXISTS stp_t;
---enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
-CONNECT (root2, localhost, root,,);
-SET autocommit=0;
---echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-INSERT INTO t1 VALUES (5,127,5,127);
-INSERT INTO t1 VALUES (6,128,6,128);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-INSERT INTO t2 VALUES (5,127,5,127);
-INSERT INTO t2 VALUES (6,128,6,128);
-eval $indext2;
-CREATE VIEW v1 AS SELECT t1.i from t1;
-DELIMITER |;
-
-CREATE PROCEDURE stp_t (IN p1 int, IN p2 int) MODIFIES SQL DATA
-  BEGIN
-    UPDATE t2 SET i = p2 WHERE i = p1;
-    UPDATE v1 SET i = p2 WHERE i = p1;
-    SELECT * FROM v1 ORDER BY i;
-    SELECT * FROM t1 ORDER BY t1.k;
-    SELECT * FROM t2 ORDER BY t2.k;
-  END;
-|
-
-DELIMITER ;|
-
-COMMIT;
-SELECT @@global.tx_isolation;
-eval EXPLAIN $select;
-eval $select;
---echo connection root1;
-CONNECTION root1;
-CALL stp_t (125, 225);
-
---echo connection root2;
-CONNECTION root2;
-CALL stp_t (127, 227);
-
---echo connection default;
-CONNECTION default;
-CALL stp_t (123, 223);
-
---echo connection root1;
-CONNECTION root1;
-CALL stp_t (126, 226);
-
---echo connection root2;
-CONNECTION root2;
-CALL stp_t (128, 228);
-
---echo connection default;
-CONNECTION default;
-CALL stp_t (124, 224);
-
---echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root2;
-CONNECTION root2;
-DELETE FROM t1 WHERE t1.i=228;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
---echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
---echo connection root1;
-CONNECTION root1;
-COMMIT;
-
---echo connection default;
-CONNECTION default;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
-
---echo connection root2;
-CONNECTION root2;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root2;
-
---echo connection default;
-CONNECTION default;
---disable_warnings
-DROP VIEW v1;
-DROP PROCEDURE stp_t;
-DROP TABLE t1, t2;
---enable_warnings
diff --git a/mysql-test/suite/row_lock/include/row_lock_view_trig.inc b/mysql-test/suite/row_lock/include/row_lock_view_trig.inc
deleted file mode 100644
index 785eb1b66a9..00000000000
--- a/mysql-test/suite/row_lock/include/row_lock_view_trig.inc
+++ /dev/null
@@ -1,99 +0,0 @@
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
---enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
---echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-eval $indext2;
-CREATE VIEW v1 AS SELECT t1.i from t1;
-DELIMITER |;
-
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-  FOR EACH ROW BEGIN
-    UPDATE v1 SET i = NEW.i WHERE i = OLD.i;
-  END;
-|
-
-DELIMITER ;|
-
-COMMIT;
-SELECT @@global.tx_isolation;
-eval EXPLAIN $select;
-eval $select;
---echo connection root1;
-CONNECTION root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
---echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
---echo connection default;
-CONNECTION default;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
---echo connection root1;
-CONNECTION root1;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
---echo connection default;
-CONNECTION default;
-DROP TABLE t1, t2;
-DROP VIEW v1;
-
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_1.result b/mysql-test/suite/row_lock/r/innodb_row_lock_1.result
deleted file mode 100644
index 54ed4350ba9..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_1.result
+++ /dev/null
@@ -1,142 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	2	Using where; Using index
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=223,t2.i=223 WHERE t1.i=123 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=224,t2.i=224 WHERE t1.i=124 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_2.result b/mysql-test/suite/row_lock/r/innodb_row_lock_2.result
deleted file mode 100644
index 56154e64489..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_2.result
+++ /dev/null
@@ -1,32 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_3.result b/mysql-test/suite/row_lock/r/innodb_row_lock_3.result
deleted file mode 100644
index a89c55973d2..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_3.result
+++ /dev/null
@@ -1,32 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_4.result b/mysql-test/suite/row_lock/r/innodb_row_lock_4.result
deleted file mode 100644
index 310d24a456a..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_4.result
+++ /dev/null
@@ -1,142 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	2	Using where; Using index
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=223,t2.i=223 WHERE t1.i=123 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=224,t2.i=224 WHERE t1.i=124 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_5.result b/mysql-test/suite/row_lock/r/innodb_row_lock_5.result
deleted file mode 100644
index ace5fddfad5..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_5.result
+++ /dev/null
@@ -1,32 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1 ignore index (ixi),t2 IGNORE INDEX (ixi) WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1 ignore index (ixi),t2 IGNORE INDEX (ixi) WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result b/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
deleted file mode 100644
index 8f00c3a0bb7..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
+++ /dev/null
@@ -1,97 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT count(*)/2 INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT count(*)/2 INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (10);
-CALL fill_t2 (10);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < half_t1() AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	10	Using where; Using index
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where; Using index
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < half_t1() AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-connection root1;
-SELECT k from t1 WHERE k < half_t1();
-k
-0
-1
-2
-3
-4
-SELECT k from t1 WHERE k >= half_t1();
-k
-5
-6
-7
-8
-9
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k < half_t1() AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-0	1111	0	100
-1	1111	1	101
-2	1111	2	102
-3	1111	3	103
-4	1111	4	104
-5	105	5	105
-6	106	6	106
-7	107	7	107
-8	108	8	108
-9	109	9	109
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-0	2222	0	100
-1	2222	1	101
-2	2222	2	102
-3	2222	3	103
-4	2222	4	104
-5	105	5	105
-6	106	6	106
-7	107	7	107
-8	108	8	108
-9	109	9	109
-connection default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k >= half_t1() AND t2.i=t1.i;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result b/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
deleted file mode 100644
index 0b12f149193..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
+++ /dev/null
@@ -1,145 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (40);
-CALL fill_t2 (40);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 0 AND t1.k = t2.k LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	PRIMARY	ixi	5	NULL	40	Using where; Using index
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.k	1	
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 0 AND t1.k = t2.k LOCK IN SHARE MODE;
-i	i
-100	100
-102	102
-104	104
-106	106
-108	108
-110	110
-112	112
-114	114
-116	116
-118	118
-120	120
-122	122
-124	124
-126	126
-128	128
-130	130
-132	132
-134	134
-136	136
-138	138
-connection root1;
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 1 AND t1.k = t2.k LOCK IN SHARE MODE;
-i	i
-101	101
-103	103
-105	105
-107	107
-109	109
-111	111
-113	113
-115	115
-117	117
-119	119
-121	121
-123	123
-125	125
-127	127
-129	129
-131	131
-133	133
-135	135
-137	137
-139	139
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k % 2 = 1 AND t1.k = t2.k;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-k	i	j	l
-0	100	0	100
-1	1111	1	101
-2	102	2	102
-3	1111	3	103
-4	104	4	104
-5	1111	5	105
-6	106	6	106
-7	1111	7	107
-8	108	8	108
-9	1111	9	109
-10	110	10	110
-11	1111	11	111
-12	112	12	112
-13	1111	13	113
-14	114	14	114
-15	1111	15	115
-16	116	16	116
-17	1111	17	117
-18	118	18	118
-19	1111	19	119
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-k	i	j	l
-0	100	0	100
-1	2222	1	101
-2	102	2	102
-3	2222	3	103
-4	104	4	104
-5	2222	5	105
-6	106	6	106
-7	2222	7	107
-8	108	8	108
-9	2222	9	109
-10	110	10	110
-11	2222	11	111
-12	112	12	112
-13	2222	13	113
-14	114	14	114
-15	2222	15	115
-16	116	16	116
-17	2222	17	117
-18	118	18	118
-19	2222	19	119
-connection default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k % 2 = 0 AND t1.k = t2.k;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result b/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
deleted file mode 100644
index cc9f297f9fb..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
+++ /dev/null
@@ -1,113 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (40);
-CALL fill_t2 (40);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 0 AND t1.k = t2.k LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	PRIMARY	ixi	5	NULL	40	Using where; Using index
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.k	1	
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 0 AND t1.k = t2.k LOCK IN SHARE MODE;
-i	i
-100	100
-102	102
-104	104
-106	106
-108	108
-110	110
-112	112
-114	114
-116	116
-118	118
-120	120
-122	122
-124	124
-126	126
-128	128
-130	130
-132	132
-134	134
-136	136
-138	138
-connection root1;
-DELETE FROM t1 WHERE t1.k % 2 = 1;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-k	i	j	l
-0	100	0	100
-2	102	2	102
-4	104	4	104
-6	106	6	106
-8	108	8	108
-10	110	10	110
-12	112	12	112
-14	114	14	114
-16	116	16	116
-18	118	18	118
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	105	5	105
-6	106	6	106
-7	107	7	107
-8	108	8	108
-9	109	9	109
-10	110	10	110
-11	111	11	111
-12	112	12	112
-13	113	13	113
-14	114	14	114
-15	115	15	115
-16	116	16	116
-17	117	17	117
-18	118	18	118
-19	119	19	119
-connection default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k % 2 = 0 AND t1.k = t2.k;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result b/mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
deleted file mode 100644
index dd43e5752e5..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
+++ /dev/null
@@ -1,151 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE t1 SET l = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	226
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	226
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result b/mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
deleted file mode 100644
index cb3a5c692e9..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
+++ /dev/null
@@ -1,37 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE t1 SET l = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result b/mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
deleted file mode 100644
index 834cb669833..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
+++ /dev/null
@@ -1,34 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	2	Using where; Using index
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE v1 SET i=325 where i=125;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result b/mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
deleted file mode 100644
index 440138d4cd1..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
+++ /dev/null
@@ -1,40 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	index	NULL	PRIMARY	4	NULL	4	Using index
-SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-i
-123
-124
-123
-124
-123
-124
-123
-124
-connection root1;
-UPDATE v1 SET i=325 where i=125;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result b/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
deleted file mode 100644
index 230873b67a0..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
+++ /dev/null
@@ -1,48 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	2	Using where; Using index
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE v1 SET i=323 where i=123;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result b/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
deleted file mode 100644
index d792d573f8e..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
+++ /dev/null
@@ -1,40 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	index	NULL	PRIMARY	4	NULL	4	Using index
-SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-i
-123
-124
-123
-124
-123
-124
-123
-124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result b/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
deleted file mode 100644
index 77b9a4dd964..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
+++ /dev/null
@@ -1,312 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-INSERT INTO t1 VALUES (5,127,5,127);
-INSERT INTO t1 VALUES (6,128,6,128);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-INSERT INTO t2 VALUES (5,127,5,127);
-INSERT INTO t2 VALUES (6,128,6,128);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE PROCEDURE stp_t (IN p1 int, IN p2 int) MODIFIES SQL DATA
-BEGIN
-UPDATE t2 SET i = p2 WHERE i = p1;
-UPDATE v1 SET i = p2 WHERE i = p1;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	6	Using where; Using index
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-CALL stp_t (125, 225);
-i
-123
-124
-126
-127
-128
-225
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-CALL stp_t (127, 227);
-i
-123
-124
-125
-126
-128
-227
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	128	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	128	6	128
-connection default;
-CALL stp_t (123, 223);
-i
-124
-125
-126
-127
-128
-223
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root1;
-CALL stp_t (126, 226);
-i
-123
-124
-127
-128
-225
-226
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-CALL stp_t (128, 228);
-i
-123
-124
-125
-126
-227
-228
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-connection default;
-CALL stp_t (124, 224);
-i
-125
-126
-127
-128
-223
-224
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-DELETE FROM t1 WHERE t1.i=228;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-COMMIT;
-connection root1;
-ROLLBACK;
-connection root1;
-COMMIT;
-connection default;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-127
-128
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root1;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-127
-128
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-SELECT * FROM v1 ORDER BY i;
-i
-123
-124
-125
-126
-227
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-connection default;
-DROP TABLE t1, t2;
-DROP VIEW v1;
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result b/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
deleted file mode 100644
index 73d8a3f4bea..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
+++ /dev/null
@@ -1,47 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-INSERT INTO t1 VALUES (5,127,5,127);
-INSERT INTO t1 VALUES (6,128,6,128);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-INSERT INTO t2 VALUES (5,127,5,127);
-INSERT INTO t2 VALUES (6,128,6,128);
-#CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE PROCEDURE stp_t (IN p1 int, IN p2 int) MODIFIES SQL DATA
-BEGIN
-UPDATE t2 SET i = p2 WHERE i = p1;
-UPDATE v1 SET i = p2 WHERE i = p1;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	6	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-CALL stp_t (125, 225);
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result b/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
deleted file mode 100644
index 90383a9489f..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
+++ /dev/null
@@ -1,183 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE v1 SET i = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM v1 ORDER BY i;
-i
-123
-124
-126
-225
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM v1 ORDER BY i;
-i
-124
-125
-126
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM v1 ORDER BY i;
-i
-123
-124
-225
-226
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-223
-224
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
-DROP VIEW v1;
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result b/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
deleted file mode 100644
index 55793558b21..00000000000
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
+++ /dev/null
@@ -1,38 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE v1 SET i = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_1.result b/mysql-test/suite/row_lock/r/ndb_row_lock_1.result
deleted file mode 100644
index 248c7d5ea1f..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_1.result
+++ /dev/null
@@ -1,139 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=223,t2.i=223 WHERE t1.i=123 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=224,t2.i=224 WHERE t1.i=124 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_2.result b/mysql-test/suite/row_lock/r/ndb_row_lock_2.result
deleted file mode 100644
index 109d99dd036..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_2.result
+++ /dev/null
@@ -1,31 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_3.result b/mysql-test/suite/row_lock/r/ndb_row_lock_3.result
deleted file mode 100644
index c936ea209ff..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_3.result
+++ /dev/null
@@ -1,30 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_4.result b/mysql-test/suite/row_lock/r/ndb_row_lock_4.result
deleted file mode 100644
index 875c783bd81..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_4.result
+++ /dev/null
@@ -1,139 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=223,t2.i=223 WHERE t1.i=123 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=224,t2.i=224 WHERE t1.i=124 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_5.result b/mysql-test/suite/row_lock/r/ndb_row_lock_5.result
deleted file mode 100644
index 0d94f8abf72..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_5.result
+++ /dev/null
@@ -1,30 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1 ignore index (ixi),t2 IGNORE INDEX (ixi) WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1 ignore index (ixi),t2 IGNORE INDEX (ixi) WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result b/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
deleted file mode 100644
index 94b67c63d94..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
+++ /dev/null
@@ -1,177 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT count(*)/2 INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT count(*)/2 INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (10);
-CALL fill_t2 (10);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < half_t1() AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < half_t1() AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-connection root1;
-SELECT k from t1 WHERE k < half_t1();
-k
-0
-3
-1
-2
-4
-SELECT k from t1 WHERE k >= half_t1();
-k
-6
-7
-9
-5
-8
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k < half_t1() AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-0	1111	0	100
-1	1111	1	101
-2	1111	2	102
-3	1111	3	103
-4	1111	4	104
-5	105	5	105
-6	106	6	106
-7	107	7	107
-8	108	8	108
-9	109	9	109
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-0	2222	0	100
-1	2222	1	101
-2	2222	2	102
-3	2222	3	103
-4	2222	4	104
-5	105	5	105
-6	106	6	106
-7	107	7	107
-8	108	8	108
-9	109	9	109
-connection default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k >= half_t1() AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	3333	5	105
-6	3333	6	106
-7	3333	7	107
-8	3333	8	108
-9	3333	9	109
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	4444	5	105
-6	4444	6	106
-7	4444	7	107
-8	4444	8	108
-9	4444	9	109
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	3333	5	105
-6	3333	6	106
-7	3333	7	107
-8	3333	8	108
-9	3333	9	109
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	4444	5	105
-6	4444	6	106
-7	4444	7	107
-8	4444	8	108
-9	4444	9	109
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	3333	5	105
-6	3333	6	106
-7	3333	7	107
-8	3333	8	108
-9	3333	9	109
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	4444	5	105
-6	4444	6	106
-7	4444	7	107
-8	4444	8	108
-9	4444	9	109
-connection default;
-DROP VIEW IF EXISTS v1;
-Warnings:
-Note	1051	Unknown table 'test.v1'
-DROP TABLE t1, t2;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result b/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
deleted file mode 100644
index 9803895e1a7..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
+++ /dev/null
@@ -1,357 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (200);
-CALL fill_t2 (200);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < t1.k % 2 = 0 AND t2.k=t1.k LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	200	Using where
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.k	1	
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < t1.k % 2 = 0 AND t2.k=t1.k LOCK IN SHARE MODE;
-i	i
-135	135
-119	119
-211	211
-184	184
-232	232
-105	105
-188	188
-216	216
-255	255
-154	154
-197	197
-279	279
-218	218
-127	127
-203	203
-281	281
-194	194
-161	161
-276	276
-122	122
-139	139
-183	183
-114	114
-247	247
-144	144
-148	148
-174	174
-267	267
-142	142
-168	168
-226	226
-258	258
-231	231
-146	146
-253	253
-189	189
-230	230
-290	290
-178	178
-158	158
-130	130
-214	214
-133	133
-229	229
-294	294
-295	295
-108	108
-112	112
-297	297
-151	151
-251	251
-270	270
-291	291
-159	159
-132	132
-121	121
-244	244
-272	272
-293	293
-186	186
-111	111
-166	166
-201	201
-175	175
-180	180
-209	209
-192	192
-246	246
-195	195
-107	107
-233	233
-239	239
-103	103
-109	109
-128	128
-266	266
-143	143
-160	160
-187	187
-243	243
-273	273
-259	259
-110	110
-176	176
-141	141
-170	170
-215	215
-191	191
-200	200
-271	271
-162	162
-260	260
-106	106
-150	150
-126	126
-147	147
-155	155
-193	193
-207	207
-287	287
-235	235
-252	252
-129	129
-205	205
-268	268
-278	278
-116	116
-137	137
-199	199
-217	217
-234	234
-190	190
-236	236
-257	257
-100	100
-210	210
-212	212
-264	264
-221	221
-241	241
-256	256
-262	262
-265	265
-269	269
-277	277
-173	173
-177	177
-208	208
-219	219
-285	285
-101	101
-164	164
-113	113
-125	125
-202	202
-140	140
-156	156
-282	282
-181	181
-206	206
-299	299
-102	102
-145	145
-227	227
-196	196
-138	138
-198	198
-204	204
-237	237
-171	171
-284	284
-263	263
-292	292
-104	104
-149	149
-250	250
-296	296
-228	228
-280	280
-242	242
-248	248
-185	185
-220	220
-245	245
-275	275
-118	118
-120	120
-152	152
-153	153
-157	157
-182	182
-179	179
-254	254
-288	288
-172	172
-283	283
-286	286
-115	115
-238	238
-289	289
-131	131
-223	223
-134	134
-136	136
-222	222
-225	225
-261	261
-274	274
-123	123
-163	163
-224	224
-117	117
-298	298
-169	169
-124	124
-167	167
-240	240
-249	249
-165	165
-213	213
-connection root1;
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 1 AND t1.k = t2.k LOCK IN SHARE MODE;
-i	i
-209	209
-195	195
-107	107
-233	233
-239	239
-103	103
-109	109
-143	143
-187	187
-243	243
-273	273
-259	259
-141	141
-215	215
-191	191
-271	271
-147	147
-155	155
-193	193
-207	207
-287	287
-235	235
-129	129
-205	205
-137	137
-199	199
-217	217
-257	257
-221	221
-241	241
-265	265
-269	269
-277	277
-173	173
-177	177
-135	135
-119	119
-211	211
-105	105
-255	255
-197	197
-279	279
-127	127
-203	203
-281	281
-161	161
-139	139
-183	183
-247	247
-267	267
-231	231
-253	253
-189	189
-133	133
-229	229
-295	295
-297	297
-151	151
-251	251
-291	291
-159	159
-121	121
-293	293
-111	111
-201	201
-175	175
-185	185
-245	245
-275	275
-153	153
-157	157
-179	179
-283	283
-115	115
-289	289
-131	131
-223	223
-225	225
-261	261
-123	123
-163	163
-117	117
-169	169
-167	167
-249	249
-165	165
-213	213
-219	219
-285	285
-101	101
-113	113
-125	125
-181	181
-299	299
-145	145
-227	227
-237	237
-171	171
-263	263
-149	149
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k % 2 = 1 AND t1.k = t2.k;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result b/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
deleted file mode 100644
index adb89b03480..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
+++ /dev/null
@@ -1,255 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (200);
-CALL fill_t2 (200);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < t1.k % 2 = 0 AND t2.k=t1.k LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	200	Using where
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.k	1	
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < t1.k % 2 = 0 AND t2.k=t1.k LOCK IN SHARE MODE;
-i	i
-135	135
-119	119
-211	211
-184	184
-232	232
-105	105
-188	188
-216	216
-255	255
-154	154
-197	197
-279	279
-218	218
-127	127
-203	203
-281	281
-194	194
-161	161
-276	276
-122	122
-139	139
-183	183
-114	114
-247	247
-144	144
-148	148
-174	174
-267	267
-142	142
-168	168
-226	226
-258	258
-231	231
-146	146
-253	253
-189	189
-230	230
-290	290
-178	178
-158	158
-130	130
-214	214
-133	133
-229	229
-294	294
-295	295
-108	108
-112	112
-297	297
-151	151
-251	251
-270	270
-291	291
-159	159
-132	132
-121	121
-244	244
-272	272
-293	293
-186	186
-111	111
-166	166
-201	201
-175	175
-180	180
-209	209
-192	192
-246	246
-195	195
-107	107
-233	233
-239	239
-103	103
-109	109
-128	128
-266	266
-143	143
-160	160
-187	187
-243	243
-273	273
-259	259
-110	110
-176	176
-141	141
-170	170
-215	215
-191	191
-200	200
-271	271
-162	162
-260	260
-106	106
-150	150
-126	126
-147	147
-155	155
-193	193
-207	207
-287	287
-235	235
-252	252
-129	129
-205	205
-268	268
-278	278
-116	116
-137	137
-199	199
-217	217
-234	234
-190	190
-236	236
-257	257
-100	100
-210	210
-212	212
-264	264
-221	221
-241	241
-256	256
-262	262
-265	265
-269	269
-277	277
-173	173
-177	177
-208	208
-219	219
-285	285
-101	101
-164	164
-113	113
-125	125
-202	202
-140	140
-156	156
-282	282
-181	181
-206	206
-299	299
-102	102
-145	145
-227	227
-196	196
-138	138
-198	198
-204	204
-237	237
-171	171
-284	284
-263	263
-292	292
-104	104
-149	149
-250	250
-296	296
-228	228
-280	280
-242	242
-248	248
-185	185
-220	220
-245	245
-275	275
-118	118
-120	120
-152	152
-153	153
-157	157
-182	182
-179	179
-254	254
-288	288
-172	172
-283	283
-286	286
-115	115
-238	238
-289	289
-131	131
-223	223
-134	134
-136	136
-222	222
-225	225
-261	261
-274	274
-123	123
-163	163
-224	224
-117	117
-298	298
-169	169
-124	124
-167	167
-240	240
-249	249
-165	165
-213	213
-connection root1;
-DELETE FROM t1 WHERE t1.k % 2 = 1;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result b/mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
deleted file mode 100644
index eb69fd2e306..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
+++ /dev/null
@@ -1,148 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE t1 SET l = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	226
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	226
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result b/mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
deleted file mode 100644
index bedb75da93a..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
+++ /dev/null
@@ -1,35 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE t1 SET l = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result b/mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
deleted file mode 100644
index 279f2626c73..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
+++ /dev/null
@@ -1,194 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE v1 SET i=325 where i=125;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-123	123
-123	124
-123	125
-123	126
-124	123
-124	124
-124	125
-124	126
-126	123
-126	124
-126	125
-126	126
-325	123
-325	124
-325	125
-325	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	126	4	126
-connection default;
-UPDATE v1 SET i=323 where i=123;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-124	123
-124	124
-124	125
-124	126
-125	123
-125	124
-125	125
-125	126
-126	123
-126	124
-126	125
-126	126
-323	123
-323	124
-323	125
-323	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE v1 SET i=326 where i=126;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-123	123
-123	124
-123	125
-123	126
-124	123
-124	124
-124	125
-124	126
-325	123
-325	124
-325	125
-325	126
-326	123
-326	124
-326	125
-326	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	326	4	126
-connection default;
-UPDATE v1 SET i=324 where i=124;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-125	123
-125	124
-125	125
-125	126
-126	123
-126	124
-126	125
-126	126
-323	123
-323	124
-323	125
-323	126
-324	123
-324	124
-324	125
-324	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	326	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result b/mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
deleted file mode 100644
index 9e74e93b0cc..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
+++ /dev/null
@@ -1,200 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	
-SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-i
-123
-124
-123
-124
-123
-124
-123
-124
-connection root1;
-UPDATE v1 SET i=325 where i=125;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-123	123
-123	124
-123	125
-123	126
-124	123
-124	124
-124	125
-124	126
-126	123
-126	124
-126	125
-126	126
-325	123
-325	124
-325	125
-325	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	126	4	126
-connection default;
-UPDATE v1 SET i=323 where i=123;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-124	123
-124	124
-124	125
-124	126
-125	123
-125	124
-125	125
-125	126
-126	123
-126	124
-126	125
-126	126
-323	123
-323	124
-323	125
-323	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE v1 SET i=326 where i=126;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-123	123
-123	124
-123	125
-123	126
-124	123
-124	124
-124	125
-124	126
-325	123
-325	124
-325	125
-325	126
-326	123
-326	124
-326	125
-326	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	326	4	126
-connection default;
-UPDATE v1 SET i=324 where i=124;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-125	123
-125	124
-125	125
-125	126
-126	123
-126	124
-126	125
-126	126
-323	123
-323	124
-323	125
-323	126
-324	123
-324	124
-324	125
-324	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	326	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result b/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result
deleted file mode 100644
index b5b1c519702..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result
+++ /dev/null
@@ -1,169 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE v1 SET i=323 where i=123;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-124	123
-124	124
-124	125
-124	126
-125	123
-125	124
-125	125
-125	126
-126	123
-126	124
-126	125
-126	126
-323	123
-323	124
-323	125
-323	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE v1 SET i=324 where i=124;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-125	123
-125	124
-125	125
-125	126
-126	123
-126	124
-126	125
-126	126
-323	123
-323	124
-323	125
-323	126
-324	123
-324	124
-324	125
-324	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result b/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result
deleted file mode 100644
index d92f9ad9664..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result
+++ /dev/null
@@ -1,38 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	
-SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-i
-123
-124
-123
-124
-123
-124
-123
-124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result b/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result
deleted file mode 100644
index e2a2a6e7deb..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result
+++ /dev/null
@@ -1,309 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-DROP PROCEDURE IF EXISTS stp_t;
-SET autocommit=0;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-INSERT INTO t1 VALUES (5,127,5,127);
-INSERT INTO t1 VALUES (6,128,6,128);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-INSERT INTO t2 VALUES (5,127,5,127);
-INSERT INTO t2 VALUES (6,128,6,128);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE PROCEDURE stp_t (IN p1 int, IN p2 int) MODIFIES SQL DATA
-BEGIN
-UPDATE t2 SET i = p2 WHERE i = p1;
-UPDATE v1 SET i = p2 WHERE i = p1;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-CALL stp_t (125, 225);
-i
-123
-124
-126
-127
-128
-225
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-CALL stp_t (127, 227);
-i
-123
-124
-125
-126
-128
-227
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	128	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	128	6	128
-connection default;
-CALL stp_t (123, 223);
-i
-124
-125
-126
-127
-128
-223
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root1;
-CALL stp_t (126, 226);
-i
-123
-124
-127
-128
-225
-226
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-CALL stp_t (128, 228);
-i
-123
-124
-125
-126
-227
-228
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-connection default;
-CALL stp_t (124, 224);
-i
-125
-126
-127
-128
-223
-224
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-DELETE FROM t1 WHERE t1.i=228;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-COMMIT;
-connection root1;
-ROLLBACK;
-connection root1;
-COMMIT;
-connection default;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-127
-128
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root1;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-127
-128
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-223
-227
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-5	227	5	127
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-connection default;
-DROP VIEW v1;
-DROP PROCEDURE stp_t;
-DROP TABLE t1, t2;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result b/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result
deleted file mode 100644
index 6dbd5f834ed..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result
+++ /dev/null
@@ -1,46 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-DROP PROCEDURE IF EXISTS stp_t;
-SET autocommit=0;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-INSERT INTO t1 VALUES (5,127,5,127);
-INSERT INTO t1 VALUES (6,128,6,128);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-INSERT INTO t2 VALUES (5,127,5,127);
-INSERT INTO t2 VALUES (6,128,6,128);
-#CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE PROCEDURE stp_t (IN p1 int, IN p2 int) MODIFIES SQL DATA
-BEGIN
-UPDATE t2 SET i = p2 WHERE i = p1;
-UPDATE v1 SET i = p2 WHERE i = p1;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	6	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-CALL stp_t (125, 225);
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result b/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result
deleted file mode 100644
index f5c745ca41c..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result
+++ /dev/null
@@ -1,180 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE v1 SET i = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM v1 ORDER BY i;
-i
-123
-124
-126
-225
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM v1 ORDER BY i;
-i
-124
-125
-126
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM v1 ORDER BY i;
-i
-123
-124
-225
-226
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-223
-224
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
-DROP VIEW v1;
diff --git a/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result b/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result
deleted file mode 100644
index d6a38753c1d..00000000000
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result
+++ /dev/null
@@ -1,36 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE v1 SET i = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
diff --git a/mysql-test/suite/row_lock/readme.txt b/mysql-test/suite/row_lock/readme.txt
deleted file mode 100644
index b43f04ecda4..00000000000
--- a/mysql-test/suite/row_lock/readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-All row lock test with InnoDB have to be executed with the options
-
---innodb_lock_wait_timeout=1
---innodb_locks_unsafe_for_binlog 
-
-for example
-
-perl mysql-test-run.pl --mysqld=--innodb_lock_wait_timeout=2 --mysqld=--innodb_locks_unsafe_for_binlog --suite=row_lock innodb_row_lock_2
-
diff --git a/mysql-test/suite/row_lock/summary_of_sel_test.txt b/mysql-test/suite/row_lock/summary_of_sel_test.txt
deleted file mode 100644
index 0fa332e957a..00000000000
--- a/mysql-test/suite/row_lock/summary_of_sel_test.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Test plan:
-Create 2 tables with a primary key and 3 integer columns. Both get the same rows (1,123,1,123),(2,124,2,124),(3,125,3,125),(4,126,4,126). The second and third column may get an index to have cases with, without and mutilple index. Create views on the tables. Create an update trigger. Create a stored procedure updating the table. Create a stored function updating the table and deliver the key as result.
-
-The test isself consists of 2 sessions (transactions) running in "parallel" (same user "root") accessing and locking the same tables on basis of a row lock. Expected is that both sessions(transactions) can update the table successfully.
-
-First session
-execute an explain to every select and one of the following selects on the first half of table t1:  
-- select <non index columns> ... where ... for update;
-- select <non index columns> ... where ... lock in share mode;
-- select <indexed columns> ... where ... for update;
-- select <indexed columns> ... where ... lock in share mode;
-- select <indexed columns> ... ignore index ... where ... for update;
-- select <indexed columns> ... ignore index ... where ... lock in share mode;
-- select ... where (select...) ... for update;
-- select ... where (select...) ... lock in share mode;
-- (select ... where) union (select ... where) for update;
-- (select ... where) union (select ... where) lock in...;
-- select <view> ... where ... for update;
-- select <view> ... where ... lock in ...;
-- select <join> ... where ... for update;
-- select <join> ... where ... lock in ...;
-Then executes
-- update
-- delete
-- trigger accessing table t1
-- stored procedure accessing table t1
-- stored function accessing table t1
-
-Second session
-executes the same on the last half of table t1
-
-call of mysqld with option
---innodb_locks_unsafe_for_binlog
-
-As the tests above work with small tables (<10 rows) there must be at least one test with a big table (>1000 rows) doing a table scan.
- 
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_1.test b/mysql-test/suite/row_lock/t/innodb_row_lock_1.test
deleted file mode 100644
index e0440fe2669..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_1.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_2.test b/mysql-test/suite/row_lock/t/innodb_row_lock_2.test
deleted file mode 100644
index 5cb3ea9f2d9..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_2.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-let $indext1= #CREATE INDEX ixi ON t1 (i);
-let $indext2= #CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_3.test b/mysql-test/suite/row_lock/t/innodb_row_lock_3.test
deleted file mode 100644
index 11f4dc423d6..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_3.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-let $indext1= #CREATE INDEX ixi ON t1 (i);
-let $indext2= #CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_4.test b/mysql-test/suite/row_lock/t/innodb_row_lock_4.test
deleted file mode 100644
index 0a8ca9c13a0..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_4.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_5.test b/mysql-test/suite/row_lock/t/innodb_row_lock_5.test
deleted file mode 100644
index 7e411d31649..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_5.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i,t2.i FROM t1 ignore index (ixi),t2 IGNORE INDEX (ixi) WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test b/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test
deleted file mode 100644
index 0c5b8b41bd5..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < half_t1() AND t2.i=t1.i LOCK IN SHARE MODE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_big_tab.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test b/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test
deleted file mode 100644
index a12a07d82a9..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test
+++ /dev/null
@@ -1,10 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $nbrows= 40;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 0 AND t1.k = t2.k LOCK IN SHARE MODE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_big_tab_1.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test b/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test
deleted file mode 100644
index 49e834eb2ce..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test
+++ /dev/null
@@ -1,10 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $nbrows= 40;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 0 AND t1.k = t2.k LOCK IN SHARE MODE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_big_tab_2.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test b/mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test
deleted file mode 100644
index 225513d3f87..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_trig.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test b/mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test
deleted file mode 100644
index 88dee5f23f8..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= #CREATE INDEX ixi ON t1 (i);
-let $indext2= #CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_trig.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test b/mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test
deleted file mode 100644
index d6381e1da5b..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test b/mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test
deleted file mode 100644
index ee45e683669..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test b/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test
deleted file mode 100644
index 49cba88dd23..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_mix.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test b/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test
deleted file mode 100644
index b07f3a3378a..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test
+++ /dev/null
@@ -1,10 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-#let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-let $select= SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_mix.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test b/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test
deleted file mode 100644
index d507ff3296f..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_storedp.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test b/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test
deleted file mode 100644
index a1bfb16055e..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= #CREATE INDEX ixi ON t1 (i);
-let $indext2= #CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_storedp.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test b/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test
deleted file mode 100644
index 24c76532d17..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_trig.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test b/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test
deleted file mode 100644
index a8a67d77979..00000000000
--- a/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_innodb.inc
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-let $engine= InnoDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= #CREATE INDEX ixi ON t1 (i);
-let $indext2= #CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_trig.inc
-SET @@global.innodb_table_locks= @table_locks;
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_1.test b/mysql-test/suite/row_lock/t/ndb_row_lock_1.test
deleted file mode 100644
index 6ac2e829008..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_1.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_2.test b/mysql-test/suite/row_lock/t/ndb_row_lock_2.test
deleted file mode 100644
index 994ecba96b0..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_2.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-let $indext1= #CREATE INDEX ixi ON t1 (i);
-let $indext2= #CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_3.test b/mysql-test/suite/row_lock/t/ndb_row_lock_3.test
deleted file mode 100644
index 2de43c61c2a..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_3.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-let $indext1= #CREATE INDEX ixi ON t1 (i);
-let $indext2= #CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_4.test b/mysql-test/suite/row_lock/t/ndb_row_lock_4.test
deleted file mode 100644
index 72b20488c74..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_4.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_5.test b/mysql-test/suite/row_lock/t/ndb_row_lock_5.test
deleted file mode 100644
index 045f127a4ef..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_5.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i,t2.i FROM t1 ignore index (ixi),t2 IGNORE INDEX (ixi) WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test b/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test
deleted file mode 100644
index bf2df104e03..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < half_t1() AND t2.i=t1.i LOCK IN SHARE MODE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_big_tab.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test b/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test
deleted file mode 100644
index 4d32991d379..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test
+++ /dev/null
@@ -1,7 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $nbrows= 200;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < t1.k % 2 = 0 AND t2.k=t1.k LOCK IN SHARE MODE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_big_tab_1.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test b/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test
deleted file mode 100644
index 894a83fc1b0..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test
+++ /dev/null
@@ -1,7 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $nbrows= 200;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < t1.k % 2 = 0 AND t2.k=t1.k LOCK IN SHARE MODE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_big_tab_2.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test b/mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test
deleted file mode 100644
index a5586a6101e..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_trig.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test b/mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test
deleted file mode 100644
index 7af13697ccc..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= #CREATE INDEX ixi ON t1 (i);
-let $indext2= #CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_trig.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test b/mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test
deleted file mode 100644
index a1aaf5ab441..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test
+++ /dev/null
@@ -1,7 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view.inc
-
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test b/mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test
deleted file mode 100644
index b8feef693e7..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test b/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test
deleted file mode 100644
index a97626048d3..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_mix.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test b/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test
deleted file mode 100644
index e7a9a715785..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_mix.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test b/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test
deleted file mode 100644
index f57bcb3dd1b..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_storedp.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test b/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test
deleted file mode 100644
index b0aaa38fb93..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= #CREATE INDEX ixi ON t1 (i);
-let $indext2= #CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_storedp.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test b/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test
deleted file mode 100644
index 9c4128d78bf..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= CREATE INDEX ixi ON t1 (i);
-let $indext2= CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_trig.inc
diff --git a/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test b/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test
deleted file mode 100644
index 38c9472fb3d..00000000000
--- a/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test
+++ /dev/null
@@ -1,6 +0,0 @@
---source include/have_ndb.inc
-let $engine= NDB;
-let $select= SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE; 
-let $indext1= #CREATE INDEX ixi ON t1 (i);
-let $indext2= #CREATE INDEX ixi ON t2 (i);
---source suite/row_lock/include/row_lock_view_trig.inc

From c7150fd814603bb12a686ea0857296b92282de1b Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Thu, 26 Jul 2007 18:33:05 +0300
Subject: [PATCH 064/139] Bug #30036: SHOW TABLE TYPES causes the debug client
 to crash

SHOW TABLE TYPES is a (to be deprecated) synonym for
SHOW STORAGE ENGINES.
Fixed to use the right schema table in addition to
issuing a warning.


mysql-test/r/show_check.result:
  Bug #30036: test case
mysql-test/t/show_check.test:
  Bug #30036: test case
sql/sql_yacc.yy:
  Bug #30036: use the right schema table
---
 mysql-test/r/show_check.result | 1 +
 mysql-test/t/show_check.test   | 8 ++++++++
 sql/sql_yacc.yy                | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 2bdd29602fb..83881be8ad4 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1351,4 +1351,5 @@ DROP PROCEDURE p1;
 DROP FUNCTION f1;
 DROP TABLE t1;
 DROP EVENT ev1;
+SHOW TABLE TYPES;
 End of 5.1 tests
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 09c0b08a3cd..f2dba49f455 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -977,4 +977,12 @@ DROP FUNCTION f1;
 DROP TABLE t1;
 DROP EVENT ev1;
 
+#
+# Bug #30036: SHOW TABLE TYPES causes the debug client to crash
+#
+--disable_result_log
+SHOW TABLE TYPES;
+--enable_result_log
+
+
 --echo End of 5.1 tests
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index d9a808bf8f7..468c3305c57 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -8729,6 +8729,8 @@ show_param:
 	    LEX *lex=Lex;
 	    lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
 	    WARN_DEPRECATED(yythd, "5.2", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
+            if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES))
+              MYSQL_YYABORT;
 	  }
 	| opt_storage ENGINES_SYM
 	  {

From 1336b0eb1371868c3e6596565cbe35978dfa6140 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Thu, 26 Jul 2007 20:05:01 +0400
Subject: [PATCH 065/139] Fix for BUG#30029: mysql_upgrade fails for 5.0 ->
 5.1.21, 5.1.20 -> 5.1.21 upgrades.

We generate mysql_fix_privilege.sql file, which contains SQL
statements required to upgrade the system database. This script
is generated by concatenation of mysql_system_tables.sql and
mysql_system_tables_fix.sql.

The problem was that
  - in order to create general_log and slow_log tables we use
    stored programs in mysql_system_tables.sql;
  - we upgrade mysql.proc table in mysql_system_tables_fix.sql;

So, if mysql.proc table needs to be upgraded, stored procedures
can not be used in mysql_system_tables.sql.

In other words, in mysql_system_tables.sql stored programs must
not be used because they may be unavailable at this point.

The fix is to use dynamic SQL instead of stored programs.

There is no test case for this bug because our test suite
is not suitable for such test cases. system_mysql_db_fix* test
cases play with the database "test". Here we need to modify
the system database and we can not do that in the test suite.


scripts/mysql_system_tables.sql:
  Use dynamic SQL instead of stored programs.
---
 scripts/mysql_system_tables.sql | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index f46c7c7027a..cd0882e3af4 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -63,16 +63,21 @@ CREATE TABLE IF NOT EXISTS proc (db char(64) collate utf8_bin DEFAULT '' NOT NUL
 
 CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Routine_name char(64) binary DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp(14), PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin   comment='Procedure privileges';
 
+-- Create general_log if CSV is enabled.
 
-delimiter ;;
-CREATE PROCEDURE create_general_log_table() BEGIN DECLARE is_csv_enabled int DEFAULT 0; SELECT @@have_csv = 'YES' INTO is_csv_enabled; IF (is_csv_enabled) THEN CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT, thread_id INTEGER, server_id INTEGER, command_type VARCHAR(64), argument MEDIUMTEXT) engine=CSV CHARACTER SET utf8 comment='General log'; END IF; END;;
-CALL create_general_log_table();;
-DROP PROCEDURE create_general_log_table;;
+SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT, thread_id INTEGER, server_id INTEGER, command_type VARCHAR(64), argument MEDIUMTEXT) engine=CSV CHARACTER SET utf8 comment="General log"', 'SET @dummy = 0');
 
-CREATE PROCEDURE create_slow_log_table() BEGIN DECLARE is_csv_enabled int DEFAULT 0; SELECT @@have_csv = 'YES' INTO is_csv_enabled; IF (is_csv_enabled) THEN CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512), last_insert_id INTEGER, insert_id INTEGER, server_id INTEGER, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment='Slow log'; END IF; END;;
-CALL create_slow_log_table();;
-DROP PROCEDURE create_slow_log_table;;
-delimiter ;
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
+-- Create slow_log if CSV is enabled.
+
+SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512), last_insert_id INTEGER, insert_id INTEGER, server_id INTEGER, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="Slow log"', 'SET @dummy = 0');
+
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
 
 CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', name char(64) CHARACTER SET utf8 NOT NULL default '', body longblob NOT NULL, definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL, modified TIMESTAMP NOT NULL, last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode  set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', originator int(10) NOT NULL, time_zone char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM', character_set_client char(32) collate utf8_bin, collation_connection char(32) collate utf8_bin, db_collation char(32) collate utf8_bin, body_utf8 longblob, PRIMARY KEY (db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
 

From 9206f6847742a208500da660a2e76306e3fadae3 Mon Sep 17 00:00:00 2001
From: unknown <sergefp@mysql.com>
Date: Thu, 26 Jul 2007 20:52:53 +0400
Subject: [PATCH 066/139] BUG#28591: make the fix work for BDB tables too:  -
 make ha_berkeley::cmp_ref() take into account that auto-generated PKs    are
 stored in LSB-first order.  - Remove the temporary code that made the bugfix
 work for innodb only

mysql-test/r/bdb.result:
  Adjust test-results.
sql/ha_berkeley.cc:
  BUG#28591: make the fix work for BDB tables too:
   - make ha_berkeley::cmp_ref() take into account that auto-generated PKs
     are stored in LSB-first order.
sql/sql_select.cc:
  BUG#28591: Remove "innodb only" clause as the fix now works for BDB too
sql/table.cc:
  BUG#28591: Remove "innodb only" clause as the fix now works for BDB too
---
 mysql-test/r/bdb.result | 2 +-
 sql/ha_berkeley.cc      | 6 +++++-
 sql/sql_select.cc       | 1 -
 sql/table.cc            | 3 +--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result
index 91c385112b4..3356d23053f 100644
--- a/mysql-test/r/bdb.result
+++ b/mysql-test/r/bdb.result
@@ -136,8 +136,8 @@ update ignore t1 set id=1023 where id=1010;
 select * from t1 where parent_id=102 order by parent_id,id;
 id	parent_id	level
 1008	102	2
-1010	102	2
 1015	102	2
+1010	102	2
 explain select level from t1 where level=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	level	level	1	const	X	Using index
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 2a5fe775ca6..fbfd5031656 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -2646,7 +2646,11 @@ ha_rows ha_berkeley::estimate_rows_upper_bound()
 int ha_berkeley::cmp_ref(const byte *ref1, const byte *ref2)
 {
   if (hidden_primary_key)
-    return memcmp(ref1, ref2, BDB_HIDDEN_PRIMARY_KEY_LENGTH);
+  {
+    ulonglong a=uint5korr((char*) ref1);
+    ulonglong b=uint5korr((char*) ref2);
+    return  a < b ? -1 : (a > b ? 1 : 0);
+  }
 
   int result;
   Field *field;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 2d9d261bb31..d82a0fdcf41 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -12033,7 +12033,6 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
       */
       if (!on_primary_key &&
           (table->file->table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
-          table->s->db_type == DB_TYPE_INNODB &&
           table->s->primary_key != MAX_KEY)
       {
         on_primary_key= TRUE;
diff --git a/sql/table.cc b/sql/table.cc
index ce894e6910f..18a395d69af 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -782,8 +782,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
 	    if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX)
             {
 	      field->part_of_key= share->keys_in_use;
-              if (share->db_type == DB_TYPE_INNODB && 
-                  field->part_of_sortkey.is_set(key))
+              if (field->part_of_sortkey.is_set(key))
                 field->part_of_sortkey= share->keys_in_use;
             }
 	  }

From 9eaf0ae73edbb8ed5587c33d2513de69fcdefc45 Mon Sep 17 00:00:00 2001
From: unknown <dkatz@damien-katzs-computer.local>
Date: Thu, 26 Jul 2007 23:39:53 -0400
Subject: [PATCH 067/139] Bug #25061 Build failure on HP/UX similar to
 BUG#20507

Added libCsup as a mysql library dependency on hpux11.

This means any projects statically linking to our libraries using the HPUX11 compiler will need to add the -lCSup option to their build link options. If they use the mysql_config tool this will happen automatically.

Projects that dynamically link to libmysqlclient will continue to work without any modifications.

Library libCsup is a C++ runtime library needed for yassl support when built with the hpux11 C/C++ compiler. The first attempts to fix this bug were to remove the yassl dependencies on libCsup. We tried removing all pure virtual functions and other hacks, but the dependency remained. The only other options left involve extensive restructuring of the yassl library.



config/ac-macros/yassl.m4:
  Added libCsup as a mysql library dependency on hpux11 when building yassl.
---
 config/ac-macros/yassl.m4           |  9 +++++++
 mysql-test/r/bdb_notembedded.result | 35 --------------------------
 mysql-test/t/bdb_notembedded.test   | 38 -----------------------------
 3 files changed, 9 insertions(+), 73 deletions(-)
 delete mode 100644 mysql-test/r/bdb_notembedded.result
 delete mode 100644 mysql-test/t/bdb_notembedded.test

diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4
index 967dcbf764a..26c2315b532 100644
--- a/config/ac-macros/yassl.m4
+++ b/config/ac-macros/yassl.m4
@@ -31,6 +31,15 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
         AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/])
         ;;
     esac
+    case $SYSTEM_TYPE in
+      *hpux11*)
+      if test "$ac_cv_prog_gcc" = "no"
+      then
+        # yass compiled with the HPUX 11.0 compiler requires a special lib
+        NON_THREADED_LIBS="$NON_THREADED_LIBS -lCsup"
+      fi
+        ;;
+    esac
     AC_SUBST([yassl_taocrypt_extra_cxxflags])
     # Link extra/yassl/include/openssl subdir to include/
     yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl"
diff --git a/mysql-test/r/bdb_notembedded.result b/mysql-test/r/bdb_notembedded.result
deleted file mode 100644
index 14cb5fad915..00000000000
--- a/mysql-test/r/bdb_notembedded.result
+++ /dev/null
@@ -1,35 +0,0 @@
-set autocommit=1;
-reset master;
-create table bug16206 (a int);
-insert into bug16206 values(1);
-start transaction;
-insert into bug16206 values(2);
-commit;
-show binlog events;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4
-f	n	Query	1	n	use `test`; create table bug16206 (a int)
-f	n	Query	1	n	use `test`; insert into bug16206 values(1)
-f	n	Query	1	n	use `test`; insert into bug16206 values(2)
-drop table bug16206;
-reset master;
-create table bug16206 (a int) engine=         bdb;
-insert into bug16206 values(0);
-insert into bug16206 values(1);
-start transaction;
-insert into bug16206 values(2);
-commit;
-insert into bug16206 values(3);
-show binlog events;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4
-f	n	Query	1	n	use `test`; create table bug16206 (a int) engine=         bdb
-f	n	Query	1	n	use `test`; insert into bug16206 values(0)
-f	n	Query	1	n	use `test`; insert into bug16206 values(1)
-f	n	Query	1	n	use `test`; BEGIN
-f	n	Query	1	n	use `test`; insert into bug16206 values(2)
-f	n	Query	1	n	use `test`; COMMIT
-f	n	Query	1	n	use `test`; insert into bug16206 values(3)
-drop table bug16206;
-set autocommit=0;
-End of 5.0 tests
diff --git a/mysql-test/t/bdb_notembedded.test b/mysql-test/t/bdb_notembedded.test
deleted file mode 100644
index 24e64ebbfb2..00000000000
--- a/mysql-test/t/bdb_notembedded.test
+++ /dev/null
@@ -1,38 +0,0 @@
--- source include/not_embedded.inc
--- source include/have_bdb.inc
-
-#
-# Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit mode
-#
-set autocommit=1;
-
-let $VERSION=`select version()`;
-
-reset master;
-create table bug16206 (a int);
-insert into bug16206 values(1);
-start transaction;
-insert into bug16206 values(2);
-commit;
---replace_result $VERSION VERSION
---replace_column 1 f 2 n 5 n
-show binlog events;
-drop table bug16206;
-
-reset master;
-create table bug16206 (a int) engine=         bdb;
-insert into bug16206 values(0);
-insert into bug16206 values(1);
-start transaction;
-insert into bug16206 values(2);
-commit;
-insert into bug16206 values(3);
---replace_result $VERSION VERSION
---replace_column 1 f 2 n 5 n
-show binlog events;
-drop table bug16206;
-
-set autocommit=0;
-
-
---echo End of 5.0 tests

From 4462578a1cde5b772a253a532cad3b9113eaf7f8 Mon Sep 17 00:00:00 2001
From: unknown <malff/marcsql@weblab.(none)>
Date: Fri, 27 Jul 2007 00:31:06 -0600
Subject: [PATCH 068/139] WL#3984 (Revise locking of mysql.general_log and
 mysql.slow_log) Bug#25422 (Hang with log tables) Bug 17876 (Truncating
 mysql.slow_log in a SP after using cursor locks the           thread) Bug
 23044 (Warnings on flush of a log table) Bug 29129 (Resetting general_log
 while the GLOBAL READ LOCK is set causes            a deadlock)

Prior to this fix, the server would hang when performing concurrent
ALTER TABLE or TRUNCATE TABLE statements against the LOG TABLES,
which are mysql.general_log and mysql.slow_log.

The root cause traces to the following code:
in sql_base.cc, open_table()
  if (table->in_use != thd)
  {
    /* wait_for_condition will unlock LOCK_open for us */
    wait_for_condition(thd, &LOCK_open, &COND_refresh);
  }
The problem with this code is that the current implementation of the
LOGGER creates 'fake' THD objects, like
- Log_to_csv_event_handler::general_log_thd
- Log_to_csv_event_handler::slow_log_thd
which are not associated to a real thread running in the server,
so that waiting for these non-existing threads to release table locks
cause the dead lock.

In general, the design of Log_to_csv_event_handler does not fit into the
general architecture of the server, so that the concept of general_log_thd
and slow_log_thd has to be abandoned:
- this implementation does not work with table locking
- it will not work with commands like SHOW PROCESSLIST
- having the log tables always opened does not integrate well with DDL
operations / FLUSH TABLES / SET GLOBAL READ_ONLY

With this patch, the fundamental design of the LOGGER has been changed to:
- always open and close a log table when writing a log
- remove totally the usage of fake THD objects
- clarify how locking of log tables is implemented in general.

See WL#3984 for details related to the new locking design.

Additional changes (misc bugs exposed and fixed):

1)

mysqldump which would ignore some tables in dump_all_tables_in_db(),
 but forget to ignore the same in dump_all_views_in_db().

2)

mysqldump would also issue an empty "LOCK TABLE" command when all the tables
to lock are to be ignored (numrows == 0), instead of not issuing the query.

3)

Internal errors handlers could intercept errors but not warnings
(see sql_error.cc).

4)

Implementing a nested call to open tables, for the performance schema tables,
exposed an existing bug in remove_table_from_cache(), which would perform:
  in_use->some_tables_deleted=1;
against another thread, without any consideration about thread locking.
This call inside remove_table_from_cache() was not required anyway,
since calling mysql_lock_abort() takes care of aborting -- cleanly -- threads
that might hold a lock on a table.
This line (in_use->some_tables_deleted=1) has been removed.


sql/handler.cc:
  Moved logic for system / log tables in the SQL layer.
sql/handler.h:
  Moved logic for system / log tables in the SQL layer.
sql/lock.cc:
  Revised locking of log tables
sql/log.cc:
  Major cleanup: changed how log tables are locked / written to.
sql/log.h:
  Major cleanup: changed how log tables are locked / written to.
sql/mysql_priv.h:
  performance schema helpers
sql/slave.cc:
  open_ltable() lock flags
sql/sp.cc:
  open_ltable() lock flags
sql/sql_acl.cc:
  open_ltable() lock flags
sql/sql_class.h:
  performance schema helpers
sql/sql_delete.cc:
  log tables cleanup in TRUNCATE
sql/sql_error.cc:
  Internal handlers can also intercept warnings
sql/sql_insert.cc:
  open_ltable() lock flags
sql/sql_parse.cc:
  performance schema helpers
sql/sql_plugin.cc:
  open_ltable() lock flags
sql/sql_rename.cc:
  log tables cleanup in RENAME
sql/sql_servers.cc:
  open_ltable() lock flags
sql/sql_show.cc:
  Move INFORMATION_SCHEMA_NAME to table.cc
sql/sql_table.cc:
  log tables cleanup (admin operations, ALTER TABLE)
sql/sql_udf.cc:
  open_ltable() lock flags
sql/table.cc:
  Implemented TABLE_CATEGORY.
sql/share/errmsg.txt:
  Changed the wording and name of ER_CANT_READ_LOCK_LOG_TABLE
sql/table.h:
  Implemented TABLE_CATEGORY.
storage/csv/ha_tina.cc:
  Moved logic for system / log tables in the SQL layer.
storage/csv/ha_tina.h:
  Moved logic for system / log tables in the SQL layer.
storage/myisam/ha_myisam.cc:
  Moved logic for system / log tables in the SQL layer.
storage/myisam/ha_myisam.h:
  Moved logic for system / log tables in the SQL layer.
client/mysqldump.c:
  Don't lock tables in the ignore list.
  Don't issue empty LOCK TABLES queries.
sql/sql_base.cc:
  log tables cleanup
  performance schema helpers
mysql-test/r/ps.result:
  Adjust test results
mysql-test/r/show_check.result:
  Adjust test results
mysql-test/r/status.result:
  Adjust test results
mysql-test/t/log_state.test:
  Added tests for Bug#29129
mysql-test/t/ps.test:
  Make the test output deterministic
mysql-test/t/show_check.test:
  Make the test output deterministic
mysql-test/r/log_state.result:
  Changed the default location of the log output to LOG_FILE,
  for backward compatibility with MySQL 5.0
  ---
  Adjust test results
mysql-test/r/log_tables.result:
  cleanup for -ps-protocol
mysql-test/t/log_tables.test:
  cleanup for -ps-protocol
sql/set_var.cc:
  Changed the default location of the log output to LOG_FILE,
  for backward compatibility with MySQL 5.0
  ---
  log tables cleanup
---
 client/mysqldump.c             |  25 +-
 mysql-test/r/log_state.result  |  24 +-
 mysql-test/r/log_tables.result | 297 +++++++++++--
 mysql-test/r/ps.result         |  54 ++-
 mysql-test/r/show_check.result |  31 +-
 mysql-test/r/status.result     |  12 +-
 mysql-test/t/log_state.test    |  53 +++
 mysql-test/t/log_tables.test   | 410 ++++++++++++++----
 mysql-test/t/ps.test           |   7 +
 mysql-test/t/show_check.test   |   7 +
 sql/handler.cc                 |  40 +-
 sql/handler.h                  |  39 +-
 sql/lock.cc                    |  76 +++-
 sql/log.cc                     | 732 +++++++++++++--------------------
 sql/log.h                      |  93 +----
 sql/mysql_priv.h               |  14 +-
 sql/set_var.cc                 |  28 +-
 sql/share/errmsg.txt           |   4 +-
 sql/slave.cc                   |   2 +-
 sql/sp.cc                      |   2 +-
 sql/sql_acl.cc                 |   2 +-
 sql/sql_base.cc                | 130 ++++--
 sql/sql_class.h                |   1 +
 sql/sql_delete.cc              |  22 -
 sql/sql_error.cc               |   3 +
 sql/sql_insert.cc              |   2 +-
 sql/sql_parse.cc               |  29 +-
 sql/sql_plugin.cc              |   4 +-
 sql/sql_rename.cc              |  20 -
 sql/sql_servers.cc             |   6 +-
 sql/sql_show.cc                |   3 -
 sql/sql_table.cc               |  49 +--
 sql/sql_udf.cc                 |   4 +-
 sql/table.cc                   |  80 +++-
 sql/table.h                    | 120 +++++-
 storage/csv/ha_tina.cc         |  12 -
 storage/csv/ha_tina.h          |   5 -
 storage/myisam/ha_myisam.cc    |  36 +-
 storage/myisam/ha_myisam.h     |   5 -
 39 files changed, 1490 insertions(+), 993 deletions(-)

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 0f30ebddacc..b77549df781 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -3726,11 +3726,12 @@ static int dump_all_tables_in_db(char *database)
   {
     DYNAMIC_STRING query;
     init_dynamic_string_checked(&query, "LOCK TABLES ", 256, 1024);
-    for (numrows= 0 ; (table= getTableName(1)) ; numrows++)
+    for (numrows= 0 ; (table= getTableName(1)) ; )
     {
       char *end= strmov(afterdot, table);
       if (include_table(hash_key,end - hash_key))
       {
+        numrows++;
         dynstr_append_checked(&query, quote_name(table, table_buff, 1));
         dynstr_append_checked(&query, " READ /*!32311 LOCAL */,");
       }
@@ -3804,6 +3805,11 @@ static my_bool dump_all_views_in_db(char *database)
   char *table;
   uint numrows;
   char table_buff[NAME_LEN*2+3];
+  char hash_key[2*NAME_LEN+2];  /* "db.tablename" */
+  char *afterdot;
+
+  afterdot= strmov(hash_key, database);
+  *afterdot++= '.';
 
   if (init_dumping(database, init_dumping_views))
     return 1;
@@ -3813,10 +3819,15 @@ static my_bool dump_all_views_in_db(char *database)
   {
     DYNAMIC_STRING query;
     init_dynamic_string_checked(&query, "LOCK TABLES ", 256, 1024);
-    for (numrows= 0 ; (table= getTableName(1)); numrows++)
+    for (numrows= 0 ; (table= getTableName(1)); )
     {
-      dynstr_append_checked(&query, quote_name(table, table_buff, 1));
-      dynstr_append_checked(&query, " READ /*!32311 LOCAL */,");
+      char *end= strmov(afterdot, table);
+      if (include_table(hash_key,end - hash_key))
+      {
+        numrows++;
+        dynstr_append_checked(&query, quote_name(table, table_buff, 1));
+        dynstr_append_checked(&query, " READ /*!32311 LOCAL */,");
+      }
     }
     if (numrows && mysql_real_query(mysql, query.str, query.length-1))
       DB_error(mysql, "when using LOCK TABLES");
@@ -3830,7 +3841,11 @@ static my_bool dump_all_views_in_db(char *database)
            /* We shall continue here, if --force was given */
   }
   while ((table= getTableName(0)))
-     get_view_structure(table, database);
+  {
+    char *end= strmov(afterdot, table);
+    if (include_table(hash_key, end - hash_key))
+      get_view_structure(table, database);
+  }
   if (opt_xml)
   {
     fputs("</database>\n", md_result_file);
diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result
index 946797aeec7..0c6be16b9b7 100644
--- a/mysql-test/r/log_state.result
+++ b/mysql-test/r/log_state.result
@@ -131,7 +131,7 @@ set global general_log=ON;
 set global log_output=default;
 show variables like 'log_output';
 Variable_name	Value
-log_output	TABLE
+log_output	FILE
 set global general_log=OFF;
 set global log_output=FILE;
 truncate table mysql.general_log;
@@ -153,3 +153,25 @@ select * from mysql.general_log;
 event_time	user_host	thread_id	server_id	command_type	argument
 TIMESTAMP	USER_HOST	#	1	Query	drop table t1
 TIMESTAMP	USER_HOST	#	1	Query	select * from mysql.general_log
+SET @old_general_log_state = @@global.general_log;
+SET @old_slow_log_state = @@global.slow_query_log;
+SET GLOBAL general_log = ON;
+SET GLOBAL slow_query_log = ON;
+FLUSH TABLES WITH READ LOCK;
+SET GLOBAL general_log = OFF;
+SET GLOBAL slow_query_log = OFF;
+UNLOCK TABLES;
+FLUSH TABLES WITH READ LOCK;
+SET GLOBAL general_log = ON;
+SET GLOBAL slow_query_log = ON;
+UNLOCK TABLES;
+SET GLOBAL READ_ONLY = ON;
+SET GLOBAL general_log = OFF;
+SET GLOBAL slow_query_log = OFF;
+SET GLOBAL READ_ONLY = OFF;
+SET GLOBAL READ_ONLY = ON;
+SET GLOBAL general_log = ON;
+SET GLOBAL slow_query_log = ON;
+SET GLOBAL READ_ONLY = OFF;
+SET GLOBAL general_log = @old_general_log_state;
+SET GLOBAL slow_query_log = @old_slow_log_state;
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index ce3dabe3a56..39349183276 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -29,30 +29,83 @@ on (mysql.general_log.command_type = join_test.command_type)
 drop table join_test;
 flush logs;
 lock tables mysql.general_log WRITE;
-ERROR HY000: You can't write-lock a log table. Only read access is possible
+ERROR HY000: You can't use locks with log tables.
 lock tables mysql.slow_log WRITE;
-ERROR HY000: You can't write-lock a log table. Only read access is possible
+ERROR HY000: You can't use locks with log tables.
 lock tables mysql.general_log READ;
-ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead
+ERROR HY000: You can't use locks with log tables.
 lock tables mysql.slow_log READ;
-ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead
+ERROR HY000: You can't use locks with log tables.
 lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL;
-unlock tables;
-lock tables mysql.general_log READ LOCAL;
+ERROR HY000: You can't use locks with log tables.
+show create table mysql.general_log;
+Table	Create Table
+general_log	CREATE TABLE `general_log` (
+  `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `user_host` mediumtext,
+  `thread_id` int(11) DEFAULT NULL,
+  `server_id` int(11) DEFAULT NULL,
+  `command_type` varchar(64) DEFAULT NULL,
+  `argument` mediumtext
+) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
+show fields from mysql.general_log;
+Field	Type	Null	Key	Default	Extra
+event_time	timestamp	NO		CURRENT_TIMESTAMP	
+user_host	mediumtext	YES		NULL	
+thread_id	int(11)	YES		NULL	
+server_id	int(11)	YES		NULL	
+command_type	varchar(64)	YES		NULL	
+argument	mediumtext	YES		NULL	
+show create table mysql.slow_log;
+Table	Create Table
+slow_log	CREATE TABLE `slow_log` (
+  `start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `user_host` mediumtext NOT NULL,
+  `query_time` time NOT NULL,
+  `lock_time` time NOT NULL,
+  `rows_sent` int(11) NOT NULL,
+  `rows_examined` int(11) NOT NULL,
+  `db` varchar(512) DEFAULT NULL,
+  `last_insert_id` int(11) DEFAULT NULL,
+  `insert_id` int(11) DEFAULT NULL,
+  `server_id` int(11) DEFAULT NULL,
+  `sql_text` mediumtext NOT NULL
+) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
+show fields from mysql.slow_log;
+Field	Type	Null	Key	Default	Extra
+start_time	timestamp	NO		CURRENT_TIMESTAMP	
+user_host	mediumtext	NO			
+query_time	time	NO			
+lock_time	time	NO			
+rows_sent	int(11)	NO			
+rows_examined	int(11)	NO			
+db	varchar(512)	YES		NULL	
+last_insert_id	int(11)	YES		NULL	
+insert_id	int(11)	YES		NULL	
+server_id	int(11)	YES		NULL	
+sql_text	mediumtext	NO			
 flush logs;
-unlock tables;
-select "Mark that we woke up from flush logs in the test"
-       as "test passed";
-test passed
-Mark that we woke up from flush logs in the test
-lock tables mysql.general_log READ LOCAL;
-truncate mysql.general_log;
-unlock tables;
-select "Mark that we woke up from TRUNCATE in the test"
-       as "test passed";
-test passed
-Mark that we woke up from TRUNCATE in the test
-use test;
+flush tables;
+SET GLOBAL GENERAL_LOG=ON;
+SET GLOBAL SLOW_QUERY_LOG=ON;
+show open tables;
+Database	Table	In_use	Name_locked
+mysql	general_log	0	0
+flush logs;
+show open tables;
+Database	Table	In_use	Name_locked
+mysql	general_log	0	0
+flush tables;
+show open tables;
+Database	Table	In_use	Name_locked
+mysql	general_log	0	0
+SET GLOBAL GENERAL_LOG=OFF;
+SET GLOBAL SLOW_QUERY_LOG=OFF;
+flush tables;
+show open tables;
+Database	Table	In_use	Name_locked
+SET GLOBAL GENERAL_LOG=ON;
+SET GLOBAL SLOW_QUERY_LOG=ON;
 truncate table mysql.general_log;
 set names utf8;
 create table bug16905 (s char(15) character set utf8 default 'пу�то');
@@ -71,7 +124,7 @@ sleep(2)
 0
 select * from mysql.slow_log;
 start_time	user_host	query_time	lock_time	rows_sent	rows_examined	db	last_insert_id	insert_id	server_id	sql_text
-TIMESTAMP	USER_HOST	QUERY_TIME	00:00:00	1	0	test	0	0	1	select sleep(2)
+TIMESTAMP	USER_HOST	QUERY_TIME	00:00:00	1	0	mysql	0	0	1	select sleep(2)
 alter table mysql.general_log engine=myisam;
 ERROR HY000: You cannot 'ALTER' a log table if logging is enabled
 alter table mysql.slow_log engine=myisam;
@@ -158,15 +211,13 @@ TIMESTAMP	USER_HOST	THREAD_ID	1	Query	set global slow_query_log='ON'
 TIMESTAMP	USER_HOST	THREAD_ID	1	Query	select * from mysql.general_log
 flush logs;
 lock tables mysql.general_log WRITE;
-ERROR HY000: You can't write-lock a log table. Only read access is possible
+ERROR HY000: You can't use locks with log tables.
 lock tables mysql.slow_log WRITE;
-ERROR HY000: You can't write-lock a log table. Only read access is possible
+ERROR HY000: You can't use locks with log tables.
 lock tables mysql.general_log READ;
-ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead
+ERROR HY000: You can't use locks with log tables.
 lock tables mysql.slow_log READ;
-ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead
-lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL;
-unlock tables;
+ERROR HY000: You can't use locks with log tables.
 set global general_log='OFF';
 set global slow_query_log='OFF';
 set @save_storage_engine= @@session.storage_engine;
@@ -217,6 +268,7 @@ flush tables with read lock;
 unlock tables;
 use mysql;
 lock tables general_log read local, help_category read local;
+ERROR HY000: You can't use locks with log tables.
 unlock tables;
 use mysql;
 RENAME TABLE general_log TO renamed_general_log;
@@ -258,9 +310,9 @@ RENAME TABLE general_log TO general_log2;
 set global slow_query_log='OFF';
 RENAME TABLE slow_log TO slow_log2;
 set global general_log='ON';
-ERROR HY000: Cannot activate 'general' log
+ERROR 42S02: Table 'mysql.general_log' doesn't exist
 set global slow_query_log='ON';
-ERROR HY000: Cannot activate 'slow query' log
+ERROR 42S02: Table 'mysql.slow_log' doesn't exist
 RENAME TABLE general_log2 TO general_log;
 RENAME TABLE slow_log2 TO slow_log;
 set global general_log='ON';
@@ -355,3 +407,192 @@ SET SESSION long_query_time =@old_long_query_time;
 FLUSH LOGS;
 ALTER TABLE mysql.slow_log DROP COLUMN seq;
 ALTER TABLE mysql.slow_log ENGINE = CSV;
+drop procedure if exists proc25422_truncate_slow;
+drop procedure if exists proc25422_truncate_general;
+drop procedure if exists proc25422_alter_slow;
+drop procedure if exists proc25422_alter_general;
+use test//
+create procedure proc25422_truncate_slow (loops int)
+begin
+declare v1 int default 0;
+while v1 < loops do
+truncate mysql.slow_log;
+set v1 = v1 + 1;
+end while;
+end//
+create procedure proc25422_truncate_general (loops int)
+begin
+declare v1 int default 0;
+while v1 < loops do
+truncate mysql.general_log;
+set v1 = v1 + 1;
+end while;
+end//
+create procedure proc25422_alter_slow (loops int)
+begin
+declare v1 int default 0;
+declare ER_BAD_LOG_STATEMENT condition for 1575;
+declare continue handler for ER_BAD_LOG_STATEMENT begin end;
+while v1 < loops do
+set @old_log_state = @@global.slow_query_log;
+set global slow_query_log = 'OFF';
+alter table mysql.slow_log engine = CSV;
+set global slow_query_log = @old_log_state;
+set v1 = v1 + 1;
+end while;
+end//
+create procedure proc25422_alter_general (loops int)
+begin
+declare v1 int default 0;
+declare ER_BAD_LOG_STATEMENT condition for 1575;
+declare continue handler for ER_BAD_LOG_STATEMENT begin end;
+while v1 < loops do
+set @old_log_state = @@global.general_log;
+set global general_log = 'OFF';
+alter table mysql.general_log engine = CSV;
+set global general_log = @old_log_state;
+set v1 = v1 + 1;
+end while;
+end//
+"Serial test (proc25422_truncate_slow)"
+call proc25422_truncate_slow(100);
+"Serial test (proc25422_truncate_general)"
+call proc25422_truncate_general(100);
+"Serial test (proc25422_alter_slow)"
+call proc25422_alter_slow(100);
+"Serial test (proc25422_alter_general)"
+call proc25422_alter_general(100);
+"Parallel test"
+call proc25422_truncate_slow(100);
+call proc25422_truncate_slow(100);
+call proc25422_truncate_general(100);
+call proc25422_truncate_general(100);
+call proc25422_alter_slow(100);
+call proc25422_alter_slow(100);
+call proc25422_alter_general(100);
+call proc25422_alter_general(100);
+drop procedure proc25422_truncate_slow;
+drop procedure proc25422_truncate_general;
+drop procedure proc25422_alter_slow;
+drop procedure proc25422_alter_general;
+FLUSH TABLE mysql.general_log;
+show warnings;
+Level	Code	Message
+FLUSH TABLE mysql.slow_log;
+show warnings;
+Level	Code	Message
+DROP TABLE IF EXISTS `db_17876.slow_log_data`;
+DROP TABLE IF EXISTS `db_17876.general_log_data`;
+DROP PROCEDURE IF EXISTS `db_17876.archiveSlowLog`;
+DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`;
+DROP DATABASE IF EXISTS `db_17876`;
+CREATE DATABASE db_17876;
+CREATE TABLE `db_17876.slow_log_data` (
+`start_time` timestamp  default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+`user_host` mediumtext ,
+`query_time` time ,
+`lock_time` time ,
+`rows_sent` int(11) ,
+`rows_examined` int(11) ,
+`db` varchar(512) default NULL,
+`last_insert_id` int(11) default NULL,
+`insert_id` int(11) default NULL,
+`server_id` int(11) default NULL,
+`sql_text` mediumtext 
+);
+CREATE TABLE `db_17876.general_log_data` (
+`event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+`user_host` mediumtext,
+`thread_id` int(11) DEFAULT NULL,
+`server_id` int(11) DEFAULT NULL,
+`command_type` varchar(64) DEFAULT NULL,
+`argument` mediumtext
+);
+CREATE procedure `db_17876.archiveSlowLog`()
+BEGIN
+DECLARE start_time, query_time, lock_time CHAR(20);
+DECLARE user_host MEDIUMTEXT;
+DECLARE rows_set, rows_examined, last_insert_id, insert_id, server_id INT;
+DECLARE dbname MEDIUMTEXT;
+DECLARE sql_text BLOB;
+DECLARE done INT DEFAULT 0;
+DECLARE ER_SP_FETCH_NO_DATA CONDITION for 1329;
+DECLARE cur1 CURSOR FOR SELECT * FROM mysql.slow_log;
+OPEN cur1;
+REPEAT
+BEGIN
+BEGIN
+DECLARE CONTINUE HANDLER FOR ER_SP_FETCH_NO_DATA SET done = 1;
+FETCH cur1 INTO
+start_time, user_host, query_time, lock_time,
+rows_set, rows_examined, dbname, last_insert_id,
+insert_id, server_id, sql_text;
+END;
+IF NOT done THEN
+BEGIN
+INSERT INTO
+`db_17876.slow_log_data`
+            VALUES(start_time, user_host, query_time, lock_time, rows_set, rows_examined,
+dbname, last_insert_id,  insert_id, server_id, sql_text);
+END;
+END IF;
+END;
+UNTIL done END REPEAT;
+CLOSE cur1;
+TRUNCATE mysql.slow_log;
+END //
+CREATE procedure `db_17876.archiveGeneralLog`()
+BEGIN
+DECLARE event_time CHAR(20);
+DECLARE user_host, argument MEDIUMTEXT;
+DECLARE thread_id, server_id INT;
+DECLARE sql_text BLOB;
+DECLARE done INT DEFAULT 0;
+DECLARE command_type VARCHAR(64);
+DECLARE ER_SP_FETCH_NO_DATA CONDITION for 1329;
+DECLARE cur1 CURSOR FOR SELECT * FROM mysql.general_log;
+OPEN cur1;
+REPEAT
+BEGIN
+BEGIN
+DECLARE CONTINUE HANDLER FOR ER_SP_FETCH_NO_DATA SET done = 1;
+FETCH cur1 INTO
+event_time, user_host, thread_id, server_id,
+command_type, argument;
+END;
+IF NOT done THEN
+BEGIN
+INSERT INTO
+`db_17876.general_log_data`
+            VALUES(event_time, user_host, thread_id, server_id,
+command_type, argument);
+END;
+END IF;
+END;
+UNTIL done END REPEAT;
+CLOSE cur1;
+TRUNCATE mysql.general_log;
+END //
+SET @old_general_log_state = @@global.general_log;
+SET @old_slow_log_state = @@global.slow_query_log;
+SET GLOBAL general_log = ON;
+SET GLOBAL slow_query_log = ON;
+select "put something into general_log";
+put something into general_log
+put something into general_log
+select "... and something more ...";
+... and something more ...
+... and something more ...
+call `db_17876.archiveSlowLog`();
+call `db_17876.archiveGeneralLog`();
+SET GLOBAL general_log = OFF;
+SET GLOBAL slow_query_log = OFF;
+call `db_17876.archiveSlowLog`();
+call `db_17876.archiveGeneralLog`();
+DROP TABLE `db_17876.slow_log_data`;
+DROP TABLE `db_17876.general_log_data`;
+DROP PROCEDURE IF EXISTS `db_17876.archiveSlowLog`;
+DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`;
+DROP DATABASE IF EXISTS `db_17876`;
+SET GLOBAL general_log = @old_general_log_state;
+SET GLOBAL slow_query_log = @old_slow_log_state;
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 9214d470b37..341a6b7cd43 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1850,61 +1850,57 @@ create procedure proc_1() flush tables;
 flush tables;
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
+mysql	slow_log	0	0
 mysql	host	0	0
 mysql	user	0	0
 call proc_1();
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
+mysql	slow_log	0	0
 mysql	host	0	0
 mysql	user	0	0
 call proc_1();
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
+mysql	slow_log	0	0
 mysql	host	0	0
 mysql	user	0	0
 call proc_1();
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
+mysql	slow_log	0	0
 mysql	host	0	0
 mysql	user	0	0
 flush tables;
@@ -1922,54 +1918,50 @@ select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
-mysql	host	0	0
 mysql	user	0	0
+mysql	general_log	0	0
+mysql	host	0	0
 prepare abc from "flush tables";
 execute abc;
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
+mysql	slow_log	0	0
 mysql	host	0	0
 mysql	user	0	0
 execute abc;
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
+mysql	slow_log	0	0
 mysql	host	0	0
 mysql	user	0	0
 execute abc;
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
+mysql	slow_log	0	0
 mysql	host	0	0
 mysql	user	0	0
 flush tables;
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 2bdd29602fb..9f79c34cd2c 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -251,14 +251,13 @@ drop table t1;
 flush tables;
 show open tables;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
 create table t1(n int);
 insert into t1 values (1);
 show open tables;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
+mysql	slow_log	0	0
 test	t1	0	0
 drop table t1;
 create table t1 (a int not null, b VARCHAR(10), INDEX (b) ) AVG_ROW_LENGTH=10 CHECKSUM=1 COMMENT="test" ENGINE=MYISAM MIN_ROWS=10 MAX_ROWS=100 PACK_KEYS=1 DELAY_KEY_WRITE=1 ROW_FORMAT=fixed;
@@ -672,24 +671,23 @@ SELECT 1 FROM mysql.db, mysql.proc, mysql.user, mysql.time_zone, mysql.time_zone
 1
 SHOW OPEN TABLES;
 Database	Table	In_use	Name_locked
-mysql	proc	0	0
+mysql	db	0	0
 test	urkunde	0	0
 mysql	time_zone	0	0
-mysql	db	0	0
+mysql	general_log	0	0
 test	txt1	0	0
-mysql	slow_log	1	0
+mysql	proc	0	0
 test	tyt2	0	0
-mysql	general_log	1	0
 mysql	user	0	0
 mysql	time_zone_name	0	0
 SHOW OPEN TABLES FROM mysql;
 Database	Table	In_use	Name_locked
-mysql	proc	0	0
-mysql	time_zone	0	0
 mysql	db	0	0
-mysql	slow_log	1	0
-mysql	general_log	1	0
+mysql	time_zone	0	0
+mysql	general_log	0	0
+mysql	slow_log	0	0
 mysql	user	0	0
+mysql	proc	0	0
 mysql	time_zone_name	0	0
 SHOW OPEN TABLES FROM mysql LIKE 'u%';
 Database	Table	In_use	Name_locked
@@ -702,16 +700,15 @@ test	tyt2	0	0
 mysql	time_zone_name	0	0
 SHOW OPEN TABLES LIKE '%o%';
 Database	Table	In_use	Name_locked
-mysql	proc	0	0
 mysql	time_zone	0	0
-mysql	slow_log	1	0
-mysql	general_log	1	0
+mysql	general_log	0	0
+mysql	slow_log	0	0
+mysql	proc	0	0
 mysql	time_zone_name	0	0
 FLUSH TABLES;
 SHOW OPEN TABLES;
 Database	Table	In_use	Name_locked
-mysql	general_log	1	0
-mysql	slow_log	1	0
+mysql	general_log	0	0
 DROP TABLE txt1;
 DROP TABLE tyt2;
 DROP TABLE urkunde;
diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result
index b6dcbc251d7..8f10625744b 100644
--- a/mysql-test/r/status.result
+++ b/mysql-test/r/status.result
@@ -1,11 +1,11 @@
 flush status;
 show status like 'Table_lock%';
 Variable_name	Value
-Table_locks_immediate	0
+Table_locks_immediate	1
 Table_locks_waited	0
 select * from information_schema.session_status where variable_name like 'Table_lock%';
 VARIABLE_NAME	VARIABLE_VALUE
-TABLE_LOCKS_IMMEDIATE	0
+TABLE_LOCKS_IMMEDIATE	2
 TABLE_LOCKS_WAITED	0
 SET SQL_LOG_BIN=0;
 drop table if exists t1;
@@ -18,11 +18,11 @@ update t1 set n = 3;
 unlock tables;
 show status like 'Table_lock%';
 Variable_name	Value
-Table_locks_immediate	3
+Table_locks_immediate	17
 Table_locks_waited	1
 select * from information_schema.session_status where variable_name like 'Table_lock%';
 VARIABLE_NAME	VARIABLE_VALUE
-TABLE_LOCKS_IMMEDIATE	3
+TABLE_LOCKS_IMMEDIATE	18
 TABLE_LOCKS_WAITED	1
 drop table t1;
 select 1;
@@ -97,7 +97,7 @@ Variable_name	Value
 Com_show_status	3
 show status like 'hand%write%';
 Variable_name	Value
-Handler_write	0
+Handler_write	5
 show status like '%tmp%';
 Variable_name	Value
 Created_tmp_disk_tables	0
@@ -105,7 +105,7 @@ Created_tmp_files	0
 Created_tmp_tables	0
 show status like 'hand%write%';
 Variable_name	Value
-Handler_write	0
+Handler_write	7
 show status like '%tmp%';
 Variable_name	Value
 Created_tmp_disk_tables	0
diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test
index 16f466e9b54..b0bb818b783 100644
--- a/mysql-test/t/log_state.test
+++ b/mysql-test/t/log_state.test
@@ -126,6 +126,59 @@ drop table t1;
 --replace_column 1 TIMESTAMP 2 USER_HOST 3 #
 select * from mysql.general_log;
 
+#
+# Bug#29129 (Resetting general_log while the GLOBAL READ LOCK is set causes
+# a deadlock)
+
+# save state
+
+SET @old_general_log_state = @@global.general_log;
+SET @old_slow_log_state = @@global.slow_query_log;
+
+# Test ON->OFF transition under a GLOBAL READ LOCK
+
+SET GLOBAL general_log = ON;
+SET GLOBAL slow_query_log = ON;
+
+FLUSH TABLES WITH READ LOCK;
+
+SET GLOBAL general_log = OFF;
+SET GLOBAL slow_query_log = OFF;
+
+UNLOCK TABLES;
+
+# Test OFF->ON transition under a GLOBAL READ LOCK
+
+FLUSH TABLES WITH READ LOCK;
+
+SET GLOBAL general_log = ON;
+SET GLOBAL slow_query_log = ON;
+
+UNLOCK TABLES;
+
+# Test ON->OFF transition under a GLOBAL READ_ONLY
+
+SET GLOBAL READ_ONLY = ON;
+
+SET GLOBAL general_log = OFF;
+SET GLOBAL slow_query_log = OFF;
+
+SET GLOBAL READ_ONLY = OFF;
+
+# Test OFF->ON transition under a GLOBAL READ_ONLY
+
+SET GLOBAL READ_ONLY = ON;
+
+SET GLOBAL general_log = ON;
+SET GLOBAL slow_query_log = ON;
+
+SET GLOBAL READ_ONLY = OFF;
+
+# Restore state
+
+SET GLOBAL general_log = @old_general_log_state;
+SET GLOBAL slow_query_log = @old_slow_log_state;
+
 --enable_ps_protocol
 
 #
diff --git a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test
index e8eff7cba0a..8baa4e5a373 100644
--- a/mysql-test/t/log_tables.test
+++ b/mysql-test/t/log_tables.test
@@ -64,10 +64,10 @@ flush logs;
 # check locking of the log tables
 #
 
---error ER_CANT_WRITE_LOCK_LOG_TABLE
+--error ER_CANT_LOCK_LOG_TABLE
 lock tables mysql.general_log WRITE;
 
---error ER_CANT_WRITE_LOCK_LOG_TABLE
+--error ER_CANT_LOCK_LOG_TABLE
 lock tables mysql.slow_log WRITE;
 
 #
@@ -76,78 +76,59 @@ lock tables mysql.slow_log WRITE;
 # tables are always opened and locked by the logger.
 #
 
---error ER_CANT_READ_LOCK_LOG_TABLE
+--error ER_CANT_LOCK_LOG_TABLE
 lock tables mysql.general_log READ;
 
---error ER_CANT_READ_LOCK_LOG_TABLE
+--error ER_CANT_LOCK_LOG_TABLE
 lock tables mysql.slow_log READ;
 
 #
-# This call should result in TL_READ lock on the log table. This is ok and
-# should pass.
+# This call should result in TL_READ lock on the log table.
+# This is not ok and should fail.
 #
 
+--error ER_CANT_LOCK_LOG_TABLE
 lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL;
 
-unlock tables;
+# Misc locking tests
+
+show create table mysql.general_log;
+show fields from mysql.general_log;
+
+show create table mysql.slow_log;
+show fields from mysql.slow_log;
 
 #
-# check that FLUSH LOGS waits for all readers of the log table to vanish
+# check that FLUSH LOGS does not flush the log tables
 #
 
-connect (con1,localhost,root,,);
-connect (con2,localhost,root,,);
+flush logs;
+flush tables;
 
-connection con1;
+SET GLOBAL GENERAL_LOG=ON;
+SET GLOBAL SLOW_QUERY_LOG=ON;
 
-lock tables mysql.general_log READ LOCAL;
-
-connection con2;
-
-# this should wait for log tables to unlock
-send flush logs;
-
-connection con1;
-
-unlock tables;
-
-# this connection should be alive by the time
-connection con2;
-
-reap;
-
-select "Mark that we woke up from flush logs in the test"
-       as "test passed";
+show open tables;
+flush logs;
+show open tables;
 
 #
-# perform the same check for TRUNCATE: it should also wait for readers
-# to disappear
+# check that FLUSH TABLES does flush the log tables
 #
 
-connection con1;
+flush tables;
+# Since the flush is logged, mysql.general_log will be in the cache
+show open tables;
 
-lock tables mysql.general_log READ LOCAL;
+SET GLOBAL GENERAL_LOG=OFF;
+SET GLOBAL SLOW_QUERY_LOG=OFF;
 
-connection con2;
+flush tables;
+# Here the table cache is empty
+show open tables;
 
-# this should wait for log tables to unlock
-send truncate mysql.general_log;
-
-connection con1;
-
-unlock tables;
-
-# this connection should be alive by the time
-connection con2;
-
-reap;
-
-select "Mark that we woke up from TRUNCATE in the test"
-       as "test passed";
-
-connection con1;
-
-use test;
+SET GLOBAL GENERAL_LOG=ON;
+SET GLOBAL SLOW_QUERY_LOG=ON;
 
 #
 # Bug #16905    Log tables: unicode statements are logged incorrectly
@@ -220,10 +201,10 @@ flush logs;
 
 # check locking of myisam-based log tables
 
---error ER_CANT_WRITE_LOCK_LOG_TABLE
+--error ER_CANT_LOCK_LOG_TABLE
 lock tables mysql.general_log WRITE;
 
---error ER_CANT_WRITE_LOCK_LOG_TABLE
+--error ER_CANT_LOCK_LOG_TABLE
 lock tables mysql.slow_log WRITE;
 
 #
@@ -232,21 +213,12 @@ lock tables mysql.slow_log WRITE;
 # tables are always opened and locked by the logger.
 #
 
---error ER_CANT_READ_LOCK_LOG_TABLE
+--error ER_CANT_LOCK_LOG_TABLE
 lock tables mysql.general_log READ;
 
---error ER_CANT_READ_LOCK_LOG_TABLE
+--error ER_CANT_LOCK_LOG_TABLE
 lock tables mysql.slow_log READ;
 
-#
-# This call should result in TL_READ lock on the log table. This is ok and
-# should pass.
-#
-
-lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL;
-
-unlock tables;
-
 # check that we can drop them
 set global general_log='OFF';
 set global slow_query_log='OFF';
@@ -314,6 +286,7 @@ use test;
 flush tables with read lock;
 unlock tables;
 use mysql;
+--error ER_CANT_LOCK_LOG_TABLE
 lock tables general_log read local, help_category read local;
 unlock tables;
 
@@ -368,9 +341,9 @@ set global slow_query_log='OFF';
 RENAME TABLE slow_log TO slow_log2;
 
 # this should fail
---error ER_CANT_ACTIVATE_LOG
+--error ER_NO_SUCH_TABLE
 set global general_log='ON';
---error ER_CANT_ACTIVATE_LOG
+--error ER_NO_SUCH_TABLE
 set global slow_query_log='ON';
 
 RENAME TABLE general_log2 TO general_log;
@@ -470,8 +443,305 @@ FLUSH LOGS;
 ALTER TABLE mysql.slow_log DROP COLUMN seq;
 ALTER TABLE mysql.slow_log ENGINE = CSV;
 
-# kill all connections
-disconnect con1;
-disconnect con2;
+#
+# Bug#25422 (Hang with log tables)
+#
+
+--disable_warnings
+drop procedure if exists proc25422_truncate_slow;
+drop procedure if exists proc25422_truncate_general;
+drop procedure if exists proc25422_alter_slow;
+drop procedure if exists proc25422_alter_general;
+--enable_warnings
+
+delimiter //;
+
+use test//
+create procedure proc25422_truncate_slow (loops int)
+begin
+  declare v1 int default 0;
+  while v1 < loops do
+    truncate mysql.slow_log;
+    set v1 = v1 + 1;
+    end while;
+end//
+
+create procedure proc25422_truncate_general (loops int)
+begin
+  declare v1 int default 0;
+  while v1 < loops do
+    truncate mysql.general_log;
+    set v1 = v1 + 1;
+    end while;
+end//
+
+create procedure proc25422_alter_slow (loops int)
+begin
+  declare v1 int default 0;
+  declare ER_BAD_LOG_STATEMENT condition for 1575;
+  declare continue handler for ER_BAD_LOG_STATEMENT begin end;
+
+  while v1 < loops do
+    set @old_log_state = @@global.slow_query_log;
+    set global slow_query_log = 'OFF';
+    alter table mysql.slow_log engine = CSV;
+    set global slow_query_log = @old_log_state;
+    set v1 = v1 + 1;
+    end while;
+end//
+
+create procedure proc25422_alter_general (loops int)
+begin
+  declare v1 int default 0;
+  declare ER_BAD_LOG_STATEMENT condition for 1575;
+  declare continue handler for ER_BAD_LOG_STATEMENT begin end;
+
+  while v1 < loops do
+    set @old_log_state = @@global.general_log;
+    set global general_log = 'OFF';
+    alter table mysql.general_log engine = CSV;
+    set global general_log = @old_log_state;
+    set v1 = v1 + 1;
+    end while;
+end//
+
+delimiter ;//
+
+--echo "Serial test (proc25422_truncate_slow)"
+call proc25422_truncate_slow(100);
+--echo "Serial test (proc25422_truncate_general)"
+call proc25422_truncate_general(100);
+--echo "Serial test (proc25422_alter_slow)"
+call proc25422_alter_slow(100);
+--echo "Serial test (proc25422_alter_general)"
+call proc25422_alter_general(100);
+
+--echo "Parallel test"
+
+# ER_BAD_LOG_STATEMENT errors will occur,
+# since concurrent threads do SET GLOBAL general_log= ...
+# This is silenced by handlers and will not affect the test
+
+connect (addconroot1, localhost, root,,);
+connect (addconroot2, localhost, root,,);
+connect (addconroot3, localhost, root,,);
+connect (addconroot4, localhost, root,,);
+connect (addconroot5, localhost, root,,);
+connect (addconroot6, localhost, root,,);
+connect (addconroot7, localhost, root,,);
+connect (addconroot8, localhost, root,,);
+
+connection addconroot1;
+send call proc25422_truncate_slow(100);
+connection addconroot2;
+send call proc25422_truncate_slow(100);
+
+connection addconroot3;
+send call proc25422_truncate_general(100);
+connection addconroot4;
+send call proc25422_truncate_general(100);
+
+connection addconroot5;
+send call proc25422_alter_slow(100);
+connection addconroot6;
+send call proc25422_alter_slow(100);
+
+connection addconroot7;
+send call proc25422_alter_general(100);
+connection addconroot8;
+send call proc25422_alter_general(100);
+
+connection addconroot1;
+reap;
+connection addconroot2;
+reap;
+connection addconroot3;
+reap;
+connection addconroot4;
+reap;
+connection addconroot5;
+reap;
+connection addconroot6;
+reap;
+connection addconroot7;
+reap;
+connection addconroot8;
+reap;
+
+connection default;
+
+disconnect addconroot1;
+disconnect addconroot2;
+disconnect addconroot3;
+disconnect addconroot4;
+disconnect addconroot5;
+disconnect addconroot6;
+disconnect addconroot7;
+disconnect addconroot8;
+
+drop procedure proc25422_truncate_slow;
+drop procedure proc25422_truncate_general;
+drop procedure proc25422_alter_slow;
+drop procedure proc25422_alter_general;
+
 --enable_ps_protocol
 
+
+#
+# Bug#23044 (Warnings on flush of a log table)
+#
+
+FLUSH TABLE mysql.general_log;
+show warnings;
+
+FLUSH TABLE mysql.slow_log;
+show warnings;
+
+#
+# Bug#17876 (Truncating mysql.slow_log in a SP after using cursor locks the
+#            thread)
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS `db_17876.slow_log_data`;
+DROP TABLE IF EXISTS `db_17876.general_log_data`;
+DROP PROCEDURE IF EXISTS `db_17876.archiveSlowLog`;
+DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`;
+DROP DATABASE IF EXISTS `db_17876`;
+--enable_warnings
+
+CREATE DATABASE db_17876;
+
+CREATE TABLE `db_17876.slow_log_data` (
+  `start_time` timestamp  default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `user_host` mediumtext ,
+  `query_time` time ,
+  `lock_time` time ,
+  `rows_sent` int(11) ,
+  `rows_examined` int(11) ,
+  `db` varchar(512) default NULL,
+  `last_insert_id` int(11) default NULL,
+  `insert_id` int(11) default NULL,
+  `server_id` int(11) default NULL,
+  `sql_text` mediumtext 
+);
+
+CREATE TABLE `db_17876.general_log_data` (
+  `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `user_host` mediumtext,
+  `thread_id` int(11) DEFAULT NULL,
+  `server_id` int(11) DEFAULT NULL,
+  `command_type` varchar(64) DEFAULT NULL,
+  `argument` mediumtext
+);
+
+DELIMITER //;
+
+CREATE procedure `db_17876.archiveSlowLog`()
+BEGIN
+  DECLARE start_time, query_time, lock_time CHAR(20);
+  DECLARE user_host MEDIUMTEXT;
+  DECLARE rows_set, rows_examined, last_insert_id, insert_id, server_id INT;
+  DECLARE dbname MEDIUMTEXT;
+  DECLARE sql_text BLOB;
+  DECLARE done INT DEFAULT 0;
+  DECLARE ER_SP_FETCH_NO_DATA CONDITION for 1329;
+
+  DECLARE cur1 CURSOR FOR SELECT * FROM mysql.slow_log;
+
+  OPEN cur1;
+  
+  REPEAT
+    BEGIN
+      BEGIN
+        DECLARE CONTINUE HANDLER FOR ER_SP_FETCH_NO_DATA SET done = 1;
+
+        FETCH cur1 INTO
+           start_time, user_host, query_time, lock_time,
+           rows_set, rows_examined, dbname, last_insert_id,
+           insert_id, server_id, sql_text;
+      END;
+
+      IF NOT done THEN
+        BEGIN
+          INSERT INTO
+            `db_17876.slow_log_data`
+            VALUES(start_time, user_host, query_time, lock_time, rows_set, rows_examined,
+                   dbname, last_insert_id,  insert_id, server_id, sql_text);
+        END;
+      END IF;
+    END;
+  UNTIL done END REPEAT;
+
+  CLOSE cur1;
+  TRUNCATE mysql.slow_log;
+END //
+
+CREATE procedure `db_17876.archiveGeneralLog`()
+BEGIN
+  DECLARE event_time CHAR(20);
+  DECLARE user_host, argument MEDIUMTEXT;
+  DECLARE thread_id, server_id INT;
+  DECLARE sql_text BLOB;
+  DECLARE done INT DEFAULT 0;
+  DECLARE command_type VARCHAR(64);
+  DECLARE ER_SP_FETCH_NO_DATA CONDITION for 1329;
+
+  DECLARE cur1 CURSOR FOR SELECT * FROM mysql.general_log;
+
+  OPEN cur1;
+  
+  REPEAT
+    BEGIN
+      BEGIN
+        DECLARE CONTINUE HANDLER FOR ER_SP_FETCH_NO_DATA SET done = 1;
+
+        FETCH cur1 INTO
+          event_time, user_host, thread_id, server_id,
+          command_type, argument;
+      END;
+
+      IF NOT done THEN
+        BEGIN
+          INSERT INTO
+            `db_17876.general_log_data`
+            VALUES(event_time, user_host, thread_id, server_id,
+            command_type, argument);
+        END;
+      END IF;
+    END;
+  UNTIL done END REPEAT;
+
+  CLOSE cur1;
+  TRUNCATE mysql.general_log;
+END //
+
+DELIMITER ;//
+
+SET @old_general_log_state = @@global.general_log;
+SET @old_slow_log_state = @@global.slow_query_log;
+
+SET GLOBAL general_log = ON;
+SET GLOBAL slow_query_log = ON;
+
+select "put something into general_log";
+select "... and something more ...";
+
+call `db_17876.archiveSlowLog`();
+call `db_17876.archiveGeneralLog`();
+
+SET GLOBAL general_log = OFF;
+SET GLOBAL slow_query_log = OFF;
+
+call `db_17876.archiveSlowLog`();
+call `db_17876.archiveGeneralLog`();
+
+DROP TABLE `db_17876.slow_log_data`;
+DROP TABLE `db_17876.general_log_data`;
+DROP PROCEDURE IF EXISTS `db_17876.archiveSlowLog`;
+DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`;
+DROP DATABASE IF EXISTS `db_17876`;
+
+SET GLOBAL general_log = @old_general_log_state;
+SET GLOBAL slow_query_log = @old_slow_log_state;
+
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 394f44bbc83..5a4d30fdd50 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -2018,10 +2018,17 @@ delimiter ;|
 select func_1(), func_1(), func_1() from dual;
 drop function func_1;
 drop procedure proc_1;
+
+# make the output deterministic:
+# the order used in SHOW OPEN TABLES
+# is too much implementation dependent
+--disable_ps_protocol
 flush tables;
 select Host, User from mysql.user limit 0;
 select Host, Db from mysql.host limit 0;
 show open tables from mysql;
+--enable_ps_protocol
+
 prepare abc from "flush tables";
 execute abc;
 show open tables from mysql;
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 09c0b08a3cd..5d7d8d3130d 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -438,6 +438,11 @@ drop table if exists t1;
 CREATE TABLE txt1(a int);
 CREATE TABLE tyt2(a int);
 CREATE TABLE urkunde(a int);
+
+# make the output deterministic:
+# the order used in SHOW OPEN TABLES
+# is too much implementation dependent
+--disable_ps_protocol
 FLUSH TABLES;
 SELECT 1 FROM mysql.db, mysql.proc, mysql.user, mysql.time_zone, mysql.time_zone_name, txt1, tyt2, urkunde LIMIT 0;
 SHOW OPEN TABLES;
@@ -447,6 +452,8 @@ SHOW OPEN TABLES LIKE 't%';
 SHOW OPEN TABLES LIKE '%o%';
 FLUSH TABLES;
 SHOW OPEN TABLES;
+--enable_ps_protocol
+
 DROP TABLE txt1;
 DROP TABLE tyt2;
 DROP TABLE urkunde;
diff --git a/sql/handler.cc b/sql/handler.cc
index 2d836b30862..e0ec2962d17 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1516,34 +1516,6 @@ THD *handler::ha_thd(void) const
 }
 
 
-bool handler::check_if_log_table_locking_is_allowed(uint sql_command,
-                                                    ulong type, TABLE *table)
-{
-  /*
-    Deny locking of the log tables, which is incompatible with
-    concurrent insert. The routine is not called if the table is
-    being locked from a logger THD (general_log_thd or slow_log_thd)
-    or from a privileged thread (see log.cc for details)
-  */
-  if (table->s->log_table &&
-      sql_command != SQLCOM_TRUNCATE &&
-      sql_command != SQLCOM_ALTER_TABLE &&
-      !(sql_command == SQLCOM_FLUSH &&
-        type & REFRESH_LOG) &&
-      (table->reginfo.lock_type >= TL_READ_NO_INSERT))
-  {
-    /*
-      The check  >= TL_READ_NO_INSERT denies all write locks
-      plus the only read lock (TL_READ_NO_INSERT itself)
-    */
-    table->reginfo.lock_type == TL_READ_NO_INSERT ?
-      my_error(ER_CANT_READ_LOCK_LOG_TABLE, MYF(0)) :
-        my_error(ER_CANT_WRITE_LOCK_LOG_TABLE, MYF(0));
-    return FALSE;
-  }
-  return TRUE;
-}
-
 /** @brief
   Open database-handler.
 
@@ -3681,6 +3653,18 @@ int handler::ha_write_row(uchar *buf)
   return 0;
 }
 
+
+/**
+  Write a record to the engine bypassing row-level binary logging.
+  This method is used internally by the server for writing to
+  performance schema tables, which are never replicated.
+*/
+int handler::ha_write_row_no_binlog(uchar *buf)
+{
+  return write_row(buf);
+}
+
+
 int handler::ha_update_row(const uchar *old_data, uchar *new_data)
 {
   int error;
diff --git a/sql/handler.h b/sql/handler.h
index f45b28c55f5..06f0a2cf035 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1035,44 +1035,6 @@ public:
   {
     cached_table_flags= table_flags();
   }
-  /*
-    Check whether a handler allows to lock the table.
-
-    SYNOPSIS
-      check_if_locking_is_allowed()
-        thd     Handler of the thread, trying to lock the table
-        table   Table handler to check
-        count   Total number of tables to be locked
-        current Index of the current table in the list of the tables
-                to be locked.
-        system_count Pointer to the counter of system tables seen thus
-                     far.
-        called_by_privileged_thread TRUE if called from a logger THD
-                                    (general_log_thd or slow_log_thd)
-                                    or by a privileged thread, which
-                                    has the right to lock log tables.
-
-    DESCRIPTION
-      Check whether a handler allows to lock the table. For instance,
-      MyISAM does not allow to lock mysql.proc along with other tables.
-      This limitation stems from the fact that MyISAM does not support
-      row-level locking and we have to add this limitation to avoid
-      deadlocks.
-
-    RETURN
-      TRUE      Locking is allowed
-      FALSE     Locking is not allowed. The error was thrown.
-  */
-  virtual bool check_if_locking_is_allowed(uint sql_command,
-                                           ulong type, TABLE *table,
-                                           uint count, uint current,
-                                           uint *system_count,
-                                           bool called_by_privileged_thread)
-  {
-    return TRUE;
-  }
-  bool check_if_log_table_locking_is_allowed(uint sql_command,
-                                             ulong type, TABLE *table);
   int ha_open(TABLE *table, const char *name, int mode, int test_if_locked);
   void adjust_next_insert_id_after_explicit_value(ulonglong nr);
   int update_auto_increment();
@@ -1196,6 +1158,7 @@ public:
    */
   int ha_external_lock(THD *thd, int lock_type);
   int ha_write_row(uchar * buf);
+  int ha_write_row_no_binlog(uchar * buf);
   int ha_update_row(const uchar * old_data, uchar * new_data);
   int ha_delete_row(const uchar * buf);
 
diff --git a/sql/lock.cc b/sql/lock.cc
index 4260a031def..34a2e202f8f 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -117,9 +117,64 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count,
   MYSQL_LOCK *sql_lock;
   TABLE *write_lock_used;
   int rc;
+  uint i;
+  bool log_table_write_query;
+  uint system_count;
+
   DBUG_ENTER("mysql_lock_tables");
 
   *need_reopen= FALSE;
+  system_count= 0;
+
+  log_table_write_query= (is_log_table_write_query(thd->lex->sql_command)
+                         || ((flags & MYSQL_LOCK_PERF_SCHEMA) != 0));
+
+  for (i=0 ; i<count; i++)
+  {
+    TABLE *t= tables[i];
+
+    /* Protect against 'fake' partially initialized TABLE_SHARE */
+    DBUG_ASSERT(t->s->table_category != TABLE_UNKNOWN_CATEGORY);
+
+    /*
+      Table I/O to performance schema tables is performed
+      only internally by the server implementation.
+      When a user is requesting a lock, the following
+      constraints are enforced:
+    */
+    if (t->s->require_write_privileges() &&
+        ! log_table_write_query)
+    {
+      /*
+        A user should not be able to prevent writes,
+        or hold any type of lock in a session,
+        since this would be a DOS attack.
+      */
+      if ((t->reginfo.lock_type >= TL_READ_NO_INSERT)
+          || (thd->lex->sql_command == SQLCOM_LOCK_TABLES))
+      {
+        my_error(ER_CANT_LOCK_LOG_TABLE, MYF(0));
+        DBUG_RETURN(0);
+      }
+    }
+
+    if ((t->s->table_category == TABLE_CATEGORY_SYSTEM) &&
+        (t->reginfo.lock_type >= TL_WRITE_ALLOW_WRITE))
+    {
+      system_count++;
+    }
+  }
+
+  /*
+    Locking of system tables is restricted:
+    locking a mix of system and non-system tables in the same lock
+    is prohibited, to prevent contention.
+  */
+  if ((system_count > 0) && (system_count < count))
+  {
+    my_error(ER_WRONG_LOCK_OF_SYSTEM_TABLE, MYF(0));
+    DBUG_RETURN(0);
+  }
 
   for (;;)
   {
@@ -439,7 +494,8 @@ void mysql_lock_downgrade_write(THD *thd, TABLE *table,
 {
   MYSQL_LOCK *locked;
   TABLE *write_lock_used;
-  if ((locked = get_lock_data(thd,&table,1,1,&write_lock_used)))
+  if ((locked = get_lock_data(thd, &table, 1, GET_LOCK_UNLOCK,
+                              &write_lock_used)))
   {
     for (uint i=0; i < locked->lock_count; i++)
       thr_downgrade_write_lock(locked->locks[i], new_lock_type);
@@ -698,25 +754,19 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count,
   TABLE **to, **table_buf;
   DBUG_ENTER("get_lock_data");
 
+  DBUG_ASSERT((flags == GET_LOCK_UNLOCK) || (flags == GET_LOCK_STORE_LOCKS));
+
   DBUG_PRINT("info", ("count %d", count));
   *write_lock_used=0;
-  uint system_count= 0;
   for (i=tables=lock_count=0 ; i < count ; i++)
   {
-    if (table_ptr[i]->s->tmp_table != NON_TRANSACTIONAL_TMP_TABLE)
+    TABLE *t= table_ptr[i];
+
+    if (t->s->tmp_table != NON_TRANSACTIONAL_TMP_TABLE)
     {
-      tables+=table_ptr[i]->file->lock_count();
+      tables+= t->file->lock_count();
       lock_count++;
     }
-    /*
-      Check if we can lock the table. For some tables we cannot do that
-      beacause of handler-specific locking issues.
-    */
-    if (!table_ptr[i]-> file->
-          check_if_locking_is_allowed(thd->lex->sql_command, thd->lex->type,
-                                      table_ptr[i], count, i, &system_count,
-                                      logger.is_privileged_thread(thd)))
-      DBUG_RETURN(0);
   }
 
   /*
diff --git a/sql/log.cc b/sql/log.cc
index 0bf77d68410..af039c15ffc 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -57,6 +57,35 @@ static int binlog_commit(handlerton *hton, THD *thd, bool all);
 static int binlog_rollback(handlerton *hton, THD *thd, bool all);
 static int binlog_prepare(handlerton *hton, THD *thd, bool all);
 
+/**
+  Silence all errors and warnings reported when performing a write
+  to a log table.
+  Errors and warnings are not reported to the client or SQL exception
+  handlers, so that the presence of logging does not interfere and affect
+  the logic of an application.
+*/
+class Silence_log_table_errors : public Internal_error_handler
+{
+public:
+  Silence_log_table_errors()
+  {}
+
+  virtual ~Silence_log_table_errors() {}
+
+  virtual bool handle_error(uint sql_errno,
+                            MYSQL_ERROR::enum_warning_level level,
+                            THD *thd);
+};
+
+bool
+Silence_log_table_errors::handle_error(uint /* sql_errno */,
+                                       MYSQL_ERROR::enum_warning_level /* level */,
+                                       THD * /* thd */)
+{
+  return TRUE;
+}
+
+
 sql_print_message_func sql_print_message_handlers[3] =
 {
   sql_print_information,
@@ -187,6 +216,19 @@ public:
 
 handlerton *binlog_hton;
 
+bool LOGGER::is_log_table_enabled(uint log_table_type)
+{
+  switch (log_table_type) {
+  case QUERY_LOG_SLOW:
+    return (table_log_handler != NULL) && opt_slow_log;
+  case QUERY_LOG_GENERAL:
+    return (table_log_handler != NULL) && opt_log ;
+  default:
+    DBUG_ASSERT(0);
+    return FALSE;                             /* make compiler happy */
+  }
+}
+
 
 /* Check if a given table is opened log table */
 int check_if_log_table(uint db_len, const char *db, uint table_name_len,
@@ -200,211 +242,38 @@ int check_if_log_table(uint db_len, const char *db, uint table_name_len,
     if (table_name_len == 11 && !(lower_case_table_names ?
                                   my_strcasecmp(system_charset_info,
                                                 table_name, "general_log") :
-                                  strcmp(table_name, "general_log")) &&
-        (!check_if_opened || logger.is_log_table_enabled(QUERY_LOG_GENERAL)))
-      return QUERY_LOG_GENERAL;
-    else
-      if (table_name_len == 8 && !(lower_case_table_names ?
-        my_strcasecmp(system_charset_info, table_name, "slow_log") :
-        strcmp(table_name, "slow_log")) &&
-          (!check_if_opened ||logger.is_log_table_enabled(QUERY_LOG_SLOW)))
+                                  strcmp(table_name, "general_log")))
+    {
+      if (!check_if_opened || logger.is_log_table_enabled(QUERY_LOG_GENERAL))
+        return QUERY_LOG_GENERAL;
+      return 0;
+    }
+
+    if (table_name_len == 8 && !(lower_case_table_names ?
+      my_strcasecmp(system_charset_info, table_name, "slow_log") :
+      strcmp(table_name, "slow_log")))
+    {
+      if (!check_if_opened || logger.is_log_table_enabled(QUERY_LOG_SLOW))
         return QUERY_LOG_SLOW;
+      return 0;
+    }
   }
   return 0;
 }
 
 
-/*
-  Open log table of a given type (general or slow log)
-
-  SYNOPSIS
-    open_log_table()
-
-    log_table_type   type of the log table to open: QUERY_LOG_GENERAL
-                     or QUERY_LOG_SLOW
-
-  DESCRIPTION
-
-    The function opens a log table and marks it as such. Log tables are open
-    during the whole time, while server is running. Except for the moments
-    when they have to be reopened: during FLUSH LOGS and TRUNCATE. This
-    function is invoked directly only once during startup. All subsequent
-    calls happen through reopen_log_table(), which performs additional check.
-
-  RETURN
-    FALSE - OK
-    TRUE - error occured
-*/
-
-bool Log_to_csv_event_handler::open_log_table(uint log_table_type)
-{
-  THD *log_thd, *curr= current_thd;
-  TABLE_LIST *table;
-  bool error= FALSE;
-  DBUG_ENTER("open_log_table");
-
-  switch (log_table_type) {
-  case QUERY_LOG_GENERAL:
-    log_thd= general_log_thd;
-    table= &general_log;
-    /* clean up table before reuse/initial usage */
-    bzero((char*) table, sizeof(TABLE_LIST));
-    table->alias= table->table_name= (char*) "general_log";
-    table->table_name_length= 11;
-    break;
-  case QUERY_LOG_SLOW:
-    log_thd= slow_log_thd;
-    table= &slow_log;
-    bzero((char*) table, sizeof(TABLE_LIST));
-    table->alias= table->table_name= (char*) "slow_log";
-    table->table_name_length= 8;
-    break;
-  default:
-    assert(0);                                  // Impossible
-  }
-
-  /*
-    This way we check that appropriate log thd was created ok during
-    initialization. We cannot check "is_log_tables_initialized" var, as
-    the very initialization is not finished until this function is
-    completed in the very first time.
-  */
-  if (!log_thd)
-  {
-    DBUG_PRINT("error",("Cannot initialize log tables"));
-    DBUG_RETURN(TRUE);
-  }
-
-  /*
-    Set THD's thread_stack. This is needed to perform stack overrun
-    check, which is done by some routines (e.g. open_table()).
-    In the case we are called by thread, which already has this parameter
-    set, we use this value. Otherwise we do a wild guess. This won't help
-    to correctly track the stack overrun in these exceptional cases (which
-    could probably happen only during startup and shutdown) but at least
-    lets us to pass asserts.
-    The problem stems from the fact that logger THDs are not real threads.
-  */
-  if (curr)
-    log_thd->thread_stack= curr->thread_stack;
-  else
-    log_thd->thread_stack= (char*) &log_thd;
-
-  log_thd->store_globals();
-
-  table->lock_type= TL_WRITE_CONCURRENT_INSERT;
-  table->db= log_thd->db;
-  table->db_length= log_thd->db_length;
-
-  lex_start(log_thd);
-  log_thd->clear_error();
-  if (simple_open_n_lock_tables(log_thd, table) ||
-      table->table->file->extra(HA_EXTRA_MARK_AS_LOG_TABLE) ||
-      table->table->file->ha_rnd_init(0))
-    error= TRUE;
-  else
-  {
-    table->table->use_all_columns();
-    table->table->locked_by_logger= TRUE;
-    table->table->no_replicate= TRUE;
-
-    /* Honor next number columns if present */
-    table->table->next_number_field= table->table->found_next_number_field;
-  }
-  /* restore thread settings */
-  if (curr)
-    curr->store_globals();
-  else
-  {
-    my_pthread_setspecific_ptr(THR_THD,  0);
-    my_pthread_setspecific_ptr(THR_MALLOC, 0);
-  }
-
-  /*
-    After a log table was opened, we should clear privileged thread
-    flag (which allows locking of a log table by a special thread, usually
-    the one who closed log tables temporarily).
-  */
-  privileged_thread= 0;
-  DBUG_RETURN(error);
-}
-
-
 Log_to_csv_event_handler::Log_to_csv_event_handler()
 {
-  /* init artificial THD's */
-  general_log_thd= new THD;
-  /* logger thread always works with mysql database */
-  general_log_thd->db= my_strdup("mysql", MYF(0));
-  general_log_thd->db_length= 5;
-  general_log.table= 0;
-
-  slow_log_thd= new THD;
-  /* logger thread always works with mysql database */
-  slow_log_thd->db= my_strdup("mysql", MYF(0));;
-  slow_log_thd->db_length= 5;
-  slow_log.table= 0;
-  /* no privileged thread exists at the moment */
-  privileged_thread= 0;
 }
 
 
 Log_to_csv_event_handler::~Log_to_csv_event_handler()
 {
-  /* now cleanup the tables */
-  if (general_log_thd)
-  {
-    delete general_log_thd;
-    general_log_thd= NULL;
-  }
-
-  if (slow_log_thd)
-  {
-    delete slow_log_thd;
-    slow_log_thd= NULL;
-  }
-}
-
-
-/*
-  Reopen log table of a given type
-
-  SYNOPSIS
-    reopen_log_table()
-
-    log_table_type   type of the log table to open: QUERY_LOG_GENERAL
-                     or QUERY_LOG_SLOW
-
-  DESCRIPTION
-
-    The function is a wrapper around open_log_table(). It is used during
-    FLUSH LOGS and TRUNCATE of the log tables (i.e. when we need to close
-    and reopen them). The difference is in the check of the
-    logger.is_log_tables_initialized var, which can't be done in
-    open_log_table(), as it makes no sense during startup.
-
-    NOTE: this code assumes that we have logger mutex locked
-
-  RETURN
-    FALSE - ok
-    TRUE - open_log_table() returned an error
-*/
-
-bool Log_to_csv_event_handler::reopen_log_table(uint log_table_type)
-{
-  /* don't open the log table, if it wasn't enabled during startup */
-  if (!logger.is_log_tables_initialized)
-    return FALSE;
-  return open_log_table(log_table_type);
 }
 
 
 void Log_to_csv_event_handler::cleanup()
 {
-  if (opt_log)
-    close_log_table(QUERY_LOG_GENERAL, FALSE);
-  if (opt_slow_log)
-    close_log_table(QUERY_LOG_SLOW, FALSE);
   logger.is_log_tables_initialized= FALSE;
 }
 
@@ -436,49 +305,88 @@ void Log_to_csv_event_handler::cleanup()
 */
 
 bool Log_to_csv_event_handler::
-  log_general(time_t event_time, const char *user_host,
+  log_general(THD *thd, time_t event_time, const char *user_host,
               uint user_host_len, int thread_id,
               const char *command_type, uint command_type_len,
               const char *sql_text, uint sql_text_len,
               CHARSET_INFO *client_cs)
 {
-  TABLE *table= general_log.table;
+  TABLE_LIST table_list;
+  TABLE *table;
+  bool result= TRUE;
+  bool need_close= FALSE;
+  bool need_pop= FALSE;
+  bool need_rnd_end= FALSE;
   uint field_index;
+  Silence_log_table_errors error_handler;
+  Open_tables_state open_tables_backup;
+  Field_timestamp *field0;
+  ulonglong save_thd_options;
+  bool save_query_start_used;
+  time_t save_start_time;
+  time_t save_time_after_lock;
+  time_t save_user_time;
+  bool save_time_zone_used;
+
+  save_thd_options= thd->options;
+  thd->options&= ~OPTION_BIN_LOG;
+
+  save_query_start_used= thd->query_start_used;
+  save_start_time= thd->start_time;
+  save_time_after_lock= thd->time_after_lock;
+  save_user_time= thd->user_time;
+  save_time_zone_used= thd->time_zone_used;
+
+  bzero(& table_list, sizeof(TABLE_LIST));
+  table_list.alias= table_list.table_name= GENERAL_LOG_NAME.str;
+  table_list.table_name_length= GENERAL_LOG_NAME.length;
+
+  table_list.lock_type= TL_WRITE_CONCURRENT_INSERT;
+
+  table_list.db= MYSQL_SCHEMA_NAME.str;
+  table_list.db_length= MYSQL_SCHEMA_NAME.length;
+
+  table= open_performance_schema_table(thd, & table_list,
+                                       & open_tables_backup);
+  need_close= TRUE;
+
+  if (!table ||
+      table->file->extra(HA_EXTRA_MARK_AS_LOG_TABLE) ||
+      table->file->ha_rnd_init(0))
+    goto err;
+
+  need_rnd_end= TRUE;
+
+  /* Honor next number columns if present */
+  table->next_number_field= table->found_next_number_field;
 
   /*
     "INSERT INTO general_log" can generate warning sometimes.
-    Let's reset warnings from previous queries,
-    otherwise warning list can grow too much,
-    so thd->query gets spoiled as some point in time,
-    and mysql_parse() receives a broken query.
     QQ: this problem needs to be studied in more details.
-    Probably it's better to suppress warnings in logging INSERTs at all.
-    Comment this line and run "cast.test" to see what's happening:
+    Comment this 2 lines and run "cast.test" to see what's happening:
   */
-  mysql_reset_errors(table->in_use, 1);
-
-  /* below should never happen */
-  if (unlikely(!logger.is_log_tables_initialized))
-    return FALSE;
+  thd->push_internal_handler(& error_handler);
+  need_pop= TRUE;
 
   /*
     NOTE: we do not call restore_record() here, as all fields are
     filled by the Logger (=> no need to load default ones).
   */
 
-  /* Set current time. Required for CURRENT_TIMESTAMP to work */
-  general_log_thd->start_time= event_time;
-
   /*
     We do not set a value for table->field[0], as it will use
     default value (which is CURRENT_TIMESTAMP).
   */
 
   /* check that all columns exist */
-  if (!table->field[1] || !table->field[2] || !table->field[3] ||
-      !table->field[4] || !table->field[5])
+  if (table->s->fields < 6)
     goto err;
 
+  DBUG_ASSERT(table->field[0]->type() == MYSQL_TYPE_TIMESTAMP);
+
+  field0= (Field_timestamp*) (table->field[0]);
+  field0->set_time();
+
   /* do a write */
   if (table->field[1]->store(user_host, user_host_len, client_cs) ||
       table->field[2]->store((longlong) thread_id, TRUE) ||
@@ -500,16 +408,39 @@ bool Log_to_csv_event_handler::
     table->field[field_index]->set_default();
   }
 
-  /* log table entries are not replicated at the moment */
-  tmp_disable_binlog(current_thd);
+  /* log table entries are not replicated */
+  if (table->file->ha_write_row_no_binlog(table->record[0]))
+  {
+    struct tm start;
+    localtime_r(&event_time, &start);
 
-  table->file->ha_write_row(table->record[0]);
+    sql_print_error("%02d%02d%02d %2d:%02d:%02d - Failed to write to mysql.general_log",
+                    start.tm_year % 100, start.tm_mon + 1,
+                    start.tm_mday, start.tm_hour,
+                    start.tm_min, start.tm_sec);
+  }
 
-  reenable_binlog(current_thd);
+  result= FALSE;
 
-  return FALSE;
 err:
-  return TRUE;
+  if (need_rnd_end)
+  {
+    table->file->ha_rnd_end();
+    table->file->ha_release_auto_increment();
+  }
+  if (need_pop)
+    thd->pop_internal_handler();
+  if (need_close)
+    close_performance_schema_table(thd, & open_tables_backup);
+
+  thd->options= save_thd_options;
+
+  thd->query_start_used= save_query_start_used;
+  thd->start_time= save_start_time;
+  thd->time_after_lock= save_time_after_lock;
+  thd->user_time= save_user_time;
+  thd->time_zone_used= save_time_zone_used;
+  return result;
 }
 
 
@@ -548,34 +479,61 @@ bool Log_to_csv_event_handler::
            longlong query_time, longlong lock_time, bool is_command,
            const char *sql_text, uint sql_text_len)
 {
-  /* table variables */
-  TABLE *table= slow_log.table;
+  TABLE_LIST table_list;
+  TABLE *table;
+  bool result= TRUE;
+  bool need_close= FALSE;
+  bool need_rnd_end= FALSE;
+  Open_tables_state open_tables_backup;
+  bool save_query_start_used;
+  time_t save_start_time;
+  time_t save_time_after_lock;
+  time_t save_user_time;
+  bool save_time_zone_used;
   CHARSET_INFO *client_cs= thd->variables.character_set_client;
 
-  DBUG_ENTER("log_slow");
+  DBUG_ENTER("Log_to_csv_event_handler::log_slow");
 
-  /* below should never happen */
-  if (unlikely(!logger.is_log_tables_initialized))
-    return FALSE;
+  bzero(& table_list, sizeof(TABLE_LIST));
+  table_list.alias= table_list.table_name= SLOW_LOG_NAME.str;
+  table_list.table_name_length= SLOW_LOG_NAME.length;
+
+  table_list.lock_type= TL_WRITE_CONCURRENT_INSERT;
+
+  table_list.db= MYSQL_SCHEMA_NAME.str;
+  table_list.db_length= MYSQL_SCHEMA_NAME.length;
+
+  save_query_start_used= thd->query_start_used;
+  save_start_time= thd->start_time;
+  save_time_after_lock= thd->time_after_lock;
+  save_user_time= thd->user_time;
+  save_time_zone_used= thd->time_zone_used;
+
+  table= open_performance_schema_table(thd, & table_list,
+                                       & open_tables_backup);
+  need_close= TRUE;
+
+  if (!table ||
+      table->file->extra(HA_EXTRA_MARK_AS_LOG_TABLE) ||
+      table->file->ha_rnd_init(0))
+    goto err;
+
+  need_rnd_end= TRUE;
+
+  /* Honor next number columns if present */
+  table->next_number_field= table->found_next_number_field;
 
-  /*
-     Set start time for CURRENT_TIMESTAMP to the start of the query.
-     This will be default value for the field[0]
-  */
-  slow_log_thd->start_time= query_start_arg;
   restore_record(table, s->default_values);    // Get empty record
 
+  /* check that all columns exist */
+  if (table->s->fields < 11)
+    goto err;
+
   /*
     We do not set a value for table->field[0], as it will use
     default value.
   */
 
-  if (!table->field[1] || !table->field[2] || !table->field[3] ||
-      !table->field[4] || !table->field[5] || !table->field[6] ||
-      !table->field[7] || !table->field[8] || !table->field[9] ||
-      !table->field[10])
-    goto err;
-
   /* store the value */
   if (table->field[1]->store(user_host, user_host_len, client_cs))
     goto err;
@@ -612,7 +570,6 @@ bool Log_to_csv_event_handler::
     table->field[4]->set_null();
     table->field[5]->set_null();
   }
-
   /* fill database field */
   if (thd->db)
   {
@@ -654,17 +611,71 @@ bool Log_to_csv_event_handler::
   if (table->field[10]->store(sql_text,sql_text_len, client_cs))
     goto err;
 
-  /* log table entries are not replicated at the moment */
-  tmp_disable_binlog(current_thd);
+  /* log table entries are not replicated */
+  if (table->file->ha_write_row_no_binlog(table->record[0]))
+  {
+    struct tm start;
+    localtime_r(&current_time, &start);
 
-  /* write the row */
-  table->file->ha_write_row(table->record[0]);
+    sql_print_error("%02d%02d%02d %2d:%02d:%02d - Failed to write to mysql.slow_log",
+                    start.tm_year % 100, start.tm_mon + 1,
+                    start.tm_mday, start.tm_hour,
+                    start.tm_min, start.tm_sec);
+  }
 
-  reenable_binlog(current_thd);
+  result= FALSE;
 
-  DBUG_RETURN(0);
 err:
-  DBUG_RETURN(1);
+  if (need_rnd_end)
+  {
+    table->file->ha_rnd_end();
+    table->file->ha_release_auto_increment();
+  }
+  if (need_close)
+    close_performance_schema_table(thd, & open_tables_backup);
+
+  thd->query_start_used= save_query_start_used;
+  thd->start_time= save_start_time;
+  thd->time_after_lock= save_time_after_lock;
+  thd->user_time= save_user_time;
+  thd->time_zone_used= save_time_zone_used;
+  DBUG_RETURN(result);
+}
+
+int Log_to_csv_event_handler::
+  activate_log(THD *thd, uint log_table_type)
+{
+  TABLE_LIST table_list;
+  TABLE *table;
+  int result;
+  Open_tables_state open_tables_backup;
+
+  DBUG_ENTER("Log_to_csv_event_handler::activate_log");
+
+  bzero(& table_list, sizeof(TABLE_LIST));
+
+  if (log_table_type == QUERY_LOG_GENERAL)
+  {
+    table_list.alias= table_list.table_name= GENERAL_LOG_NAME.str;
+    table_list.table_name_length= GENERAL_LOG_NAME.length;
+  }
+  else
+  {
+    DBUG_ASSERT(log_table_type == QUERY_LOG_SLOW);
+    table_list.alias= table_list.table_name= SLOW_LOG_NAME.str;
+    table_list.table_name_length= SLOW_LOG_NAME.length;
+  }
+
+  table_list.lock_type= TL_WRITE_CONCURRENT_INSERT;
+
+  table_list.db= MYSQL_SCHEMA_NAME.str;
+  table_list.db_length= MYSQL_SCHEMA_NAME.length;
+
+  table= open_performance_schema_table(thd, & table_list,
+                                       & open_tables_backup);
+  result= (table ? 0 : 1);
+  close_performance_schema_table(thd, & open_tables_backup);
+  DBUG_RETURN(result);
 }
 
 bool Log_to_csv_event_handler::
@@ -697,10 +708,19 @@ bool Log_to_file_event_handler::
            longlong query_time, longlong lock_time, bool is_command,
            const char *sql_text, uint sql_text_len)
 {
-  return mysql_slow_log.write(thd, current_time, query_start_arg,
-                              user_host, user_host_len,
-                              query_time, lock_time, is_command,
-                              sql_text, sql_text_len);
+  bool res;
+
+  (void) pthread_mutex_lock(mysql_slow_log.get_log_lock());
+
+  /* TODO: MYSQL_QUERY_LOG::write is not thread-safe */
+  res= mysql_slow_log.write(thd, current_time, query_start_arg,
+                            user_host, user_host_len,
+                            query_time, lock_time, is_command,
+                            sql_text, sql_text_len);
+
+  (void) pthread_mutex_unlock(mysql_slow_log.get_log_lock());
+
+  return res;
 }
 
 
@@ -710,15 +730,24 @@ bool Log_to_file_event_handler::
 */
 
 bool Log_to_file_event_handler::
-  log_general(time_t event_time, const char *user_host,
+  log_general(THD *thd, time_t event_time, const char *user_host,
               uint user_host_len, int thread_id,
               const char *command_type, uint command_type_len,
               const char *sql_text, uint sql_text_len,
               CHARSET_INFO *client_cs)
 {
-  return mysql_log.write(event_time, user_host, user_host_len,
-                         thread_id, command_type, command_type_len,
-                         sql_text, sql_text_len);
+  bool res;
+
+  (void) pthread_mutex_lock (mysql_log.get_log_lock());
+
+  /* TODO: MYSQL_QUERY_LOG::write is not thread-safe */
+  res= mysql_log.write(event_time, user_host, user_host_len,
+                       thread_id, command_type, command_type_len,
+                       sql_text, sql_text_len);
+
+  (void) pthread_mutex_unlock (mysql_log.get_log_lock());
+
+  return res;
 }
 
 
@@ -787,7 +816,7 @@ bool LOGGER::error_log_print(enum loglevel level, const char *format,
 void LOGGER::cleanup_base()
 {
   DBUG_ASSERT(inited == 1);
-  (void) pthread_mutex_destroy(&LOCK_logger);
+  rwlock_destroy(&LOCK_logger);
   if (table_log_handler)
   {
     table_log_handler->cleanup();
@@ -806,12 +835,6 @@ void LOGGER::cleanup_end()
 }
 
 
-void LOGGER::close_log_table(uint log_table_type, bool lock_in_use)
-{
-  table_log_handler->close_log_table(log_table_type, lock_in_use);
-}
-
-
 /*
   Perform basic log initialization: create file-based log handler and
   init error log.
@@ -833,7 +856,7 @@ void LOGGER::init_base()
   init_error_log(LOG_FILE);
 
   file_log_handler->init_pthread_objects();
-  (void) pthread_mutex_init(&LOCK_logger, MY_MUTEX_INIT_SLOW);
+  my_rwlock_init(&LOCK_logger, NULL);
 }
 
 
@@ -848,29 +871,6 @@ void LOGGER::init_log_tables()
 }
 
 
-bool LOGGER::reopen_log_table(uint log_table_type)
-{
-  return table_log_handler->reopen_log_table(log_table_type);
-}
-
-bool LOGGER::reopen_log_tables()
-{
-    /*
-      we use | and not || here, to ensure that both reopen_log_table
-      are called, even if the first one fails
-    */
-    if ((opt_slow_log && logger.reopen_log_table(QUERY_LOG_SLOW)) |
-        (opt_log && logger.reopen_log_table(QUERY_LOG_GENERAL)))
-      return TRUE;
-    return FALSE;
-}
-
-
-void LOGGER::tmp_close_log_tables(THD *thd)
-{
-  table_log_handler->tmp_close_log_tables(thd);
-}
-
 bool LOGGER::flush_logs(THD *thd)
 {
   int rc= 0;
@@ -879,19 +879,11 @@ bool LOGGER::flush_logs(THD *thd)
     Now we lock logger, as nobody should be able to use logging routines while
     log tables are closed
   */
-  logger.lock();
-  if (logger.is_log_tables_initialized)
-    table_log_handler->tmp_close_log_tables(thd); // the locking happens here
+  logger.lock_exclusive();
 
   /* reopen log files */
   file_log_handler->flush();
 
-  /* reopen tables in the case they were enabled */
-  if (logger.is_log_tables_initialized)
-  {
-    if (reopen_log_tables())
-      rc= TRUE;
-  }
   /* end of log flush */
   logger.unlock();
   return rc;
@@ -939,7 +931,7 @@ bool LOGGER::slow_log_print(THD *thd, const char *query, uint query_length,
     if (thd->slave_thread)
       return 0;
 
-    lock();
+    lock_shared();
     if (!opt_slow_log)
     {
       unlock();
@@ -1011,7 +1003,7 @@ bool LOGGER::general_log_print(THD *thd, enum enum_server_command command,
     else
       id=0;                                     /* Log from connect handler */
 
-    lock();
+    lock_shared();
     if (!opt_log)
     {
       unlock();
@@ -1035,7 +1027,7 @@ bool LOGGER::general_log_print(THD *thd, enum enum_server_command command,
 
     while (*current_handler)
       error+= (*current_handler++)->
-        log_general(current_time, user_host_buff,
+        log_general(thd, current_time, user_host_buff,
                    user_host_len, id,
                    command_name[(uint) command].str,
                    command_name[(uint) command].length,
@@ -1122,35 +1114,42 @@ void LOGGER::init_general_log(uint general_log_printer)
 
 bool LOGGER::activate_log_handler(THD* thd, uint log_type)
 {
-  bool res= 0;
-  lock();
+  bool res= FALSE;
+  lock_exclusive();
   switch (log_type) {
   case QUERY_LOG_SLOW:
     if (!opt_slow_log)
     {
-      if ((res= reopen_log_table(log_type)))
-        goto err;
       file_log_handler->get_mysql_slow_log()->
         open_slow_log(sys_var_slow_log_path.value);
       init_slow_log(log_output_options);
-      opt_slow_log= TRUE;
+      if (table_log_handler->activate_log(thd, QUERY_LOG_SLOW))
+      {
+        /* Error printed by open table in activate_log() */
+        res= TRUE;
+      }
+      else
+        opt_slow_log= TRUE;
     }
     break;
   case QUERY_LOG_GENERAL:
     if (!opt_log)
     {
-      if ((res= reopen_log_table(log_type)))
-        goto err;
       file_log_handler->get_mysql_log()->
         open_query_log(sys_var_general_log_path.value);
       init_general_log(log_output_options);
-      opt_log= TRUE;
+      if (table_log_handler->activate_log(thd, QUERY_LOG_GENERAL))
+      {
+        /* Error printed by open table in activate_log() */
+        res= TRUE;
+      }
+      else
+        opt_log= TRUE;
     }
     break;
   default:
     DBUG_ASSERT(0);
   }
-err:
   unlock();
   return res;
 }
@@ -1158,23 +1157,17 @@ err:
 
 void LOGGER::deactivate_log_handler(THD *thd, uint log_type)
 {
-  TABLE_LIST *table_list;
   my_bool *tmp_opt= 0;
   MYSQL_LOG *file_log;
-  THD *log_thd;
 
   switch (log_type) {
   case QUERY_LOG_SLOW:
-    table_list= &table_log_handler->slow_log;
     tmp_opt= &opt_slow_log;
     file_log= file_log_handler->get_mysql_slow_log();
-    log_thd= table_log_handler->slow_log_thd;
     break;
   case QUERY_LOG_GENERAL:
-    table_list= &table_log_handler->general_log;
     tmp_opt= &opt_log;
     file_log= file_log_handler->get_mysql_log();
-    log_thd= table_log_handler->general_log_thd;
     break;
   default:
     assert(0);                                  // Impossible
@@ -1183,81 +1176,16 @@ void LOGGER::deactivate_log_handler(THD *thd, uint log_type)
   if (!(*tmp_opt))
     return;
 
-  if (is_log_tables_initialized)
-    lock_and_wait_for_table_name(log_thd, table_list);
-  lock();
-
-  if (is_log_tables_initialized)
-  {
-    VOID(pthread_mutex_lock(&LOCK_open));
-    close_log_table(log_type, TRUE);
-    table_list->table= 0;
-    query_cache_invalidate3(log_thd, table_list, 0);
-    unlock_table_name(log_thd, table_list);
-    VOID(pthread_mutex_unlock(&LOCK_open));
-  }
+  lock_exclusive();
   file_log->close(0);
   *tmp_opt= FALSE;
   unlock();
 }
 
 
-/*
-  Close log tables temporarily. The thread which closed
-  them this way can lock them in any mode it needs.
-  NOTE: one should call logger.lock() before entering this
-  function.
-*/
-void Log_to_csv_event_handler::tmp_close_log_tables(THD *thd)
-{
-  TABLE_LIST close_slow_log, close_general_log;
-
-  /* fill lists, we will need to perform operations on tables */
-  bzero((char*) &close_slow_log, sizeof(TABLE_LIST));
-  close_slow_log.alias= close_slow_log.table_name=(char*) "slow_log";
-  close_slow_log.table_name_length= 8;
-  close_slow_log.db= (char*) "mysql";
-  close_slow_log.db_length= 5;
-
-  bzero((char*) &close_general_log, sizeof(TABLE_LIST));
-  close_general_log.alias= close_general_log.table_name=(char*) "general_log";
-  close_general_log.table_name_length= 11;
-  close_general_log.db= (char*) "mysql";
-  close_general_log.db_length= 5;
-
-  privileged_thread= thd;
-
-  VOID(pthread_mutex_lock(&LOCK_open));
-  /*
-    NOTE: in fact, the first parameter used in query_cache_invalidate3()
-    could be any non-NULL THD, as the underlying code makes certain
-    assumptions about this.
-    Here we use one of the logger handler THD's. Simply because it
-    seems appropriate.
-  */
-  if (opt_log)
-  {
-    close_log_table(QUERY_LOG_GENERAL, TRUE);
-    query_cache_invalidate3(general_log_thd, &close_general_log, 0);
-  }
-  if (opt_slow_log)
-  {
-    close_log_table(QUERY_LOG_SLOW, TRUE);
-    query_cache_invalidate3(general_log_thd, &close_slow_log, 0);
-  }
-  VOID(pthread_mutex_unlock(&LOCK_open));
-}
-
 /* the parameters are unused for the log tables */
 bool Log_to_csv_event_handler::init()
 {
-  /*
-    we use | and not || here, to ensure that both open_log_table
-    are called, even if the first one fails
-  */
-  if ((opt_log && open_log_table(QUERY_LOG_GENERAL)) |
-      (opt_slow_log && open_log_table(QUERY_LOG_SLOW)))
-    return 1;
   return 0;
 }
 
@@ -1268,7 +1196,7 @@ int LOGGER::set_handlers(uint error_log_printer,
   /* error log table is not supported yet */
   DBUG_ASSERT(error_log_printer < LOG_TABLE);
 
-  lock();
+  lock_exclusive();
 
   if ((slow_log_printer & LOG_TABLE || general_log_printer & LOG_TABLE) &&
       !is_log_tables_initialized)
@@ -1290,72 +1218,6 @@ int LOGGER::set_handlers(uint error_log_printer,
 }
 
 
-/*
-  Close log table of a given type (general or slow log)
-
-  SYNOPSIS
-    close_log_table()
-
-    log_table_type   type of the log table to close: QUERY_LOG_GENERAL
-                     or QUERY_LOG_SLOW
-    lock_in_use      Set to TRUE if the caller owns LOCK_open. FALSE otherwise.
-
-  DESCRIPTION
-
-    The function closes a log table. It is invoked (1) when we need to reopen
-    log tables (e.g. FLUSH LOGS or TRUNCATE on the log table is being
-    executed) or (2) during shutdown.
-*/
-
-void Log_to_csv_event_handler::
-  close_log_table(uint log_table_type, bool lock_in_use)
-{
-  THD *log_thd, *curr= current_thd;
-  TABLE_LIST *table;
-
-  if (!logger.is_log_table_enabled(log_table_type))
-    return;                                     /* do nothing */
-
-  switch (log_table_type) {
-  case QUERY_LOG_GENERAL:
-    log_thd= general_log_thd;
-    table= &general_log;
-    break;
-  case QUERY_LOG_SLOW:
-    log_thd= slow_log_thd;
-    table= &slow_log;
-    break;
-  default:
-    assert(0);                                  // Impossible
-  }
-
-  /*
-    Set thread stack start for the logger thread. See comment in
-    open_log_table() for details.
-  */
-  if (curr)
-    log_thd->thread_stack= curr->thread_stack;
-  else
-    log_thd->thread_stack= (char*) &log_thd;
-
-  /* close the table */
-  log_thd->store_globals();
-  table->table->file->ha_rnd_end();
-  table->table->file->ha_release_auto_increment();
-  /* discard logger mark before unlock*/
-  table->table->locked_by_logger= FALSE;
-  close_thread_tables(log_thd, lock_in_use);
-
-  if (curr)
-    curr->store_globals();
-  else
-  {
-    my_pthread_setspecific_ptr(THR_THD,  0);
-    my_pthread_setspecific_ptr(THR_MALLOC, 0);
-  }
-}
-
-
  /*
   Save position of binary log transaction cache.
 
diff --git a/sql/log.h b/sql/log.h
index d92e0117bcc..faf6ead450c 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -212,6 +212,10 @@ public:
     return open(generate_name(log_name, ".log", 0, buf), LOG_NORMAL, 0,
                 WRITE_CACHE);
   }
+
+  /* TODO: fix MYSQL_LOG::write to be thread safe instead. */
+  inline pthread_mutex_t* get_log_lock() { return &LOCK_log; }
+
 private:
   time_t last_time;
 };
@@ -398,7 +402,7 @@ public:
                         const char *sql_text, uint sql_text_len)= 0;
   virtual bool log_error(enum loglevel level, const char *format,
                          va_list args)= 0;
-  virtual bool log_general(time_t event_time, const char *user_host,
+  virtual bool log_general(THD *thd, time_t event_time, const char *user_host,
                            uint user_host_len, int thread_id,
                            const char *command_type, uint command_type_len,
                            const char *sql_text, uint sql_text_len,
@@ -412,27 +416,7 @@ int check_if_log_table(uint db_len, const char *db, uint table_name_len,
 
 class Log_to_csv_event_handler: public Log_event_handler
 {
-  /*
-    We create artificial THD for each of the logs. This is to avoid
-    locking issues: we don't want locks on the log tables reside in the
-    THD's of the query. The reason is the locking order and duration.
-  */
-  THD *general_log_thd, *slow_log_thd;
-  /*
-    This is for the thread, which called tmp_close_log_tables. The thread
-    will be allowed to write-lock the log tables (as it explicitly disabled
-    logging). This is used for such operations as REPAIR, which require
-    exclusive lock on the log tables.
-    NOTE: there can be only one priviliged thread, as one should
-    lock logger with logger.lock() before calling tmp_close_log_tables().
-    So no other thread could get privileged status at the same time.
-  */
-  THD *privileged_thread;
   friend class LOGGER;
-  TABLE_LIST general_log, slow_log;
-
-private:
-  bool open_log_table(uint log_type);
 
 public:
   Log_to_csv_event_handler();
@@ -447,18 +431,13 @@ public:
                         const char *sql_text, uint sql_text_len);
   virtual bool log_error(enum loglevel level, const char *format,
                          va_list args);
-  virtual bool log_general(time_t event_time, const char *user_host,
+  virtual bool log_general(THD *thd, time_t event_time, const char *user_host,
                            uint user_host_len, int thread_id,
                            const char *command_type, uint command_type_len,
                            const char *sql_text, uint sql_text_len,
-                            CHARSET_INFO *client_cs);
-  void tmp_close_log_tables(THD *thd);
-  void close_log_table(uint log_type, bool lock_in_use);
-  bool reopen_log_table(uint log_type);
-  THD* get_privileged_thread()
-  {
-    return privileged_thread;
-  }
+                           CHARSET_INFO *client_cs);
+
+  int activate_log(THD *thd, uint log_type);
 };
 
 
@@ -484,7 +463,7 @@ public:
                         const char *sql_text, uint sql_text_len);
   virtual bool log_error(enum loglevel level, const char *format,
                          va_list args);
-  virtual bool log_general(time_t event_time, const char *user_host,
+  virtual bool log_general(THD *thd, time_t event_time, const char *user_host,
                            uint user_host_len, int thread_id,
                            const char *command_type, uint command_type_len,
                            const char *sql_text, uint sql_text_len,
@@ -499,7 +478,7 @@ public:
 /* Class which manages slow, general and error log event handlers */
 class LOGGER
 {
-  pthread_mutex_t LOCK_logger;
+  rw_lock_t LOCK_logger;
   /* flag to check whether logger mutex is initialized */
   uint inited;
 
@@ -519,21 +498,10 @@ public:
   LOGGER() : inited(0), table_log_handler(NULL),
              file_log_handler(NULL), is_log_tables_initialized(FALSE)
   {}
-  void lock() { (void) pthread_mutex_lock(&LOCK_logger); }
-  void unlock() { (void) pthread_mutex_unlock(&LOCK_logger); }
-  void tmp_close_log_tables(THD *thd);
-  bool is_log_table_enabled(uint log_table_type)
-  {
-    switch (log_table_type) {
-    case QUERY_LOG_SLOW:
-      return table_log_handler && table_log_handler->slow_log.table != 0;
-    case QUERY_LOG_GENERAL:
-      return table_log_handler && table_log_handler->general_log.table != 0;
-    default:
-      DBUG_ASSERT(0);
-      return FALSE;                             /* make compiler happy */
-    }
-  }
+  void lock_shared() { rw_rdlock(&LOCK_logger); }
+  void lock_exclusive() { rw_wrlock(&LOCK_logger); }
+  void unlock() { rw_unlock(&LOCK_logger); }
+  bool is_log_table_enabled(uint log_table_type);
   /*
     We want to initialize all log mutexes as soon as possible,
     but we cannot do it in constructor, as safe_mutex relies on
@@ -543,20 +511,6 @@ public:
   void init_base();
   void init_log_tables();
   bool flush_logs(THD *thd);
-  THD *get_general_log_thd()
-  {
-    if (table_log_handler)
-      return (THD *) table_log_handler->general_log_thd;
-    else
-      return NULL;
-  }
-  THD *get_slow_log_thd()
-  {
-    if (table_log_handler)
-      return (THD *) table_log_handler->slow_log_thd;
-    else
-      return NULL;
-  }
   /* Perform basic logger cleanup. this will leave e.g. error log open. */
   void cleanup_base();
   /* Free memory. Nothing could be logged after this function is called */
@@ -568,10 +522,6 @@ public:
   bool general_log_print(THD *thd,enum enum_server_command command,
                          const char *format, va_list args);
 
-  void close_log_table(uint log_type, bool lock_in_use);
-  bool reopen_log_table(uint log_type);
-  bool reopen_log_tables();
-
   /* we use this function to setup all enabled log event handlers */
   int set_handlers(uint error_log_printer,
                    uint slow_log_printer,
@@ -593,19 +543,6 @@ public:
       return file_log_handler->get_mysql_log();
     return NULL;
   }
-  THD* get_privileged_thread()
-  {
-    if (table_log_handler)
-      return table_log_handler->get_privileged_thread();
-    else
-      return NULL;
-  }
-  bool is_privileged_thread(THD *thd)
-  {
-    return thd == get_general_log_thd() ||
-           thd == get_slow_log_thd() ||
-           thd == get_privileged_thread();
-  }
 };
 
 enum enum_binlog_format {
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 7b7bc81957e..1b36d97ad3f 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -944,6 +944,7 @@ void mysql_parse(THD *thd, const char *inBuf, uint length,
 
 bool mysql_test_parse_for_slave(THD *thd,char *inBuf,uint length);
 bool is_update_query(enum enum_sql_command command);
+bool is_log_table_write_query(enum enum_sql_command command);
 bool alloc_query(THD *thd, const char *packet, uint packet_length);
 void mysql_init_select(LEX *lex);
 void mysql_reset_thd_for_next_command(THD *thd);
@@ -1123,7 +1124,8 @@ TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, char *key,
                              uint key_length, uint db_flags, int *error);
 void release_table_share(TABLE_SHARE *share, enum release_type type);
 TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name);
-TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update);
+TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update,
+                   uint lock_flags);
 TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT* mem,
 		  bool *refresh, uint flags);
 bool reopen_name_locked_table(THD* thd, TABLE_LIST* table_list, bool link_in);
@@ -1231,6 +1233,11 @@ void reset_status_vars();
 
 /* information schema */
 extern LEX_STRING INFORMATION_SCHEMA_NAME;
+/* log tables */
+extern LEX_STRING MYSQL_SCHEMA_NAME;
+extern LEX_STRING GENERAL_LOG_NAME;
+extern LEX_STRING SLOW_LOG_NAME;
+
 extern const LEX_STRING partition_keywords[];
 ST_SCHEMA_TABLE *find_schema_table(THD *thd, const char* table_name);
 ST_SCHEMA_TABLE *get_schema_table(enum enum_schema_tables schema_table_idx);
@@ -1557,6 +1564,10 @@ bool open_system_tables_for_read(THD *thd, TABLE_LIST *table_list,
 void close_system_tables(THD *thd, Open_tables_state *backup);
 TABLE *open_system_table_for_update(THD *thd, TABLE_LIST *one_table);
 
+TABLE *open_performance_schema_table(THD *thd, TABLE_LIST *one_table,
+                                     Open_tables_state *backup);
+void close_performance_schema_table(THD *thd, Open_tables_state *backup);
+
 bool close_cached_tables(THD *thd, bool wait_for_refresh, TABLE_LIST *tables, bool have_lock = FALSE);
 bool close_cached_connection_tables(THD *thd, bool wait_for_refresh,
                                     LEX_STRING *connect_string,
@@ -1891,6 +1902,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count,
 #define MYSQL_LOCK_NOTIFY_IF_NEED_REOPEN        0x0004
 #define MYSQL_OPEN_TEMPORARY_ONLY               0x0008
 #define MYSQL_LOCK_IGNORE_GLOBAL_READ_ONLY      0x0010
+#define MYSQL_LOCK_PERF_SCHEMA                  0x0020
 
 void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock);
 void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock);
diff --git a/sql/set_var.cc b/sql/set_var.cc
index bd5234b42be..d21a4c18716 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -2053,21 +2053,15 @@ end:
 
 bool sys_var_log_state::update(THD *thd, set_var *var)
 {
-  bool res= 0;
+  bool res;
   pthread_mutex_lock(&LOCK_global_system_variables);
   if (!var->save_result.ulong_value)
-    logger.deactivate_log_handler(thd, log_type);
-  else
   {
-    if ((res= logger.activate_log_handler(thd, log_type)))
-    {
-      my_error(ER_CANT_ACTIVATE_LOG, MYF(0),
-               log_type == QUERY_LOG_GENERAL ? "general" :
-               "slow query");
-      goto err;
-    }
+    logger.deactivate_log_handler(thd, log_type);
+    res= false;
   }
-err:
+  else
+    res= logger.activate_log_handler(thd, log_type);
   pthread_mutex_unlock(&LOCK_global_system_variables);
   return res;
 }
@@ -2143,7 +2137,7 @@ bool update_sys_var_str_path(THD *thd, sys_var_str *var_str,
   }
 
   pthread_mutex_lock(&LOCK_global_system_variables);
-  logger.lock();
+  logger.lock_exclusive();
 
   if (file_log && log_state)
     file_log->close(0);
@@ -2206,7 +2200,7 @@ static void sys_default_slow_log_path(THD *thd, enum_var_type type)
 bool sys_var_log_output::update(THD *thd, set_var *var)
 {
   pthread_mutex_lock(&LOCK_global_system_variables);
-  logger.lock();
+  logger.lock_exclusive();
   logger.init_slow_log(var->save_result.ulong_value);
   logger.init_general_log(var->save_result.ulong_value);
   *value= var->save_result.ulong_value;
@@ -2219,10 +2213,10 @@ bool sys_var_log_output::update(THD *thd, set_var *var)
 void sys_var_log_output::set_default(THD *thd, enum_var_type type)
 {
   pthread_mutex_lock(&LOCK_global_system_variables);
-  logger.lock();
-  logger.init_slow_log(LOG_TABLE);
-  logger.init_general_log(LOG_TABLE);
-  *value= LOG_TABLE;
+  logger.lock_exclusive();
+  logger.init_slow_log(LOG_FILE);
+  logger.init_general_log(LOG_FILE);
+  *value= LOG_FILE;
   logger.unlock();
   pthread_mutex_unlock(&LOCK_global_system_variables);
 }
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 682eee06e02..966e841ccbf 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5936,8 +5936,8 @@ ER_WARN_DEPRECATED_SYNTAX_WITH_VER
 ER_CANT_WRITE_LOCK_LOG_TABLE
         eng "You can't write-lock a log table. Only read access is possible"
         ger "Eine Log-Tabelle kann nicht schreibgesperrt werden. Es ist ohnehin nur Lesezugriff möglich"
-ER_CANT_READ_LOCK_LOG_TABLE
-        eng "You can't use usual read lock with log tables. Try READ LOCAL instead"
+ER_CANT_LOCK_LOG_TABLE
+        eng "You can't use locks with log tables."
         ger "Log-Tabellen können nicht mit normalen Lesesperren gesperrt werden. Verwenden Sie statt dessen READ LOCAL"
 ER_FOREIGN_DUPLICATE_KEY 23000 S1009
         eng "Upholding foreign key constraints for table '%.192s', entry '%-.192s', key %d would lead to a duplicate entry"
diff --git a/sql/slave.cc b/sql/slave.cc
index 2e8e3f582de..96a105b06e4 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -977,7 +977,7 @@ static int create_table_from_dump(THD* thd, MYSQL *mysql, const char* db,
 
   thd->proc_info = "Opening master dump table";
   tables.lock_type = TL_WRITE;
-  if (!open_ltable(thd, &tables, TL_WRITE))
+  if (!open_ltable(thd, &tables, TL_WRITE, 0))
   {
     sql_print_error("create_table_from_dump: could not open created table");
     goto err;
diff --git a/sql/sp.cc b/sql/sp.cc
index aed4976f839..2111ae8b154 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -1067,7 +1067,7 @@ sp_show_status_routine(THD *thd, int type, const char *name_pattern)
   tables.db= (char*)"mysql";
   tables.table_name= tables.alias= (char*)"proc";
 
-  if (! (table= open_ltable(thd, &tables, TL_READ)))
+  if (! (table= open_ltable(thd, &tables, TL_READ, 0)))
   {
     res= SP_OPEN_TABLE_FAILED;
     goto done;
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 67fa380d313..91f1570f653 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1602,7 +1602,7 @@ bool change_password(THD *thd, const char *host, const char *user,
   }
 #endif
 
-  if (!(table= open_ltable(thd, &tables, TL_WRITE)))
+  if (!(table= open_ltable(thd, &tables, TL_WRITE, 0)))
     DBUG_RETURN(1);
 
   VOID(pthread_mutex_lock(&acl_cache->lock));
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 0cd46a7c6fb..5b63eac35dd 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -902,8 +902,7 @@ bool close_cached_tables(THD *thd, bool if_wait_for_refresh,
     bool found=0;
     for (TABLE_LIST *table= tables; table; table= table->next_local)
     {
-      if ((!table->table || !table->table->s->log_table) &&
-          remove_table_from_cache(thd, table->db, table->table_name,
+      if (remove_table_from_cache(thd, table->db, table->table_name,
                                   RTFC_OWNED_BY_THD_FLAG))
 	found=1;
     }
@@ -951,8 +950,7 @@ bool close_cached_tables(THD *thd, bool if_wait_for_refresh,
           are employed by CREATE TABLE as in this case table simply does not
           exist yet.
         */
-	if (!table->s->log_table &&
-            (table->needs_reopen_or_name_lock() && table->db_stat))
+	if (table->needs_reopen_or_name_lock() && table->db_stat)
 	{
 	  found=1;
           DBUG_PRINT("signal", ("Waiting for COND_refresh"));
@@ -2468,8 +2466,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
                                  &state))
   {
     /*
-      Here we flush tables marked for flush. However we never flush log
-      tables here. They are flushed only on FLUSH LOGS.
+      Here we flush tables marked for flush.
       Normally, table->s->version contains the value of
       refresh_version from the moment when this table was
       (re-)opened and added to the cache.
@@ -2486,7 +2483,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
       c1: name lock t2; -- blocks
       c2: open t1; -- blocks
     */
-    if (table->needs_reopen_or_name_lock() && !table->s->log_table)
+    if (table->needs_reopen_or_name_lock())
     {
       DBUG_PRINT("note",
                  ("Found table '%s.%s' with different refresh version",
@@ -2962,10 +2959,9 @@ void close_old_data_files(THD *thd, TABLE *table, bool morph_locks,
   for (; table ; table=table->next)
   {
     /*
-      Reopen marked for flush. But close log tables. They are flushed only
-      explicitly on FLUSH LOGS
+      Reopen marked for flush.
     */
-    if (table->needs_reopen_or_name_lock() && !table->s->log_table)
+    if (table->needs_reopen_or_name_lock())
     {
       found=1;
       if (table->db_stat)
@@ -3012,10 +3008,6 @@ void close_old_data_files(THD *thd, TABLE *table, bool morph_locks,
   Wait until all threads has closed the tables in the list
   We have also to wait if there is thread that has a lock on this table even
   if the table is closed
-  NOTE: log tables are handled differently by the logging routines.
-        E.g. general_log is always opened and locked by the logger
-        and the table handler used by the logger, will be skipped by
-        this check.
 */
 
 bool table_is_used(TABLE *table, bool wait_for_name_lock)
@@ -3034,10 +3026,10 @@ bool table_is_used(TABLE *table, bool wait_for_name_lock)
          search= (TABLE*) hash_next(&open_cache, (uchar*) key,
                                     key_length, &state))
     {
-      DBUG_PRINT("info", ("share: 0x%lx  locked_by_logger: %d "
+      DBUG_PRINT("info", ("share: 0x%lx  "
                           "open_placeholder: %d  locked_by_name: %d "
                           "db_stat: %u  version: %lu",
-                          (ulong) search->s, search->locked_by_logger,
+                          (ulong) search->s,
                           search->open_placeholder, search->locked_by_name,
                           search->db_stat,
                           search->s->version));
@@ -3049,12 +3041,9 @@ bool table_is_used(TABLE *table, bool wait_for_name_lock)
         - If we are in flush table and we didn't execute the flush
         - If the table engine is open and it's an old version
         (We must wait until all engines are shut down to use the table)
-        However we fo not wait if we encountered a table, locked by the logger.
-        Log tables are managed separately by logging routines.
       */
-      if (!search->locked_by_logger &&
-          (search->locked_by_name && wait_for_name_lock ||
-           (search->is_name_opened() && search->needs_reopen_or_name_lock())))
+      if ( (search->locked_by_name && wait_for_name_lock) ||
+           (search->is_name_opened() && search->needs_reopen_or_name_lock()))
         DBUG_RETURN(1);
     }
   } while ((table=table->next));
@@ -3766,6 +3755,7 @@ static bool check_lock_and_start_stmt(THD *thd, TABLE *table,
     thd			Thread handler
     table_list		Table to open is first table in this list
     lock_type		Lock to use for open
+    lock_flags          Flags passed to mysql_lock_table
 
   NOTE
     This function don't do anything like SP/SF/views/triggers analysis done
@@ -3781,7 +3771,8 @@ static bool check_lock_and_start_stmt(THD *thd, TABLE *table,
       table_list->table		table
 */
 
-TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type)
+TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type,
+                   uint lock_flags)
 {
   TABLE *table;
   bool refresh;
@@ -3816,8 +3807,8 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type)
     {
       DBUG_ASSERT(thd->lock == 0);	// You must lock everything at once
       if ((table->reginfo.lock_type= lock_type) != TL_UNLOCK)
-	if (! (thd->lock= mysql_lock_tables(thd, &table_list->table, 1, 0,
-                                            &refresh)))
+	if (! (thd->lock= mysql_lock_tables(thd, &table_list->table, 1,
+                                            lock_flags, &refresh)))
 	  table= 0;
     }
   }
@@ -4156,11 +4147,6 @@ int lock_tables(THD *thd, TABLE_LIST *tables, uint count, bool *need_reopen)
     DBUG_ASSERT(thd->lock == 0);	// You must lock everything at once
     TABLE **start,**ptr;
     uint lock_flag= MYSQL_LOCK_NOTIFY_IF_NEED_REOPEN;
-    
-    /* Ignore GLOBAL READ LOCK and GLOBAL READ_ONLY if called from a logger */
-    if (logger.is_privileged_thread(thd))
-      lock_flag|= (MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK |
-                   MYSQL_LOCK_IGNORE_GLOBAL_READ_ONLY);
 
     if (!(ptr=start=(TABLE**) thd->alloc(sizeof(TABLE*)*count)))
       DBUG_RETURN(-1);
@@ -7189,7 +7175,6 @@ bool remove_table_from_cache(THD *thd, const char *db, const char *table_name,
       else if (in_use != thd)
       {
         DBUG_PRINT("info", ("Table was in use by other thread"));
-        in_use->some_tables_deleted=1;
         if (table->is_name_opened())
         {
           DBUG_PRINT("info", ("Found another active instance of the table"));
@@ -7625,7 +7610,7 @@ open_system_tables_for_read(THD *thd, TABLE_LIST *table_list,
     if (!table)
       goto error;
 
-    DBUG_ASSERT(table->s->system_table);
+    DBUG_ASSERT(table->s->table_category == TABLE_CATEGORY_SYSTEM);
 
     table->use_all_columns();
     table->reginfo.lock_type= tables->lock_type;
@@ -7692,12 +7677,91 @@ open_system_table_for_update(THD *thd, TABLE_LIST *one_table)
 {
   DBUG_ENTER("open_system_table_for_update");
 
-  TABLE *table= open_ltable(thd, one_table, one_table->lock_type);
+  TABLE *table= open_ltable(thd, one_table, one_table->lock_type, 0);
   if (table)
   {
-    DBUG_ASSERT(table->s->system_table);
+    DBUG_ASSERT(table->s->table_category == TABLE_CATEGORY_SYSTEM);
     table->use_all_columns();
   }
 
   DBUG_RETURN(table);
 }
+
+/**
+  Open a performance schema table.
+  Opening such tables is performed internally in the server
+  implementation, and is a 'nested' open, since some tables
+  might be already opened by the current thread.
+  The thread context before this call is saved, and is restored
+  when calling close_performance_schema_table().
+  @param thd The current thread
+  @param one_table Performance schema table to open
+  @param backup [out] Temporary storage used to save the thread context
+*/
+TABLE *
+open_performance_schema_table(THD *thd, TABLE_LIST *one_table,
+                              Open_tables_state *backup)
+{
+  uint flags= ( MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK
+              | MYSQL_LOCK_IGNORE_GLOBAL_READ_ONLY
+              | MYSQL_LOCK_PERF_SCHEMA );
+
+  DBUG_ENTER("open_performance_schema_table");
+
+  thd->reset_n_backup_open_tables_state(backup);
+
+  TABLE *table= open_ltable(thd, one_table, one_table->lock_type, flags);
+  if (table)
+  {
+    DBUG_ASSERT(table->s->table_category == TABLE_CATEGORY_PERFORMANCE);
+    /* Make sure all columns get assigned to a default value */
+    table->use_all_columns();
+  }
+
+  DBUG_RETURN(table);
+}
+
+/**
+  Close a performance schema table.
+  The last table opened by open_performance_schema_table()
+  is closed, then the thread context is restored.
+  @param thd The current thread
+  @param backup [in] the context to restore.
+*/
+void close_performance_schema_table(THD *thd, Open_tables_state *backup)
+{
+  bool found_old_table;
+
+  if (thd->lock)
+  {
+    /*
+      Note:
+      We do not create explicitly a separate transaction for the
+      performance table I/O, but borrow the current transaction.
+      lock + unlock will autocommit the change done in the
+      performance schema table: this is the expected result.
+      The current transaction should not be affected by this code.
+      TODO: Note that if a transactional engine is used for log tables,
+      this code will need to be revised, as a separate transaction
+      might be needed.
+    */
+    mysql_unlock_tables(thd, thd->lock);
+    thd->lock= 0;
+  }
+
+  safe_mutex_assert_not_owner(&LOCK_open);
+
+  pthread_mutex_lock(&LOCK_open);
+
+  found_old_table= false;
+  while (thd->open_tables)
+    found_old_table|= close_thread_table(thd, &thd->open_tables);
+
+  if (found_old_table)
+    broadcast_refresh();
+
+  pthread_mutex_unlock(&LOCK_open);
+
+  thd->restore_backup_open_tables_state(backup);
+}
+
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 71c13e001ee..d8005c40522 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2438,6 +2438,7 @@ public:
 #define CF_HAS_ROW_COUNT	2
 #define CF_STATUS_COMMAND	4
 #define CF_SHOW_TABLE_COMMAND	8
+#define CF_WRITE_LOGS_COMMAND  16
 
 /* Functions in sql_class.cc */
 
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 7c868092921..7d8fc119cf9 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -906,9 +906,7 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
   char path[FN_REFLEN];
   TABLE *table;
   bool error;
-  uint closed_log_tables= 0, lock_logger= 0;
   uint path_length;
-  uint log_type;
   DBUG_ENTER("mysql_truncate");
 
   bzero((char*) &create_info,sizeof(create_info));
@@ -960,18 +958,6 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
       DBUG_RETURN(TRUE);
   }
 
-  log_type= check_if_log_table(table_list->db_length, table_list->db,
-                               table_list->table_name_length,
-                               table_list->table_name, 1);
-  /* close log tables in use */
-  if (log_type)
-  {
-    lock_logger= 1;
-    logger.lock();
-    logger.close_log_table(log_type, FALSE);
-    closed_log_tables= closed_log_tables | log_type;
-  }
-
   // Remove the .frm extension AIX 5.2 64-bit compiler bug (BUG#16155): this
   // crashes, replacement works.  *(path + path_length - reg_ext_length)=
   // '\0';
@@ -997,14 +983,6 @@ end:
     VOID(pthread_mutex_lock(&LOCK_open));
     unlock_table_name(thd, table_list);
     VOID(pthread_mutex_unlock(&LOCK_open));
-
-    if (opt_slow_log && (closed_log_tables & QUERY_LOG_SLOW))
-      logger.reopen_log_table(QUERY_LOG_SLOW);
-
-    if (opt_log && (closed_log_tables & QUERY_LOG_GENERAL))
-      logger.reopen_log_table(QUERY_LOG_GENERAL);
-    if (lock_logger)
-      logger.unlock();
   }
   else if (error)
   {
diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index 5ebeba6109a..8bdb2e59ed5 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -137,6 +137,9 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
     level= MYSQL_ERROR::WARN_LEVEL_ERROR;
   }
 
+  if (thd->handle_error(code, level))
+    DBUG_RETURN(NULL);
+
   if (thd->spcont &&
       thd->spcont->handle_error(code, level, thd))
   {
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index b747c706f75..dc5db54e128 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -2254,7 +2254,7 @@ pthread_handler_t handle_delayed_insert(void *arg)
   }
 
   /* open table */
-  if (!(di->table=open_ltable(thd,&di->table_list,TL_WRITE_DELAYED)))
+  if (!(di->table=open_ltable(thd, &di->table_list, TL_WRITE_DELAYED, 0)))
   {
     thd->fatal_error();				// Abort waiting inserts
     goto err;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f2a61b7f7c5..c2820581d71 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -197,8 +197,8 @@ void init_update_queries(void)
 
   sql_command_flags[SQLCOM_CREATE_TABLE]=   CF_CHANGES_DATA;
   sql_command_flags[SQLCOM_CREATE_INDEX]=   CF_CHANGES_DATA;
-  sql_command_flags[SQLCOM_ALTER_TABLE]=    CF_CHANGES_DATA;
-  sql_command_flags[SQLCOM_TRUNCATE]=       CF_CHANGES_DATA;
+  sql_command_flags[SQLCOM_ALTER_TABLE]=    CF_CHANGES_DATA | CF_WRITE_LOGS_COMMAND;
+  sql_command_flags[SQLCOM_TRUNCATE]=       CF_CHANGES_DATA | CF_WRITE_LOGS_COMMAND;
   sql_command_flags[SQLCOM_DROP_TABLE]=     CF_CHANGES_DATA;
   sql_command_flags[SQLCOM_LOAD]=           CF_CHANGES_DATA;
   sql_command_flags[SQLCOM_CREATE_DB]=      CF_CHANGES_DATA;
@@ -210,8 +210,8 @@ void init_update_queries(void)
   sql_command_flags[SQLCOM_CREATE_VIEW]=    CF_CHANGES_DATA;
   sql_command_flags[SQLCOM_DROP_VIEW]=      CF_CHANGES_DATA;
   sql_command_flags[SQLCOM_CREATE_EVENT]=   CF_CHANGES_DATA;
-  sql_command_flags[SQLCOM_ALTER_EVENT]=    CF_CHANGES_DATA;
-  sql_command_flags[SQLCOM_DROP_EVENT]=     CF_CHANGES_DATA;  
+  sql_command_flags[SQLCOM_ALTER_EVENT]=    CF_CHANGES_DATA | CF_WRITE_LOGS_COMMAND;
+  sql_command_flags[SQLCOM_DROP_EVENT]=     CF_CHANGES_DATA;
 
   sql_command_flags[SQLCOM_UPDATE]=	    CF_CHANGES_DATA | CF_HAS_ROW_COUNT;
   sql_command_flags[SQLCOM_UPDATE_MULTI]=   CF_CHANGES_DATA | CF_HAS_ROW_COUNT;
@@ -250,6 +250,14 @@ void init_update_queries(void)
   */
   sql_command_flags[SQLCOM_CALL]= 		CF_HAS_ROW_COUNT;
   sql_command_flags[SQLCOM_EXECUTE]= 		CF_HAS_ROW_COUNT;
+
+  /*
+    The following admin table operations are allowed
+    on log tables.
+  */
+  sql_command_flags[SQLCOM_REPAIR]=           CF_WRITE_LOGS_COMMAND;
+  sql_command_flags[SQLCOM_OPTIMIZE]=         CF_WRITE_LOGS_COMMAND;
+  sql_command_flags[SQLCOM_ANALYZE]=          CF_WRITE_LOGS_COMMAND;
 }
 
 
@@ -259,6 +267,17 @@ bool is_update_query(enum enum_sql_command command)
   return (sql_command_flags[command] & CF_CHANGES_DATA) != 0;
 }
 
+/**
+  Check if a sql command is allowed to write to log tables.
+  @param command The SQL command
+  @return true if writing is allowed
+*/
+bool is_log_table_write_query(enum enum_sql_command command)
+{
+  DBUG_ASSERT(command >= 0 && command <= SQLCOM_END);
+  return (sql_command_flags[command] & CF_WRITE_LOGS_COMMAND) != 0;
+}
+
 void execute_init_command(THD *thd, sys_var_str *init_command_var,
 			  rw_lock_t *var_mutex)
 {
@@ -493,7 +512,7 @@ int mysql_table_dump(THD *thd, LEX_STRING *db, char *tbl_name)
   if (lower_case_table_names)
     my_casedn_str(files_charset_info, tbl_name);
 
-  if (!(table=open_ltable(thd, table_list, TL_READ_NO_INSERT)))
+  if (!(table=open_ltable(thd, table_list, TL_READ_NO_INSERT, 0)))
     DBUG_RETURN(1);
 
   if (check_one_table_access(thd, SELECT_ACL, table_list))
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index a44e20b8daf..0d088063462 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -1617,7 +1617,7 @@ bool mysql_install_plugin(THD *thd, const LEX_STRING *name, const LEX_STRING *dl
     DBUG_RETURN(TRUE);
 
   /* need to open before acquiring LOCK_plugin or it will deadlock */
-  if (! (table = open_ltable(thd, &tables, TL_WRITE)))
+  if (! (table = open_ltable(thd, &tables, TL_WRITE, 0)))
     DBUG_RETURN(TRUE);
 
   pthread_mutex_lock(&LOCK_plugin);
@@ -1674,7 +1674,7 @@ bool mysql_uninstall_plugin(THD *thd, const LEX_STRING *name)
   tables.table_name= tables.alias= (char *)"plugin";
 
   /* need to open before acquiring LOCK_plugin or it will deadlock */
-  if (! (table= open_ltable(thd, &tables, TL_WRITE)))
+  if (! (table= open_ltable(thd, &tables, TL_WRITE, 0)))
     DBUG_RETURN(TRUE);
 
   pthread_mutex_lock(&LOCK_plugin);
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index f5e1b8988f3..750bcd50479 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -37,7 +37,6 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
   TABLE_LIST *ren_table= 0;
   int to_table;
   char *rename_log_table[2]= {NULL, NULL};
-  int disable_logs= 0;
   DBUG_ENTER("mysql_rename_tables");
 
   /*
@@ -79,12 +78,6 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
                               ren_table->table_name_length,
                               ren_table->table_name, 1)))
       {
-        /*
-          Log table encoutered we will need to disable and lock logs
-          for duration of rename.
-        */
-        disable_logs= TRUE;
-
         /*
           as we use log_table_rename as an array index, we need it to start
           with 0, while QUERY_LOG_SLOW == 1 and QUERY_LOG_GENERAL == 2.
@@ -136,12 +129,6 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
                  rename_log_table[1]);
       DBUG_RETURN(1);
     }
-
-    if (disable_logs)
-    {
-      logger.lock();
-      logger.tmp_close_log_tables(thd);
-    }
   }
 
   pthread_mutex_lock(&LOCK_open);
@@ -200,13 +187,6 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
   pthread_mutex_unlock(&LOCK_open);
 
 err:
-  /* enable logging back if needed */
-  if (disable_logs)
-  {
-    if (logger.reopen_log_tables())
-      error= TRUE;
-    logger.unlock();
-  }
   start_waiting_global_read_lock(thd);
   DBUG_RETURN(error);
 }
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc
index ac5ea6f4ac4..911372d5f4e 100644
--- a/sql/sql_servers.cc
+++ b/sql/sql_servers.cc
@@ -366,7 +366,7 @@ insert_server(THD *thd, FOREIGN_SERVER *server)
   tables.alias= tables.table_name= (char*) "servers";
 
   /* need to open before acquiring THR_LOCK_plugin or it will deadlock */
-  if (! (table= open_ltable(thd, &tables, TL_WRITE)))
+  if (! (table= open_ltable(thd, &tables, TL_WRITE, 0)))
     goto end;
 
   /* insert the server into the table */
@@ -588,7 +588,7 @@ int drop_server(THD *thd, LEX_SERVER_OPTIONS *server_options)
   if ((error= delete_server_record_in_cache(server_options)))
     goto end;
 
-  if (! (table= open_ltable(thd, &tables, TL_WRITE)))
+  if (! (table= open_ltable(thd, &tables, TL_WRITE, 0)))
   {
     error= my_errno;
     goto end;
@@ -705,7 +705,7 @@ int update_server(THD *thd, FOREIGN_SERVER *existing, FOREIGN_SERVER *altered)
   tables.db= (char*)"mysql";
   tables.alias= tables.table_name= (char*)"servers";
 
-  if (!(table= open_ltable(thd, &tables, TL_WRITE)))
+  if (!(table= open_ltable(thd, &tables, TL_WRITE, 0)))
   {
     error= my_errno;
     goto end;
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 5b8cb93baab..fdd75fbe844 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -2176,9 +2176,6 @@ void calc_sum_of_all_status(STATUS_VAR *to)
 }
 
 
-/* INFORMATION_SCHEMA name */
-LEX_STRING INFORMATION_SCHEMA_NAME= { C_STRING_WITH_LEN("information_schema")};
-
 /* This is only used internally, but we need it here as a forward reference */
 extern ST_SCHEMA_TABLE schema_tables[];
 
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index dc3e72554fa..502600a673f 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1513,7 +1513,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
       table->db_type= share->db_type();
 
     /* Disable drop of enabled log tables */
-    if (share && share->log_table &&
+    if (share && (share->table_category == TABLE_CATEGORY_PERFORMANCE) &&
         check_if_log_table(table->db_length, table->db,
                            table->table_name_length, table->table_name, 1))
     {
@@ -3966,7 +3966,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
   Item *item;
   Protocol *protocol= thd->protocol;
   LEX *lex= thd->lex;
-  int result_code, disable_logs= 0;
+  int result_code;
   DBUG_ENTER("mysql_admin_table");
 
   if (end_active_trans(thd))
@@ -4014,22 +4014,6 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
       if (view_operator_func == NULL)
         table->required_type=FRMTYPE_TABLE;
 
-      /*
-        If we want to perform an admin operation on the log table
-        (E.g. rename) and lock_type >= TL_READ_NO_INSERT disable
-        log tables
-      */
-
-      if (check_if_log_table(table->db_length, table->db,
-                             table->table_name_length,
-                             table->table_name, 1) &&
-          lock_type >= TL_READ_NO_INSERT)
-      {
-        disable_logs= 1;
-        logger.lock();
-        logger.tmp_close_log_tables(thd);
-      }
-
       open_and_lock_tables(thd, table);
       thd->no_warnings_for_error= 0;
       table->next_global= save_next_global;
@@ -4099,8 +4083,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
     }
 
     /* Close all instances of the table to allow repair to rename files */
-    if (lock_type == TL_WRITE && table->table->s->version &&
-        !table->table->s->log_table)
+    if (lock_type == TL_WRITE && table->table->s->version)
     {
       pthread_mutex_lock(&LOCK_open);
       const char *old_message=thd->enter_cond(&COND_refresh, &LOCK_open,
@@ -4258,7 +4241,7 @@ send_result_message:
       close_thread_tables(thd);
       if (!result_code) // recreation went ok
       {
-        if ((table->table= open_ltable(thd, table, lock_type)) &&
+        if ((table->table= open_ltable(thd, table, lock_type, 0)) &&
             ((result_code= table->table->file->analyze(thd, check_opt)) > 0))
           result_code= 0; // analyze went ok
       }
@@ -4324,10 +4307,9 @@ send_result_message:
     }
     if (table->table)
     {
-      /* in the below check we do not refresh the log tables */
       if (fatal_error)
         table->table->s->version=0;               // Force close of table
-      else if (open_for_modify && !table->table->s->log_table)
+      else if (open_for_modify)
       {
         if (table->table->s->tmp_table)
           table->table->file->info(HA_STATUS_CONST);
@@ -4350,24 +4332,11 @@ send_result_message:
   }
 
   send_eof(thd);
-  if (disable_logs)
-  {
-    if (logger.reopen_log_tables())
-      my_error(ER_CANT_ACTIVATE_LOG, MYF(0));
-    logger.unlock();
-  }
   DBUG_RETURN(FALSE);
 
  err:
   ha_autocommit_or_rollback(thd, 1);
   close_thread_tables(thd);			// Shouldn't be needed
-  /* enable logging back if needed */
-  if (disable_logs)
-  {
-    if (logger.reopen_log_tables())
-      my_error(ER_CANT_ACTIVATE_LOG, MYF(0));
-    logger.unlock();
-  }
   if (table)
     table->table=0;
   DBUG_RETURN(TRUE);
@@ -4812,7 +4781,7 @@ mysql_discard_or_import_tablespace(THD *thd,
    not complain when we lock the table
  */
   thd->tablespace_op= TRUE;
-  if (!(table=open_ltable(thd,table_list,TL_WRITE)))
+  if (!(table=open_ltable(thd, table_list, TL_WRITE, 0)))
   {
     thd->tablespace_op=FALSE;
     DBUG_RETURN(-1);
@@ -5728,7 +5697,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
 #ifdef WITH_PARTITION_STORAGE_ENGINE
       if (alter_info->flags & ALTER_PARTITION)
       {
-	my_error(ER_WRONG_USAGE, MYF(0), "PARTITION", "log table");
+        my_error(ER_WRONG_USAGE, MYF(0), "PARTITION", "log table");
         DBUG_RETURN(TRUE);
       }
 #endif
@@ -5817,7 +5786,7 @@ view_err:
     start_waiting_global_read_lock(thd);
     DBUG_RETURN(error);
   }
-  if (!(table=open_ltable(thd,table_list,TL_WRITE_ALLOW_READ)))
+  if (!(table=open_ltable(thd, table_list, TL_WRITE_ALLOW_READ, 0)))
     DBUG_RETURN(TRUE);
   table->use_all_columns();
 
@@ -6986,7 +6955,7 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables,
 
     strxmov(table_name, table->db ,".", table->table_name, NullS);
 
-    t= table->table= open_ltable(thd, table, TL_READ);
+    t= table->table= open_ltable(thd, table, TL_READ, 0);
     thd->clear_error();			// these errors shouldn't get client
 
     protocol->prepare_for_resend();
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 8361fc64f33..10bb7844d88 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -472,7 +472,7 @@ int mysql_create_function(THD *thd,udf_func *udf)
   tables.db= (char*) "mysql";
   tables.table_name= tables.alias= (char*) "func";
   /* Allow creation of functions even if we can't open func table */
-  if (!(table = open_ltable(thd,&tables,TL_WRITE)))
+  if (!(table = open_ltable(thd, &tables, TL_WRITE, 0)))
     goto err;
   table->use_all_columns();
   restore_record(table, s->default_values);	// Default values for fields
@@ -547,7 +547,7 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name)
   bzero((char*) &tables,sizeof(tables));
   tables.db=(char*) "mysql";
   tables.table_name= tables.alias= (char*) "func";
-  if (!(table = open_ltable(thd,&tables,TL_WRITE)))
+  if (!(table = open_ltable(thd, &tables, TL_WRITE, 0)))
     goto err;
   table->use_all_columns();
   table->field[0]->store(exact_name_str, exact_name_len, &my_charset_bin);
diff --git a/sql/table.cc b/sql/table.cc
index 5ac43343934..fef63170ea6 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -21,6 +21,18 @@
 #include <m_ctype.h>
 #include "md5.h"
 
+/* INFORMATION_SCHEMA name */
+LEX_STRING INFORMATION_SCHEMA_NAME= {C_STRING_WITH_LEN("information_schema")};
+
+/* MYSQL_SCHEMA name */
+LEX_STRING MYSQL_SCHEMA_NAME= {C_STRING_WITH_LEN("mysql")};
+
+/* GENERAL_LOG name */
+LEX_STRING GENERAL_LOG_NAME= {C_STRING_WITH_LEN("general_log")};
+
+/* SLOW_LOG name */
+LEX_STRING SLOW_LOG_NAME= {C_STRING_WITH_LEN("slow_log")};
+
 	/* Functions defined in this file */
 
 void open_table_error(TABLE_SHARE *share, int error, int db_errno,
@@ -31,6 +43,7 @@ static void fix_type_pointers(const char ***array, TYPELIB *point_to_type,
 			      uint types, char **names);
 static uint find_field(Field **fields, uchar *record, uint start, uint length);
 
+inline bool is_system_table_name(const char *name, uint length);
 
 /**************************************************************************
   Object_creation_ctx implementation.
@@ -192,6 +205,49 @@ char *fn_rext(char *name)
   return name + strlen(name);
 }
 
+TABLE_CATEGORY get_table_category(const LEX_STRING *db, const LEX_STRING *name)
+{
+  DBUG_ASSERT(db != NULL);
+  DBUG_ASSERT(name != NULL);
+
+  if ((db->length == INFORMATION_SCHEMA_NAME.length) &&
+      (my_strcasecmp(system_charset_info,
+                    INFORMATION_SCHEMA_NAME.str,
+                    db->str) == 0))
+  {
+    return TABLE_CATEGORY_INFORMATION;
+  }
+
+  if ((db->length == MYSQL_SCHEMA_NAME.length) &&
+      (my_strcasecmp(system_charset_info,
+                    MYSQL_SCHEMA_NAME.str,
+                    db->str) == 0))
+  {
+    if (is_system_table_name(name->str, name->length))
+    {
+      return TABLE_CATEGORY_SYSTEM;
+    }
+
+    if ((name->length == GENERAL_LOG_NAME.length) &&
+        (my_strcasecmp(system_charset_info,
+                      GENERAL_LOG_NAME.str,
+                      name->str) == 0))
+    {
+      return TABLE_CATEGORY_PERFORMANCE;
+    }
+
+    if ((name->length == SLOW_LOG_NAME.length) &&
+        (my_strcasecmp(system_charset_info,
+                      SLOW_LOG_NAME.str,
+                      name->str) == 0))
+    {
+      return TABLE_CATEGORY_PERFORMANCE;
+    }
+  }
+
+  return TABLE_CATEGORY_USER;
+}
+
 
 /*
   Allocate a setup TABLE_SHARE structure
@@ -297,7 +353,8 @@ void init_tmp_table_share(TABLE_SHARE *share, const char *key,
 
   bzero((char*) share, sizeof(*share));
   init_sql_alloc(&share->mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
-  share->tmp_table=  	         INTERNAL_TMP_TABLE;
+  share->table_category=         TABLE_CATEGORY_TEMPORARY;
+  share->tmp_table=              INTERNAL_TMP_TABLE;
   share->db.str=                 (char*) key;
   share->db.length=		 strlen(key);
   share->table_cache_key.str=    (char*) key;
@@ -544,28 +601,11 @@ int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags)
     *root_ptr= &share->mem_root;
     error= open_binary_frm(thd, share, head, file);
     *root_ptr= old_root;
-
-    if (share->db.length == 5 && !(lower_case_table_names ?
-        my_strcasecmp(system_charset_info, share->db.str, "mysql") :
-        strcmp(share->db.str, "mysql")))
-    {
-      /*
-        We can't mark all tables in 'mysql' database as system since we don't
-        allow to lock such tables for writing with any other tables (even with
-        other system tables) and some privilege tables need this.
-      */
-      share->system_table= is_system_table_name(share->table_name.str,
-                                                share->table_name.length);
-      if (!share->system_table)
-      {
-        share->log_table= check_if_log_table(share->db.length, share->db.str,
-                                             share->table_name.length,
-                                             share->table_name.str, 0);
-      }
-    }
     error_given= 1;
   }
 
+  share->table_category= get_table_category(& share->db, & share->table_name);
+
   if (!error)
     thd->status_var.opened_shares++;
 
diff --git a/sql/table.h b/sql/table.h
index 494b74d564c..77d8e819d3e 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -140,6 +140,100 @@ class Field_timestamp;
 class Field_blob;
 class Table_triggers_list;
 
+/**
+  Category of table found in the table share.
+*/
+enum enum_table_category
+{
+  /**
+    Unknown value.
+  */
+  TABLE_UNKNOWN_CATEGORY=0,
+
+  /**
+    Temporary table.
+    The table is visible only in the session.
+    Therefore,
+    - FLUSH TABLES WITH READ LOCK
+    - SET GLOBAL READ_ONLY = ON
+    do not apply to this table.
+    Note that LOCK TABLE <t> FOR READ/WRITE
+    can be used on temporary tables.
+    Temporary tables are not part of the table cache.
+  */
+  TABLE_CATEGORY_TEMPORARY=1,
+
+  /**
+    User table.
+    These tables do honor:
+    - LOCK TABLE <t> FOR READ/WRITE
+    - FLUSH TABLES WITH READ LOCK
+    - SET GLOBAL READ_ONLY = ON
+    User tables are cached in the table cache.
+  */
+  TABLE_CATEGORY_USER=2,
+
+  /**
+    System table, maintained by the server.
+    These tables do honor:
+    - LOCK TABLE <t> FOR READ/WRITE
+    - FLUSH TABLES WITH READ LOCK
+    - SET GLOBAL READ_ONLY = ON
+    Typically, writes to system tables are performed by
+    the server implementation, not explicitly be a user.
+    System tables are cached in the table cache.
+  */
+  TABLE_CATEGORY_SYSTEM=3,
+
+  /**
+    Information schema tables.
+    These tables are an interface provided by the system
+    to inspect the system metadata.
+    These tables do *not* honor:
+    - LOCK TABLE <t> FOR READ/WRITE
+    - FLUSH TABLES WITH READ LOCK
+    - SET GLOBAL READ_ONLY = ON
+    as there is no point in locking explicitely
+    an INFORMATION_SCHEMA table.
+    Nothing is directly written to information schema tables.
+    Note that this value is not used currently,
+    since information schema tables are not shared,
+    but implemented as session specific temporary tables.
+  */
+  /*
+    TODO: Fixing the performance issues of I_S will lead
+    to I_S tables in the table cache, which should use
+    this table type.
+  */
+  TABLE_CATEGORY_INFORMATION=4,
+
+  /**
+    Performance schema tables.
+    These tables are an interface provided by the system
+    to inspect the system performance data.
+    These tables do *not* honor:
+    - LOCK TABLE <t> FOR READ/WRITE
+    - FLUSH TABLES WITH READ LOCK
+    - SET GLOBAL READ_ONLY = ON
+    as there is no point in locking explicitely
+    a PERFORMANCE_SCHEMA table.
+    An example of PERFORMANCE_SCHEMA tables are:
+    - mysql.slow_log
+    - mysql.general_log,
+    which *are* updated even when there is either
+    a GLOBAL READ LOCK or a GLOBAL READ_ONLY in effect.
+    User queries do not write directly to these tables
+    (there are exceptions for log tables).
+    The server implementation perform writes.
+    Performance tables are cached in the table cache.
+  */
+  TABLE_CATEGORY_PERFORMANCE=5
+};
+typedef enum enum_table_category TABLE_CATEGORY;
+
+TABLE_CATEGORY get_table_category(const LEX_STRING *db,
+                                  const LEX_STRING *name);
+
 /*
   This structure is shared between different table objects. There is one
   instance of table share per one table in the database.
@@ -148,6 +242,10 @@ class Table_triggers_list;
 typedef struct st_table_share
 {
   st_table_share() {}                    /* Remove gcc warning */
+
+  /** Category of this table. */
+  TABLE_CATEGORY table_category;
+
   /* hash of field names (contains pointers to elements of field array) */
   HASH	name_hash;			/* hash of field names */
   MEM_ROOT mem_root;
@@ -259,18 +357,6 @@ typedef struct st_table_share
   */
   int cached_row_logging_check;
 
-  /*
-    TRUE if this is a system table like 'mysql.proc', which we want to be
-    able to open and lock even when we already have some tables open and
-    locked. To avoid deadlocks we have to put certain restrictions on
-    locking of this table for writing. FALSE - otherwise.
-  */
-  bool system_table;
-  /*
-    This flag is set for the log tables. Used during FLUSH instances to skip
-    log tables, while closing tables (since logs must be always available)
-  */
-  bool log_table;
 #ifdef WITH_PARTITION_STORAGE_ENGINE
   bool auto_partitioned;
   const char *partition_info;
@@ -334,6 +420,16 @@ typedef struct st_table_share
     set_table_cache_key(key_buff, key_length);
   }
 
+  inline bool honor_global_locks()
+  {
+    return ((table_category == TABLE_CATEGORY_USER)
+            || (table_category == TABLE_CATEGORY_SYSTEM));
+  }
+
+  inline bool require_write_privileges()
+  {
+    return (table_category == TABLE_CATEGORY_PERFORMANCE);
+  }
 } TABLE_SHARE;
 
 
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 34c1fcde58d..00ca2a6c07f 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -786,18 +786,6 @@ void ha_tina::update_status()
 }
 
 
-bool ha_tina::check_if_locking_is_allowed(uint sql_command,
-                                          ulong type, TABLE *table,
-                                          uint count, uint current,
-                                          uint *system_count,
-                                          bool called_by_privileged_thread)
-{
-  if (!called_by_privileged_thread)
-    return check_if_log_table_locking_is_allowed(sql_command, type, table);
-
-  return TRUE;
-}
-
 /*
   Open a database file. Keep in mind that tables are caches, so
   this will not be called for every request. Any sort of positions
diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h
index 5bb3e9a79a0..5ce09783b9b 100644
--- a/storage/csv/ha_tina.h
+++ b/storage/csv/ha_tina.h
@@ -131,11 +131,6 @@ public:
   */
   ha_rows estimate_rows_upper_bound() { return HA_POS_ERROR; }
 
-  virtual bool check_if_locking_is_allowed(uint sql_command,
-                                           ulong type, TABLE *table,
-                                           uint count, uint current,
-                                           uint *system_count,
-                                           bool called_by_logger_thread);
   int open(const char *name, int mode, uint open_options);
   int close(void);
   int write_row(uchar * buf);
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index c86459ae0a7..77334b2cfba 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -607,41 +607,7 @@ err:
 #endif /* HAVE_REPLICATION */
 
 
-bool ha_myisam::check_if_locking_is_allowed(uint sql_command,
-                                            ulong type, TABLE *table,
-                                            uint count, uint current,
-                                            uint *system_count,
-                                            bool called_by_privileged_thread)
-{
-  /*
-    To be able to open and lock for reading system tables like 'mysql.proc',
-    when we already have some tables opened and locked, and avoid deadlocks
-    we have to disallow write-locking of these tables with any other tables.
-  */
-  if (table->s->system_table &&
-      table->reginfo.lock_type >= TL_WRITE_ALLOW_WRITE)
-    (*system_count)++;
-
-  /* 'current' is an index, that's why '<=' below. */
-  if (*system_count > 0 && *system_count <= current)
-  {
-    my_error(ER_WRONG_LOCK_OF_SYSTEM_TABLE, MYF(0));
-    return FALSE;
-  }
-
-  /*
-    Deny locking of the log tables, which is incompatible with
-    concurrent insert. Unless called from a logger THD (general_log_thd
-    or slow_log_thd) or by a privileged thread.
-  */
-  if (!called_by_privileged_thread)
-    return check_if_log_table_locking_is_allowed(sql_command, type, table);
-
-  return TRUE;
-}
-
-	/* Name is here without an extension */
-
+/* Name is here without an extension */
 int ha_myisam::open(const char *name, int mode, uint test_if_locked)
 {
   MI_KEYDEF *keyinfo;
diff --git a/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h
index 024675075c2..635f314b3da 100644
--- a/storage/myisam/ha_myisam.h
+++ b/storage/myisam/ha_myisam.h
@@ -60,11 +60,6 @@ class ha_myisam: public handler
   uint max_supported_key_part_length() const { return MI_MAX_KEY_LENGTH; }
   uint checksum() const;
 
-  virtual bool check_if_locking_is_allowed(uint sql_command,
-                                           ulong type, TABLE *table,
-                                           uint count, uint current,
-                                           uint *system_count,
-                                           bool called_by_logger_thread);
   int open(const char *name, int mode, uint test_if_locked);
   int close(void);
   int write_row(uchar * buf);

From e92ce5d56c66a96be64d3e64fea84bf66dae0b73 Mon Sep 17 00:00:00 2001
From: unknown <svoj@mysql.com/june.mysql.com>
Date: Fri, 27 Jul 2007 14:30:25 +0500
Subject: [PATCH 069/139] BUG#29957 - alter_table.test fails

INSERT/DELETE/UPDATE followed by ALTER TABLE within LOCK TABLES
may cause table corruption on Windows.

That happens because ALTER TABLE writes outdated shared state
info into index file.

Fixed by removing obsolete workaround.

Affects MyISAM tables on Windows only.


myisam/mi_extra.c:
  On windows when mi_extra(HA_EXTRA_PREPARE_FOR_DELETE) is called,
  we release external lock and close index file. If we're in LOCK
  TABLES, MyISAM state info doesn't get updated until UNLOCK TABLES.

  That means when we release external lock and we're in LOCK TABLES,
  we may write outdated state info.

  As SQL layer closes all table instances, we do not need this
  workaround anymore.
mysql-test/r/alter_table.result:
  A test case for BUG#29957.
mysql-test/t/alter_table.test:
  A test case for BUG#29957.
---
 myisam/mi_extra.c               |  2 +-
 mysql-test/r/alter_table.result | 12 ++++++++++++
 mysql-test/t/alter_table.test   | 12 ++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/myisam/mi_extra.c b/myisam/mi_extra.c
index 5eb5010ad8c..71e65153eac 100644
--- a/myisam/mi_extra.c
+++ b/myisam/mi_extra.c
@@ -278,7 +278,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg)
   case HA_EXTRA_PREPARE_FOR_DELETE:
     pthread_mutex_lock(&THR_LOCK_myisam);
     share->last_version= 0L;			/* Impossible version */
-#ifdef __WIN__
+#ifdef __WIN__REMOVE_OBSOLETE_WORKAROUND
     /* Close the isam and data files as Win32 can't drop an open table */
     pthread_mutex_lock(&share->intern_lock);
     if (flush_key_blocks(share->key_cache, share->kfile,
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index 4eace9ac628..f24a1788404 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -903,3 +903,15 @@ f1	f2	f21	f4	f41
 1	2000-01-01 00:00:00	2000-01-01	2002-02-02 00:00:00	2002-02-02
 drop table t1;
 set sql_mode= @orig_sql_mode;
+create table t1 (c char(10) default "Two");
+lock table t1 write;
+insert into t1 values ();
+alter table t1 modify c char(10) default "Three";
+unlock tables;
+select * from t1;
+c
+Two
+check table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+drop table t1;
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
index 3ced1087757..bcca122f9f8 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@@ -684,3 +684,15 @@ alter table t1 add column f4 datetime not null default '2002-02-02',
 select * from t1;
 drop table t1;
 set sql_mode= @orig_sql_mode;
+
+#
+# BUG#29957 - alter_table.test fails
+#
+create table t1 (c char(10) default "Two");
+lock table t1 write;
+insert into t1 values ();
+alter table t1 modify c char(10) default "Three";
+unlock tables;
+select * from t1;
+check table t1;
+drop table t1;

From 13c679124f2f0e6ebe23aa0cd484e1bcc4896619 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Fri, 27 Jul 2007 14:28:36 +0300
Subject: [PATCH 070/139] 5.0-opt -> 5.1-opt merge of the test case for bug
 29571:  - reset the logs before and after the test.  - cleanup from the
 previous tests : use the correct schema.

mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
  5.0-opt -> 5.1-opt merge of the test case for bug 29571.
mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result:
  5.0-opt -> 5.1-opt merge of the test case for bug 29571.
---
 .../extra/rpl_tests/rpl_insert_delayed.test   | 15 +++++-
 .../suite/rpl/r/rpl_stm_insert_delayed.result | 52 +++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
index 9364bcbec48..1dc14748688 100644
--- a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
+++ b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
@@ -83,12 +83,19 @@ connection master;
 USE test;
 DROP SCHEMA mysqlslap;
 sync_slave_with_master;
+use test;
 connection master;
 
 #
 # Bug #29571: INSERT DELAYED IGNORE written to binary log on the master but
 # on the slave
 #
+#flush the logs before the test
+connection slave;
+FLUSH LOGS;
+connection master;
+FLUSH LOGS;
+
 CREATE TABLE t1(a int, UNIQUE(a));
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
@@ -96,14 +103,14 @@ flush table t1; # to wait for INSERT DELAYED to be done
 
 #must show two INSERT DELAYED
 --replace_column 1 x 2 x 3 x 4 x 5 x
-show binlog events limit 11,100;
+show binlog events in 'master-bin.000002' LIMIT 2,2;
 select * from t1;
 
 sync_slave_with_master;
 echo On slave;
 #must show two INSERT DELAYED
 --replace_column 1 x 2 x 3 x 4 x 5 x
-show binlog events limit 12,100;
+show binlog events in 'slave-bin.000002' LIMIT 2,2;
 select * from t1;
 
 
@@ -111,6 +118,10 @@ select * from t1;
 connection master;
 drop table t1;
 sync_slave_with_master;
+#flush the logs after the test
+FLUSH LOGS;
 connection master;
+FLUSH LOGS;
+
 
 --echo End of 5.0 tests
diff --git a/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result b/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
index 1c003856eb9..5ca0ea2b780 100644
--- a/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
+++ b/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
@@ -45,6 +45,32 @@ id	name
 20	is Bond
 USE test;
 DROP SCHEMA mysqlslap;
+use test;
+FLUSH LOGS;
+FLUSH LOGS;
+CREATE TABLE t1(a int, UNIQUE(a));
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+flush table t1;
+show binlog events in 'master-bin.000002' LIMIT 2,2;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+select * from t1;
+a
+1
+On slave
+show binlog events in 'slave-bin.000002' LIMIT 2,2;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+select * from t1;
+a
+1
+drop table t1;
+FLUSH LOGS;
+FLUSH LOGS;
+End of 5.0 tests
 set @@global.binlog_format = mixed;
 CREATE SCHEMA IF NOT EXISTS mysqlslap;
 USE mysqlslap;
@@ -85,4 +111,30 @@ id	name
 20	is Bond
 USE test;
 DROP SCHEMA mysqlslap;
+use test;
+FLUSH LOGS;
+FLUSH LOGS;
+CREATE TABLE t1(a int, UNIQUE(a));
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+flush table t1;
+show binlog events in 'master-bin.000002' LIMIT 2,2;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+select * from t1;
+a
+1
+On slave
+show binlog events in 'slave-bin.000002' LIMIT 2,2;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+select * from t1;
+a
+1
+drop table t1;
+FLUSH LOGS;
+FLUSH LOGS;
+End of 5.0 tests
 set @@global.binlog_format = @old_global_binlog_format;

From 072db2f2e4f187dd06c6f637acadddedca00e940 Mon Sep 17 00:00:00 2001
From: unknown <joerg@debian.(none)>
Date: Fri, 27 Jul 2007 13:32:32 +0200
Subject: [PATCH 071/139] Fix a bad BitKeeper dependency structure for the
 "funcs_1" suite:

The files below "mysql-test/suite/funcs_1" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.

Step 1:
Foreach file F in the suite that has a "deleted" counterpart D, use
    bk rm $F
    bk mv $D $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.


BitKeeper/deleted/.del-bitdata_master.test~6c37e095e0a9add9:
  Delete: mysql-test/suite/funcs_1/bitdata/bitdata_master.test
BitKeeper/deleted/.del-cursors_master.test~9dcdbd03ab922cc0:
  Delete: mysql-test/suite/funcs_1/cursors/cursors_master.test
mysql-test/suite/funcs_1/bitdata/bitdata_master.test:
  Rename: BitKeeper/deleted/.del-bitdata_master.test -> mysql-test/suite/funcs_1/bitdata/bitdata_master.test
BitKeeper/deleted/.del-innodb_tb1.txt~7aac0fc74aa9562b:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb1.txt
BitKeeper/deleted/.del-innodb_tb2.txt~9e942b8278568a29:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb2.txt
mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Rename: BitKeeper/deleted/.del-cursors_master.test -> mysql-test/suite/funcs_1/cursors/cursors_master.test
mysql-test/suite/funcs_1/data/innodb_tb1.txt:
  Rename: BitKeeper/deleted/.del-innodb_tb1.txt -> mysql-test/suite/funcs_1/data/innodb_tb1.txt
mysql-test/suite/funcs_1/data/innodb_tb2.txt:
  Rename: BitKeeper/deleted/.del-innodb_tb2.txt -> mysql-test/suite/funcs_1/data/innodb_tb2.txt
BitKeeper/deleted/.del-innodb_tb3.txt~2799425a5cda8773:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb3.txt
BitKeeper/deleted/.del-innodb_tb4.txt~4944d7e7a6e18007:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb4.txt
mysql-test/suite/funcs_1/data/innodb_tb3.txt:
  Rename: BitKeeper/deleted/.del-innodb_tb3.txt -> mysql-test/suite/funcs_1/data/innodb_tb3.txt
mysql-test/suite/funcs_1/data/innodb_tb4.txt:
  Rename: BitKeeper/deleted/.del-innodb_tb4.txt -> mysql-test/suite/funcs_1/data/innodb_tb4.txt
BitKeeper/deleted/.del-memory_tb1.txt~6132f28bde92b74d:
  Delete: mysql-test/suite/funcs_1/data/memory_tb1.txt
BitKeeper/deleted/.del-memory_tb2.txt~e989d4cca5cc4383:
  Delete: mysql-test/suite/funcs_1/data/memory_tb2.txt
BitKeeper/deleted/.del-memory_tb3.txt~41d0c3a6f93c7943:
  Delete: mysql-test/suite/funcs_1/data/memory_tb3.txt
mysql-test/suite/funcs_1/data/memory_tb1.txt:
  Rename: BitKeeper/deleted/.del-memory_tb1.txt -> mysql-test/suite/funcs_1/data/memory_tb1.txt
mysql-test/suite/funcs_1/data/memory_tb2.txt:
  Rename: BitKeeper/deleted/.del-memory_tb2.txt -> mysql-test/suite/funcs_1/data/memory_tb2.txt
mysql-test/suite/funcs_1/data/memory_tb3.txt:
  Rename: BitKeeper/deleted/.del-memory_tb3.txt -> mysql-test/suite/funcs_1/data/memory_tb3.txt
BitKeeper/deleted/.del-memory_tb4.txt~c2e1ba0cb221343c:
  Delete: mysql-test/suite/funcs_1/data/memory_tb4.txt
BitKeeper/deleted/.del-myisam_tb1.txt~7f1338ea22ef2ddd:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb1.txt
mysql-test/suite/funcs_1/data/memory_tb4.txt:
  Rename: BitKeeper/deleted/.del-memory_tb4.txt -> mysql-test/suite/funcs_1/data/memory_tb4.txt
mysql-test/suite/funcs_1/data/myisam_tb1.txt:
  Rename: BitKeeper/deleted/.del-myisam_tb1.txt -> mysql-test/suite/funcs_1/data/myisam_tb1.txt
BitKeeper/deleted/.del-myisam_tb2.txt~274fcaf6c68cd806:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb2.txt
BitKeeper/deleted/.del-myisam_tb3.txt~79980a26498bc43:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb3.txt
BitKeeper/deleted/.del-myisam_tb4.txt~f6911545af0083a1:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb4.txt
mysql-test/suite/funcs_1/data/myisam_tb2.txt:
  Rename: BitKeeper/deleted/.del-myisam_tb2.txt -> mysql-test/suite/funcs_1/data/myisam_tb2.txt
mysql-test/suite/funcs_1/data/myisam_tb3.txt:
  Rename: BitKeeper/deleted/.del-myisam_tb3.txt -> mysql-test/suite/funcs_1/data/myisam_tb3.txt
BitKeeper/deleted/.del-t3.txt~6ae31465f2e71150:
  Delete: mysql-test/suite/funcs_1/data/t3.txt
BitKeeper/deleted/.del-t4.txt~ea4aa3bb29a89198:
  Delete: mysql-test/suite/funcs_1/data/t4.txt
mysql-test/suite/funcs_1/data/myisam_tb4.txt:
  Rename: BitKeeper/deleted/.del-myisam_tb4.txt -> mysql-test/suite/funcs_1/data/myisam_tb4.txt
mysql-test/suite/funcs_1/data/t3.txt:
  Rename: BitKeeper/deleted/.del-t3.txt -> mysql-test/suite/funcs_1/data/t3.txt
mysql-test/suite/funcs_1/data/t4.txt:
  Rename: BitKeeper/deleted/.del-t4.txt -> mysql-test/suite/funcs_1/data/t4.txt
BitKeeper/deleted/.del-datadict_bug_12777.inc~672dfea7d7dba2b8:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
BitKeeper/deleted/.del-t7.txt~eede0d702e02d5bf:
  Delete: mysql-test/suite/funcs_1/data/t7.txt
BitKeeper/deleted/.del-t9.txt~3df18021c8994cfa:
  Delete: mysql-test/suite/funcs_1/data/t9.txt
mysql-test/suite/funcs_1/data/t7.txt:
  Rename: BitKeeper/deleted/.del-t7.txt -> mysql-test/suite/funcs_1/data/t7.txt
mysql-test/suite/funcs_1/data/t9.txt:
  Rename: BitKeeper/deleted/.del-t9.txt -> mysql-test/suite/funcs_1/data/t9.txt
BitKeeper/deleted/.del-datadict_load.inc~ff1ec79eab8c431c:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_load.inc
BitKeeper/deleted/.del-datadict_master.inc~94ae7b735ad01d72:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
  Rename: BitKeeper/deleted/.del-datadict_bug_12777.inc -> mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Rename: BitKeeper/deleted/.del-datadict_load.inc -> mysql-test/suite/funcs_1/datadict/datadict_load.inc
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Rename: BitKeeper/deleted/.del-datadict_master.inc -> mysql-test/suite/funcs_1/datadict/datadict_master.inc
BitKeeper/deleted/.del-datadict_show_schema.inc~b6dc1e8ed481fa92:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
BitKeeper/deleted/.del-datadict_show_table_design.inc~517436f76de0716b:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  Rename: BitKeeper/deleted/.del-datadict_show_schema.inc -> mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc:
  Rename: BitKeeper/deleted/.del-datadict_show_table_design.inc -> mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
BitKeeper/deleted/.del-datadict_tables.inc~cf3c01f9d1cd0cdf:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc
BitKeeper/deleted/.del-datadict_tables_error.inc~5516c7f2d254fdee:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1.inc~18e7ad369f9eb3fd:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1044.inc~3cfe7748d18be96c:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
BitKeeper/deleted/.del-datadict_tables_error_1049.inc~61e79841bf09fc97:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1044.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1049.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
BitKeeper/deleted/.del-datadict_tables_error_1051.inc~e637de2d82fa7519:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
BitKeeper/deleted/.del-datadict_tables_error_1146.inc~3f6d5feff7f0e9d0:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-datadict_tables_error_1288.inc~2f5deb63fbe93e71:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1051.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1146.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-create_database.inc~ef2ebad71f178a1c:
  Delete: mysql-test/suite/funcs_1/include/create_database.inc
BitKeeper/deleted/.del-create_user_lowest_priv.inc~6f636433dda5160c:
  Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1288.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
mysql-test/suite/funcs_1/include/create_database.inc:
  Rename: BitKeeper/deleted/.del-create_database.inc -> mysql-test/suite/funcs_1/include/create_database.inc
mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc:
  Rename: BitKeeper/deleted/.del-create_user_lowest_priv.inc -> mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
BitKeeper/deleted/.del-create_user_no_super.inc~1d0bed25cc65132f:
  Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc
BitKeeper/deleted/.del-innodb_tb1.inc~7e6d03d2ddf3b609:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb1.inc
BitKeeper/deleted/.del-innodb_tb2.inc~2ab09e131335c5ac:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb2.inc
mysql-test/suite/funcs_1/include/create_user_no_super.inc:
  Rename: BitKeeper/deleted/.del-create_user_no_super.inc -> mysql-test/suite/funcs_1/include/create_user_no_super.inc
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
  Rename: BitKeeper/deleted/.del-innodb_tb1.inc -> mysql-test/suite/funcs_1/include/innodb_tb1.inc
BitKeeper/deleted/.del-innodb_tb3.inc~ce29b178da64097:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb3.inc
BitKeeper/deleted/.del-innodb_tb4.inc~912d46a6ce99beb:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb4.inc
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
  Rename: BitKeeper/deleted/.del-innodb_tb2.inc -> mysql-test/suite/funcs_1/include/innodb_tb2.inc
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
  Rename: BitKeeper/deleted/.del-innodb_tb3.inc -> mysql-test/suite/funcs_1/include/innodb_tb3.inc
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
  Rename: BitKeeper/deleted/.del-innodb_tb4.inc -> mysql-test/suite/funcs_1/include/innodb_tb4.inc
BitKeeper/deleted/.del-memory_tb1.inc~26b9bca8492b8ef0:
  Delete: mysql-test/suite/funcs_1/include/memory_tb1.inc
BitKeeper/deleted/.del-memory_tb2.inc~9789d498ce902299:
  Delete: mysql-test/suite/funcs_1/include/memory_tb2.inc
BitKeeper/deleted/.del-memory_tb3.inc~f68852743e949b69:
  Delete: mysql-test/suite/funcs_1/include/memory_tb3.inc
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Rename: BitKeeper/deleted/.del-memory_tb1.inc -> mysql-test/suite/funcs_1/include/memory_tb1.inc
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Rename: BitKeeper/deleted/.del-memory_tb2.inc -> mysql-test/suite/funcs_1/include/memory_tb2.inc
BitKeeper/deleted/.del-memory_tb4.inc~19ec0e6953e071e6:
  Delete: mysql-test/suite/funcs_1/include/memory_tb4.inc
BitKeeper/deleted/.del-myisam_tb1.inc~9f4487705fda1b27:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb1.inc
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Rename: BitKeeper/deleted/.del-memory_tb3.inc -> mysql-test/suite/funcs_1/include/memory_tb3.inc
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Rename: BitKeeper/deleted/.del-memory_tb4.inc -> mysql-test/suite/funcs_1/include/memory_tb4.inc
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
  Rename: BitKeeper/deleted/.del-myisam_tb1.inc -> mysql-test/suite/funcs_1/include/myisam_tb1.inc
BitKeeper/deleted/.del-myisam_tb2.inc~5433401ca94057c3:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb2.inc
BitKeeper/deleted/.del-myisam_tb3.inc~8056471332f80a19:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb3.inc
BitKeeper/deleted/.del-myisam_tb4.inc~5e51596cea151c88:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb4.inc
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
  Rename: BitKeeper/deleted/.del-myisam_tb2.inc -> mysql-test/suite/funcs_1/include/myisam_tb2.inc
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
  Rename: BitKeeper/deleted/.del-myisam_tb3.inc -> mysql-test/suite/funcs_1/include/myisam_tb3.inc
BitKeeper/deleted/.del-show_connection.inc~e779f70c38f084c6:
  Delete: mysql-test/suite/funcs_1/include/show_connection.inc
BitKeeper/deleted/.del-sp_tb.inc~68c5d8cee47a7ebc:
  Delete: mysql-test/suite/funcs_1/include/sp_tb.inc
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
  Rename: BitKeeper/deleted/.del-myisam_tb4.inc -> mysql-test/suite/funcs_1/include/myisam_tb4.inc
mysql-test/suite/funcs_1/include/show_connection.inc:
  Rename: BitKeeper/deleted/.del-show_connection.inc -> mysql-test/suite/funcs_1/include/show_connection.inc
BitKeeper/deleted/.del-DataGen_local.pl~3239b01670d34dde:
  Delete: mysql-test/suite/funcs_1/lib/DataGen_local.pl
BitKeeper/deleted/.del-DataGen_modify.pl~b7fa80d2d927dae6:
  Delete: mysql-test/suite/funcs_1/lib/DataGen_modify.pl
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Rename: BitKeeper/deleted/.del-sp_tb.inc -> mysql-test/suite/funcs_1/include/sp_tb.inc
mysql-test/suite/funcs_1/lib/DataGen_local.pl:
  Rename: BitKeeper/deleted/.del-DataGen_local.pl -> mysql-test/suite/funcs_1/lib/DataGen_local.pl
mysql-test/suite/funcs_1/lib/DataGen_modify.pl:
  Rename: BitKeeper/deleted/.del-DataGen_modify.pl -> mysql-test/suite/funcs_1/lib/DataGen_modify.pl
BitKeeper/deleted/.del-innodb__datadict.result~c02e1f54796a8ca6:
  Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result
BitKeeper/deleted/.del-innodb__load.result~e93101337aed3e72:
  Delete: mysql-test/suite/funcs_1/r/innodb__load.result
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Rename: BitKeeper/deleted/.del-innodb__datadict.result -> mysql-test/suite/funcs_1/r/innodb__datadict.result
mysql-test/suite/funcs_1/r/innodb__load.result:
  Rename: BitKeeper/deleted/.del-innodb__load.result -> mysql-test/suite/funcs_1/r/innodb__load.result
BitKeeper/deleted/.del-innodb_bitdata.result~799181269a7c3f76:
  Delete: mysql-test/suite/funcs_1/r/innodb_bitdata.result
BitKeeper/deleted/.del-innodb_cursors.result~5501346a312eb2c:
  Delete: mysql-test/suite/funcs_1/r/innodb_cursors.result
BitKeeper/deleted/.del-innodb_func_view.result~40832cbc3cd01357:
  Delete: mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_bitdata.result:
  Rename: BitKeeper/deleted/.del-innodb_bitdata.result -> mysql-test/suite/funcs_1/r/innodb_bitdata.result
mysql-test/suite/funcs_1/r/innodb_cursors.result:
  Rename: BitKeeper/deleted/.del-innodb_cursors.result -> mysql-test/suite/funcs_1/r/innodb_cursors.result
BitKeeper/deleted/.del-innodb_storedproc.result~f519851b98532739:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc.result
BitKeeper/deleted/.del-innodb_storedproc_02.result~4183d0a85e3d9c3f:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Rename: BitKeeper/deleted/.del-innodb_func_view.result -> mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc.result -> mysql-test/suite/funcs_1/r/innodb_storedproc.result
BitKeeper/deleted/.del-innodb_storedproc_03.result~a27277dc4cfcd8b4:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
BitKeeper/deleted/.del-innodb_storedproc_06.result~ebc1ed638105c6a4:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_02.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_03.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_06.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
BitKeeper/deleted/.del-innodb_storedproc_07.result~aef68b204aae26a5:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
BitKeeper/deleted/.del-innodb_storedproc_08.result~110d457978e5bb08:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_07.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
BitKeeper/deleted/.del-innodb_storedproc_10.result~bac006c3f8720ff7:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
BitKeeper/deleted/.del-innodb_trig_0102.result~552e7936f9c3e8b1:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_0102.result
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_08.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_10.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_0102.result -> mysql-test/suite/funcs_1/r/innodb_trig_0102.result
BitKeeper/deleted/.del-innodb_trig_03.result~e0001f2ae0594271:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_03.result
BitKeeper/deleted/.del-innodb_trig_0407.result~30a523819cb1dbce:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_0407.result
BitKeeper/deleted/.del-innodb_trig_08.result~7fb6bf5750a72547:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_08.result
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_03.result -> mysql-test/suite/funcs_1/r/innodb_trig_03.result
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_0407.result -> mysql-test/suite/funcs_1/r/innodb_trig_0407.result
BitKeeper/deleted/.del-innodb_trig_09.result~45bdbd4e78d18c43:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_09.result
BitKeeper/deleted/.del-innodb_trig_1011ext.result~693d4af717160b0:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_08.result -> mysql-test/suite/funcs_1/r/innodb_trig_08.result
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_09.result -> mysql-test/suite/funcs_1/r/innodb_trig_09.result
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_1011ext.result -> mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
BitKeeper/deleted/.del-innodb_trig_frkey.result~f8324099abe39a:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
BitKeeper/deleted/.del-innodb_triggers.result~47d4751cc196bab9:
  Delete: mysql-test/suite/funcs_1/r/innodb_triggers.result
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_frkey.result -> mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
mysql-test/suite/funcs_1/r/innodb_triggers.result:
  Rename: BitKeeper/deleted/.del-innodb_triggers.result -> mysql-test/suite/funcs_1/r/innodb_triggers.result
BitKeeper/deleted/.del-innodb_views.result~f6ee0e22cb353b49:
  Delete: mysql-test/suite/funcs_1/r/innodb_views.result
BitKeeper/deleted/.del-memory__datadict.result~49b74301886e1847:
  Delete: mysql-test/suite/funcs_1/r/memory__datadict.result
BitKeeper/deleted/.del-memory__load.result~e759ae177d135580:
  Delete: mysql-test/suite/funcs_1/r/memory__load.result
mysql-test/suite/funcs_1/r/innodb_views.result:
  Rename: BitKeeper/deleted/.del-innodb_views.result -> mysql-test/suite/funcs_1/r/innodb_views.result
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Rename: BitKeeper/deleted/.del-memory__datadict.result -> mysql-test/suite/funcs_1/r/memory__datadict.result
BitKeeper/deleted/.del-memory_bitdata.result~cbda7481debfd3d2:
  Delete: mysql-test/suite/funcs_1/r/memory_bitdata.result
BitKeeper/deleted/.del-memory_cursors.result~ff9866fb5dfd7e3a:
  Delete: mysql-test/suite/funcs_1/r/memory_cursors.result
mysql-test/suite/funcs_1/r/memory__load.result:
  Rename: BitKeeper/deleted/.del-memory__load.result -> mysql-test/suite/funcs_1/r/memory__load.result
mysql-test/suite/funcs_1/r/memory_bitdata.result:
  Rename: BitKeeper/deleted/.del-memory_bitdata.result -> mysql-test/suite/funcs_1/r/memory_bitdata.result
mysql-test/suite/funcs_1/r/memory_cursors.result:
  Rename: BitKeeper/deleted/.del-memory_cursors.result -> mysql-test/suite/funcs_1/r/memory_cursors.result
BitKeeper/deleted/.del-memory_func_view.result~e552d7de38647c08:
  Delete: mysql-test/suite/funcs_1/r/memory_func_view.result
BitKeeper/deleted/.del-memory_storedproc.result~f448dceb2b3c0663:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc.result
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Rename: BitKeeper/deleted/.del-memory_func_view.result -> mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc.result -> mysql-test/suite/funcs_1/r/memory_storedproc.result
BitKeeper/deleted/.del-memory_storedproc_02.result~8fe9a1951ddcddb2:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_02.result
BitKeeper/deleted/.del-memory_storedproc_03.result~da1a54e7f7fb565c:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_03.result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_02.result -> mysql-test/suite/funcs_1/r/memory_storedproc_02.result
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_03.result -> mysql-test/suite/funcs_1/r/memory_storedproc_03.result
BitKeeper/deleted/.del-memory_storedproc_06.result~a2f933a1c033c7a4:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_06.result
BitKeeper/deleted/.del-memory_storedproc_07.result~2bc5723a4df61278:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_07.result
BitKeeper/deleted/.del-memory_storedproc_08.result~5e68fabd8a121268:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_08.result
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_06.result -> mysql-test/suite/funcs_1/r/memory_storedproc_06.result
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_07.result -> mysql-test/suite/funcs_1/r/memory_storedproc_07.result
BitKeeper/deleted/.del-memory_storedproc_10.result~2eae10df620fed3b:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_10.result
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_08.result -> mysql-test/suite/funcs_1/r/memory_storedproc_08.result
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_10.result -> mysql-test/suite/funcs_1/r/memory_storedproc_10.result
BitKeeper/deleted/.del-memory_trig_0102.result~6ddf339f2d5523c6:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_0102.result
BitKeeper/deleted/.del-memory_trig_03.result~843e1e88cec532e7:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_03.result
BitKeeper/deleted/.del-memory_trig_0407.result~a561a80e40cd820a:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_0407.result
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Rename: BitKeeper/deleted/.del-memory_trig_0102.result -> mysql-test/suite/funcs_1/r/memory_trig_0102.result
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Rename: BitKeeper/deleted/.del-memory_trig_03.result -> mysql-test/suite/funcs_1/r/memory_trig_03.result
BitKeeper/deleted/.del-memory_trig_08.result~3a5fc5dba5ab1378:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_08.result
BitKeeper/deleted/.del-memory_trig_09.result~f54649a13258f1f9:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_09.result
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Rename: BitKeeper/deleted/.del-memory_trig_0407.result -> mysql-test/suite/funcs_1/r/memory_trig_0407.result
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Rename: BitKeeper/deleted/.del-memory_trig_08.result -> mysql-test/suite/funcs_1/r/memory_trig_08.result
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Rename: BitKeeper/deleted/.del-memory_trig_09.result -> mysql-test/suite/funcs_1/r/memory_trig_09.result
BitKeeper/deleted/.del-memory_trig_1011ext.result~58022c2cc6d43a43:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
BitKeeper/deleted/.del-memory_triggers.result~4720213a17bd1f8b:
  Delete: mysql-test/suite/funcs_1/r/memory_triggers.result
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Rename: BitKeeper/deleted/.del-memory_trig_1011ext.result -> mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
mysql-test/suite/funcs_1/r/memory_triggers.result:
  Rename: BitKeeper/deleted/.del-memory_triggers.result -> mysql-test/suite/funcs_1/r/memory_triggers.result
BitKeeper/deleted/.del-memory_views.result~d600cc46b350d191:
  Delete: mysql-test/suite/funcs_1/r/memory_views.result
BitKeeper/deleted/.del-myisam__datadict.result~84fd7948204f0fcf:
  Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result
mysql-test/suite/funcs_1/r/memory_views.result:
  Rename: BitKeeper/deleted/.del-memory_views.result -> mysql-test/suite/funcs_1/r/memory_views.result
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Rename: BitKeeper/deleted/.del-myisam__datadict.result -> mysql-test/suite/funcs_1/r/myisam__datadict.result
BitKeeper/deleted/.del-myisam__load.result~a5cdfae657f4420a:
  Delete: mysql-test/suite/funcs_1/r/myisam__load.result
BitKeeper/deleted/.del-myisam_bitdata.result~58a8f4201386a085:
  Delete: mysql-test/suite/funcs_1/r/myisam_bitdata.result
mysql-test/suite/funcs_1/r/myisam__load.result:
  Rename: BitKeeper/deleted/.del-myisam__load.result -> mysql-test/suite/funcs_1/r/myisam__load.result
mysql-test/suite/funcs_1/r/myisam_bitdata.result:
  Rename: BitKeeper/deleted/.del-myisam_bitdata.result -> mysql-test/suite/funcs_1/r/myisam_bitdata.result
BitKeeper/deleted/.del-myisam_cursors.result~49d90d672526a743:
  Delete: mysql-test/suite/funcs_1/r/myisam_cursors.result
BitKeeper/deleted/.del-myisam_func_view.result~534db497d89b6db8:
  Delete: mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/funcs_1/r/myisam_cursors.result:
  Rename: BitKeeper/deleted/.del-myisam_cursors.result -> mysql-test/suite/funcs_1/r/myisam_cursors.result
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Rename: BitKeeper/deleted/.del-myisam_func_view.result -> mysql-test/suite/funcs_1/r/myisam_func_view.result
BitKeeper/deleted/.del-myisam_storedproc.result~11afaec1d6691272:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc.result
BitKeeper/deleted/.del-myisam_storedproc_02.result~da54080b38b800e1:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
BitKeeper/deleted/.del-myisam_storedproc_03.result~f43705b213fa0be7:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc.result -> mysql-test/suite/funcs_1/r/myisam_storedproc.result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_02.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
BitKeeper/deleted/.del-myisam_storedproc_06.result~82bc7661134f9251:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
BitKeeper/deleted/.del-myisam_storedproc_07.result~43793b065606447:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_03.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_06.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_07.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
BitKeeper/deleted/.del-myisam_storedproc_08.result~a41f1829cf91919d:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
BitKeeper/deleted/.del-myisam_storedproc_10.result~601f1f3b7ff82de6:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_08.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_10.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
BitKeeper/deleted/.del-myisam_trig_0102.result~aa3d68a52b9d9461:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_0102.result
BitKeeper/deleted/.del-myisam_trig_03.result~a958349fc6dbafc4:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_03.result
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_0102.result -> mysql-test/suite/funcs_1/r/myisam_trig_0102.result
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_03.result -> mysql-test/suite/funcs_1/r/myisam_trig_03.result
BitKeeper/deleted/.del-myisam_trig_0407.result~ff5d0269d6f069ac:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_0407.result
BitKeeper/deleted/.del-myisam_trig_08.result~b116c6baef5c9329:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_08.result
BitKeeper/deleted/.del-myisam_trig_09.result~f5e5181e4de57aa2:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_09.result
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_0407.result -> mysql-test/suite/funcs_1/r/myisam_trig_0407.result
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_08.result -> mysql-test/suite/funcs_1/r/myisam_trig_08.result
BitKeeper/deleted/.del-myisam_trig_1011ext.result~188c33cf34d15c28:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
BitKeeper/deleted/.del-myisam_triggers.result~5d09cc9a6e725ae0:
  Delete: mysql-test/suite/funcs_1/r/myisam_triggers.result
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_09.result -> mysql-test/suite/funcs_1/r/myisam_trig_09.result
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_1011ext.result -> mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
BitKeeper/deleted/.del-cleanup_sp_tb.inc~e56fdf367dc4920f:
  Delete: mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
BitKeeper/deleted/.del-myisam_views.result~3f58b2463d68e870:
  Delete: mysql-test/suite/funcs_1/r/myisam_views.result
mysql-test/suite/funcs_1/r/myisam_triggers.result:
  Rename: BitKeeper/deleted/.del-myisam_triggers.result -> mysql-test/suite/funcs_1/r/myisam_triggers.result
mysql-test/suite/funcs_1/r/myisam_views.result:
  Rename: BitKeeper/deleted/.del-myisam_views.result -> mysql-test/suite/funcs_1/r/myisam_views.result
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
  Rename: BitKeeper/deleted/.del-cleanup_sp_tb.inc -> mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
BitKeeper/deleted/.del-load_sp_tb.inc~874151dac20d4609:
  Delete: mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
BitKeeper/deleted/.del-storedproc_02.inc~382fa05b78862c2d:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Rename: BitKeeper/deleted/.del-load_sp_tb.inc -> mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Rename: BitKeeper/deleted/.del-storedproc_02.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
BitKeeper/deleted/.del-storedproc_03.inc~950bd5f0df49c0c0:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
BitKeeper/deleted/.del-storedproc_06.inc~3313ca46f891a104:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Rename: BitKeeper/deleted/.del-storedproc_03.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Rename: BitKeeper/deleted/.del-storedproc_06.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
BitKeeper/deleted/.del-storedproc_07.inc~8af2431ad7ef6a1:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
BitKeeper/deleted/.del-storedproc_08.inc~e2730281eff07089:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
BitKeeper/deleted/.del-storedproc_08_show.inc~756c67bd3b7d61f8:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
mysql-test/suite/funcs_1/storedproc/storedproc_07.inc:
  Rename: BitKeeper/deleted/.del-storedproc_07.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
mysql-test/suite/funcs_1/storedproc/storedproc_08.inc:
  Rename: BitKeeper/deleted/.del-storedproc_08.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
BitKeeper/deleted/.del-storedproc_10.inc~9b2eecdca3bc87e0:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
BitKeeper/deleted/.del-storedproc_master.inc~d06ed09343243344:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc:
  Rename: BitKeeper/deleted/.del-storedproc_08_show.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Rename: BitKeeper/deleted/.del-storedproc_10.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
BitKeeper/deleted/.del-disabled.def~5839f38d337055cd:
  Delete: mysql-test/suite/funcs_1/t/disabled.def
BitKeeper/deleted/.del-innodb__datadict.test~56554dd847c45d1b:
  Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Rename: BitKeeper/deleted/.del-storedproc_master.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
mysql-test/suite/funcs_1/t/disabled.def:
  Rename: BitKeeper/deleted/.del-disabled.def~1 -> mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_1/t/innodb__datadict.test:
  Rename: BitKeeper/deleted/.del-innodb__datadict.test -> mysql-test/suite/funcs_1/t/innodb__datadict.test
BitKeeper/deleted/.del-innodb__load.test~7085d9e6cde80a45:
  Delete: mysql-test/suite/funcs_1/t/innodb__load.test
BitKeeper/deleted/.del-innodb_bitdata.test~85aa8297cea412f0:
  Delete: mysql-test/suite/funcs_1/t/innodb_bitdata.test
BitKeeper/deleted/.del-innodb_cursors.test~b2f689e5aad9ed61:
  Delete: mysql-test/suite/funcs_1/t/innodb_cursors.test
mysql-test/suite/funcs_1/t/innodb__load.test:
  Rename: BitKeeper/deleted/.del-innodb__load.test -> mysql-test/suite/funcs_1/t/innodb__load.test
mysql-test/suite/funcs_1/t/innodb_bitdata.test:
  Rename: BitKeeper/deleted/.del-innodb_bitdata.test -> mysql-test/suite/funcs_1/t/innodb_bitdata.test
BitKeeper/deleted/.del-innodb_func_view.test~cefb7d1dd6010a54:
  Delete: mysql-test/suite/funcs_1/t/innodb_func_view.test
mysql-test/suite/funcs_1/t/innodb_cursors.test:
  Rename: BitKeeper/deleted/.del-innodb_cursors.test -> mysql-test/suite/funcs_1/t/innodb_cursors.test
mysql-test/suite/funcs_1/t/innodb_func_view.test:
  Rename: BitKeeper/deleted/.del-innodb_func_view.test -> mysql-test/suite/funcs_1/t/innodb_func_view.test
BitKeeper/deleted/.del-innodb_storedproc.test~59836b12f28c524a:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc.test
BitKeeper/deleted/.del-innodb_storedproc_02.test~b8a1d59320d17ccd:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
BitKeeper/deleted/.del-innodb_storedproc_03.test~f0a04b626962c3ae:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc.test -> mysql-test/suite/funcs_1/t/innodb_storedproc.test
mysql-test/suite/funcs_1/t/innodb_storedproc_02.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_02.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
BitKeeper/deleted/.del-innodb_storedproc_06.test~f0c4a7598abaa44:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
BitKeeper/deleted/.del-innodb_storedproc_07.test~f5fc9e0a296cff76:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
mysql-test/suite/funcs_1/t/innodb_storedproc_03.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_03.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
mysql-test/suite/funcs_1/t/innodb_storedproc_06.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_06.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
mysql-test/suite/funcs_1/t/innodb_storedproc_07.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_07.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
BitKeeper/deleted/.del-innodb_storedproc_08.test~96c9f3ecc7801edb:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
BitKeeper/deleted/.del-innodb_storedproc_10.test~368950a6728faf08:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
BitKeeper/deleted/.del-innodb_trig_0102.test~4c86148638150f86:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_0102.test
mysql-test/suite/funcs_1/t/innodb_storedproc_08.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_08.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
mysql-test/suite/funcs_1/t/innodb_storedproc_10.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_10.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
BitKeeper/deleted/.del-innodb_trig_03.test~b90f32a29fd224d6:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_03.test
BitKeeper/deleted/.del-innodb_trig_0407.test~8b8d01c8c8b107:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_0407.test
mysql-test/suite/funcs_1/t/innodb_trig_0102.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_0102.test -> mysql-test/suite/funcs_1/t/innodb_trig_0102.test
mysql-test/suite/funcs_1/t/innodb_trig_03.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_03.test -> mysql-test/suite/funcs_1/t/innodb_trig_03.test
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_0407.test -> mysql-test/suite/funcs_1/t/innodb_trig_0407.test
BitKeeper/deleted/.del-innodb_trig_08.test~82ea213f59cf5634:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_08.test
BitKeeper/deleted/.del-innodb_trig_09.test~1407c2016d589067:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_09.test
mysql-test/suite/funcs_1/t/innodb_trig_08.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_08.test -> mysql-test/suite/funcs_1/t/innodb_trig_08.test
mysql-test/suite/funcs_1/t/innodb_trig_09.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_09.test -> mysql-test/suite/funcs_1/t/innodb_trig_09.test
BitKeeper/deleted/.del-innodb_trig_1011ext.test~8f405ef2239bcfed:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
BitKeeper/deleted/.del-innodb_trig_frkey.test~7c1c0af7c80de602:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
BitKeeper/deleted/.del-innodb_views.test~460914b9e63a58f0:
  Delete: mysql-test/suite/funcs_1/t/innodb_views.test
mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_1011ext.test -> mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_frkey.test -> mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
BitKeeper/deleted/.del-memory__datadict.test~97e67292a3c6ebd0:
  Delete: mysql-test/suite/funcs_1/t/memory__datadict.test
BitKeeper/deleted/.del-memory__load.test~a18998091ef9b001:
  Delete: mysql-test/suite/funcs_1/t/memory__load.test
mysql-test/suite/funcs_1/t/innodb_views.test:
  Rename: BitKeeper/deleted/.del-innodb_views.test -> mysql-test/suite/funcs_1/t/innodb_views.test
mysql-test/suite/funcs_1/t/memory__datadict.test:
  Rename: BitKeeper/deleted/.del-memory__datadict.test -> mysql-test/suite/funcs_1/t/memory__datadict.test
mysql-test/suite/funcs_1/t/memory__load.test:
  Rename: BitKeeper/deleted/.del-memory__load.test -> mysql-test/suite/funcs_1/t/memory__load.test
BitKeeper/deleted/.del-memory_bitdata.test~8c3293caa99e7db2:
  Delete: mysql-test/suite/funcs_1/t/memory_bitdata.test
BitKeeper/deleted/.del-memory_cursors.test~208b9d3a3b388e5a:
  Delete: mysql-test/suite/funcs_1/t/memory_cursors.test
BitKeeper/deleted/.del-memory_func_view.test~43ca20a516b29af3:
  Delete: mysql-test/suite/funcs_1/t/memory_func_view.test
mysql-test/suite/funcs_1/t/memory_bitdata.test:
  Rename: BitKeeper/deleted/.del-memory_bitdata.test -> mysql-test/suite/funcs_1/t/memory_bitdata.test
mysql-test/suite/funcs_1/t/memory_cursors.test:
  Rename: BitKeeper/deleted/.del-memory_cursors.test -> mysql-test/suite/funcs_1/t/memory_cursors.test
BitKeeper/deleted/.del-memory_storedproc.test~1b6d3856750b4103:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc.test
BitKeeper/deleted/.del-memory_storedproc_02.test~3d699d9d8cadcec:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_02.test
mysql-test/suite/funcs_1/t/memory_func_view.test:
  Rename: BitKeeper/deleted/.del-memory_func_view.test -> mysql-test/suite/funcs_1/t/memory_func_view.test
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc.test -> mysql-test/suite/funcs_1/t/memory_storedproc.test
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_02.test -> mysql-test/suite/funcs_1/t/memory_storedproc_02.test
BitKeeper/deleted/.del-memory_storedproc_03.test~b8e4f73c53d2d65c:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_03.test
BitKeeper/deleted/.del-memory_storedproc_06.test~6f0344325cdc7e47:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_06.test
BitKeeper/deleted/.del-memory_storedproc_07.test~d72c0c08d46ff3d:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_07.test
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_03.test -> mysql-test/suite/funcs_1/t/memory_storedproc_03.test
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_06.test -> mysql-test/suite/funcs_1/t/memory_storedproc_06.test
BitKeeper/deleted/.del-memory_storedproc_08.test~abb018786b9c9cc4:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_08.test
BitKeeper/deleted/.del-memory_storedproc_10.test~235432215fa35be8:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_10.test
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_07.test -> mysql-test/suite/funcs_1/t/memory_storedproc_07.test
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_08.test -> mysql-test/suite/funcs_1/t/memory_storedproc_08.test
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_10.test -> mysql-test/suite/funcs_1/t/memory_storedproc_10.test
BitKeeper/deleted/.del-memory_trig_0102.test~14bcf15df5764973:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_0102.test
BitKeeper/deleted/.del-memory_trig_03.test~27016478f8698755:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_03.test
mysql-test/suite/funcs_1/t/memory_trig_0102.test:
  Rename: BitKeeper/deleted/.del-memory_trig_0102.test -> mysql-test/suite/funcs_1/t/memory_trig_0102.test
mysql-test/suite/funcs_1/t/memory_trig_03.test:
  Rename: BitKeeper/deleted/.del-memory_trig_03.test -> mysql-test/suite/funcs_1/t/memory_trig_03.test
BitKeeper/deleted/.del-memory_trig_0407.test~519fa098e2e89a49:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_0407.test
BitKeeper/deleted/.del-memory_trig_08.test~eb12b11ef9e956ca:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_08.test
BitKeeper/deleted/.del-memory_trig_09.test~f53b89eced332954:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_09.test
mysql-test/suite/funcs_1/t/memory_trig_0407.test:
  Rename: BitKeeper/deleted/.del-memory_trig_0407.test -> mysql-test/suite/funcs_1/t/memory_trig_0407.test
mysql-test/suite/funcs_1/t/memory_trig_08.test:
  Rename: BitKeeper/deleted/.del-memory_trig_08.test -> mysql-test/suite/funcs_1/t/memory_trig_08.test
BitKeeper/deleted/.del-memory_trig_1011ext.test~b090a0fc7f12ab08:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
BitKeeper/deleted/.del-memory_views.test~91ffafb774f67137:
  Delete: mysql-test/suite/funcs_1/t/memory_views.test
mysql-test/suite/funcs_1/t/memory_trig_09.test:
  Rename: BitKeeper/deleted/.del-memory_trig_09.test -> mysql-test/suite/funcs_1/t/memory_trig_09.test
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test:
  Rename: BitKeeper/deleted/.del-memory_trig_1011ext.test -> mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
mysql-test/suite/funcs_1/t/memory_views.test:
  Rename: BitKeeper/deleted/.del-memory_views.test -> mysql-test/suite/funcs_1/t/memory_views.test
BitKeeper/deleted/.del-myisam__datadict.test~cae9a60de78fc35d:
  Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test
BitKeeper/deleted/.del-myisam__load.test~475638485078225c:
  Delete: mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-myisam_bitdata.test~12a510e9660ace8b:
  Delete: mysql-test/suite/funcs_1/t/myisam_bitdata.test
mysql-test/suite/funcs_1/t/myisam__datadict.test:
  Rename: BitKeeper/deleted/.del-myisam__datadict.test -> mysql-test/suite/funcs_1/t/myisam__datadict.test
mysql-test/suite/funcs_1/t/myisam__load.test:
  Rename: BitKeeper/deleted/.del-myisam__load.test -> mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-myisam_cursors.test~e14ab9d55d14f27b:
  Delete: mysql-test/suite/funcs_1/t/myisam_cursors.test
BitKeeper/deleted/.del-myisam_func_view.test~1e272349f93f83f2:
  Delete: mysql-test/suite/funcs_1/t/myisam_func_view.test
mysql-test/suite/funcs_1/t/myisam_bitdata.test:
  Rename: BitKeeper/deleted/.del-myisam_bitdata.test -> mysql-test/suite/funcs_1/t/myisam_bitdata.test
mysql-test/suite/funcs_1/t/myisam_cursors.test:
  Rename: BitKeeper/deleted/.del-myisam_cursors.test -> mysql-test/suite/funcs_1/t/myisam_cursors.test
mysql-test/suite/funcs_1/t/myisam_func_view.test:
  Rename: BitKeeper/deleted/.del-myisam_func_view.test -> mysql-test/suite/funcs_1/t/myisam_func_view.test
BitKeeper/deleted/.del-myisam_storedproc.test~2ba6363d2e1a3c34:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc.test
BitKeeper/deleted/.del-myisam_storedproc_02.test~3baa154a9e7da1f9:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc.test -> mysql-test/suite/funcs_1/t/myisam_storedproc.test
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_02.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
BitKeeper/deleted/.del-myisam_storedproc_03.test~b6ca96ed3dfbe37f:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
BitKeeper/deleted/.del-myisam_storedproc_06.test~a4150b544475b75:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
BitKeeper/deleted/.del-myisam_storedproc_07.test~618a6a50ec4ad67e:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_03.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_06.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
BitKeeper/deleted/.del-myisam_storedproc_08.test~84a1b27da7087d9:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
BitKeeper/deleted/.del-myisam_storedproc_10.test~488ef8f94b0e21bd:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_07.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_08.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_10.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
BitKeeper/deleted/.del-myisam_trig_0102.test~ba6337bfcf06720f:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_0102.test
BitKeeper/deleted/.del-myisam_trig_03.test~26c97fd2347ce5a5:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_03.test
BitKeeper/deleted/.del-myisam_trig_0407.test~bf799febfd188363:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_0407.test
mysql-test/suite/funcs_1/t/myisam_trig_0102.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_0102.test -> mysql-test/suite/funcs_1/t/myisam_trig_0102.test
mysql-test/suite/funcs_1/t/myisam_trig_03.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_03.test -> mysql-test/suite/funcs_1/t/myisam_trig_03.test
BitKeeper/deleted/.del-myisam_trig_08.test~9dd03c9fb189a2d0:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_08.test
BitKeeper/deleted/.del-myisam_trig_09.test~4706099520d9fcff:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_09.test
mysql-test/suite/funcs_1/t/myisam_trig_0407.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_0407.test -> mysql-test/suite/funcs_1/t/myisam_trig_0407.test
mysql-test/suite/funcs_1/t/myisam_trig_08.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_08.test -> mysql-test/suite/funcs_1/t/myisam_trig_08.test
BitKeeper/deleted/.del-myisam_trig_1011ext.test~33947cfdce83359f:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
BitKeeper/deleted/.del-myisam_views.test~8191b1664f3fb073:
  Delete: mysql-test/suite/funcs_1/t/myisam_views.test
mysql-test/suite/funcs_1/t/myisam_trig_09.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_09.test -> mysql-test/suite/funcs_1/t/myisam_trig_09.test
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_1011ext.test -> mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
mysql-test/suite/funcs_1/t/myisam_views.test:
  Rename: BitKeeper/deleted/.del-myisam_views.test -> mysql-test/suite/funcs_1/t/myisam_views.test
BitKeeper/deleted/.del-trig_frkey.inc~ddc32f51b7efc8a7:
  Delete: mysql-test/suite/funcs_1/triggers/trig_frkey.inc
BitKeeper/deleted/.del-trig_frkey2.inc~6e45874f67bff63f:
  Delete: mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
BitKeeper/deleted/.del-triggers_0102.inc~3e3628c21eb1b6b3:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_0102.inc
mysql-test/suite/funcs_1/triggers/trig_frkey.inc:
  Rename: BitKeeper/deleted/.del-trig_frkey.inc -> mysql-test/suite/funcs_1/triggers/trig_frkey.inc
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
  Rename: BitKeeper/deleted/.del-trig_frkey2.inc -> mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
BitKeeper/deleted/.del-triggers_03.inc~952da03e2aa2e366:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_03.inc
BitKeeper/deleted/.del-triggers_0407.inc~26d5f499dcbba3dd:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_0407.inc
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Rename: BitKeeper/deleted/.del-triggers_0102.inc -> mysql-test/suite/funcs_1/triggers/triggers_0102.inc
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Rename: BitKeeper/deleted/.del-triggers_03.inc -> mysql-test/suite/funcs_1/triggers/triggers_03.inc
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Rename: BitKeeper/deleted/.del-triggers_0407.inc -> mysql-test/suite/funcs_1/triggers/triggers_0407.inc
BitKeeper/deleted/.del-triggers_08.inc~23ce6806b152b7fc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_08.inc
BitKeeper/deleted/.del-triggers_09.inc~77f09e3677536d9f:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_09.inc
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Rename: BitKeeper/deleted/.del-triggers_08.inc -> mysql-test/suite/funcs_1/triggers/triggers_08.inc
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Rename: BitKeeper/deleted/.del-triggers_09.inc -> mysql-test/suite/funcs_1/triggers/triggers_09.inc
BitKeeper/deleted/.del-func_view.inc~f237e7bc7e6cfcbc:
  Delete: mysql-test/suite/funcs_1/views/func_view.inc
BitKeeper/deleted/.del-triggers_1011ext.inc~ed096947fb03693:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
BitKeeper/deleted/.del-triggers_master.test~fc19575e956a0b72:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Rename: BitKeeper/deleted/.del-triggers_1011ext.inc -> mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
mysql-test/suite/funcs_1/triggers/triggers_master.test:
  Rename: BitKeeper/deleted/.del-triggers_master.test -> mysql-test/suite/funcs_1/triggers/triggers_master.test
BitKeeper/deleted/.del-fv1.inc~87b440f98d8b8193:
  Delete: mysql-test/suite/funcs_1/views/fv1.inc
BitKeeper/deleted/.del-fv2.inc~26896746173f9122:
  Delete: mysql-test/suite/funcs_1/views/fv2.inc
mysql-test/suite/funcs_1/views/func_view.inc:
  Rename: BitKeeper/deleted/.del-func_view.inc -> mysql-test/suite/funcs_1/views/func_view.inc
mysql-test/suite/funcs_1/views/fv1.inc:
  Rename: BitKeeper/deleted/.del-fv1.inc -> mysql-test/suite/funcs_1/views/fv1.inc
mysql-test/suite/funcs_1/views/fv2.inc:
  Rename: BitKeeper/deleted/.del-fv2.inc -> mysql-test/suite/funcs_1/views/fv2.inc
BitKeeper/deleted/.del-fv_cast.inc~ef53731c7c6dcd27:
  Delete: mysql-test/suite/funcs_1/views/fv_cast.inc
BitKeeper/deleted/.del-fv_if1.inc~86c887a184ab39eb:
  Delete: mysql-test/suite/funcs_1/views/fv_if1.inc
mysql-test/suite/funcs_1/views/fv_cast.inc:
  Rename: BitKeeper/deleted/.del-fv_cast.inc -> mysql-test/suite/funcs_1/views/fv_cast.inc
mysql-test/suite/funcs_1/views/fv_if1.inc:
  Rename: BitKeeper/deleted/.del-fv_if1.inc -> mysql-test/suite/funcs_1/views/fv_if1.inc
BitKeeper/deleted/.del-fv_if2.inc~483e3f7a24f7e55c:
  Delete: mysql-test/suite/funcs_1/views/fv_if2.inc
BitKeeper/deleted/.del-fv_ifnull.inc~fbffea1ccd756112:
  Delete: mysql-test/suite/funcs_1/views/fv_ifnull.inc
BitKeeper/deleted/.del-views_master.inc~2d2a52a68d0d77fd:
  Delete: mysql-test/suite/funcs_1/views/views_master.inc
mysql-test/suite/funcs_1/views/fv_if2.inc:
  Rename: BitKeeper/deleted/.del-fv_if2.inc -> mysql-test/suite/funcs_1/views/fv_if2.inc
mysql-test/suite/funcs_1/views/fv_ifnull.inc:
  Rename: BitKeeper/deleted/.del-fv_ifnull.inc -> mysql-test/suite/funcs_1/views/fv_ifnull.inc
BitKeeper/deleted/.del-README.txt:
  Delete: mysql-test/suite/funcs_1/README.txt
mysql-test/suite/funcs_1/README.txt:
  Rename: BitKeeper/deleted/.del-README.txt-renamed -> mysql-test/suite/funcs_1/README.txt
mysql-test/suite/funcs_1/views/views_master.inc:
  Rename: BitKeeper/deleted/.del-views_master.inc -> mysql-test/suite/funcs_1/views/views_master.inc
---
 .../suite/funcs_1/cursors/cursors_master.test |    1 +
 .../funcs_1/datadict/datadict_master.inc      |    8 +-
 .../funcs_1/datadict/datadict_tables.inc      |    2 +-
 .../datadict/datadict_tables_error_1044.inc   |    0
 .../suite/funcs_1/r/innodb__datadict.result   | 3098 +++--------------
 .../suite/funcs_1/r/innodb_func_view.result   | 1405 ++++----
 .../suite/funcs_1/r/innodb_storedproc.result  | 1221 +++++--
 .../funcs_1/r/innodb_storedproc_02.result     |   36 +-
 .../funcs_1/r/innodb_storedproc_03.result     |    0
 .../funcs_1/r/innodb_storedproc_07.result     |    0
 .../funcs_1/r/innodb_storedproc_08.result     |    0
 .../funcs_1/r/innodb_storedproc_10.result     |   10 +-
 .../suite/funcs_1/r/innodb_trig_0102.result   |   15 +-
 .../suite/funcs_1/r/innodb_trig_03.result     |  297 +-
 .../suite/funcs_1/r/innodb_trig_0407.result   |   10 +-
 .../suite/funcs_1/r/innodb_trig_08.result     |   60 +-
 .../suite/funcs_1/r/innodb_trig_09.result     |   10 +-
 .../funcs_1/r/innodb_trig_1011ext.result      |   28 +-
 .../suite/funcs_1/r/innodb_trig_frkey.result  |    2 +-
 .../suite/funcs_1/r/innodb_views.result       |   98 +-
 .../suite/funcs_1/r/memory__datadict.result   | 3098 +++--------------
 .../suite/funcs_1/r/memory_func_view.result   | 1405 ++++----
 .../suite/funcs_1/r/memory_storedproc.result  | 1221 +++++--
 .../funcs_1/r/memory_storedproc_02.result     |   36 +-
 .../funcs_1/r/memory_storedproc_03.result     |    0
 .../funcs_1/r/memory_storedproc_07.result     |    0
 .../funcs_1/r/memory_storedproc_08.result     |    0
 .../funcs_1/r/memory_storedproc_10.result     |   10 +-
 .../suite/funcs_1/r/memory_trig_0102.result   |   15 +-
 .../suite/funcs_1/r/memory_trig_03.result     |  297 +-
 .../suite/funcs_1/r/memory_trig_0407.result   |   10 +-
 .../suite/funcs_1/r/memory_trig_08.result     |   60 +-
 .../suite/funcs_1/r/memory_trig_09.result     |   10 +-
 .../funcs_1/r/memory_trig_1011ext.result      |   28 +-
 .../suite/funcs_1/r/memory_views.result       |   98 +-
 .../suite/funcs_1/r/myisam__datadict.result   | 3098 +++--------------
 .../suite/funcs_1/r/myisam_func_view.result   | 1405 ++++----
 .../suite/funcs_1/r/myisam_storedproc.result  | 1221 +++++--
 .../funcs_1/r/myisam_storedproc_02.result     |   36 +-
 .../funcs_1/r/myisam_storedproc_03.result     |    0
 .../funcs_1/r/myisam_storedproc_07.result     |    0
 .../funcs_1/r/myisam_storedproc_08.result     |    0
 .../funcs_1/r/myisam_storedproc_10.result     |   10 +-
 .../suite/funcs_1/r/myisam_trig_0102.result   |   15 +-
 .../suite/funcs_1/r/myisam_trig_03.result     |  297 +-
 .../suite/funcs_1/r/myisam_trig_0407.result   |   10 +-
 .../suite/funcs_1/r/myisam_trig_08.result     |   60 +-
 .../suite/funcs_1/r/myisam_trig_09.result     |   10 +-
 .../funcs_1/r/myisam_trig_1011ext.result      |   28 +-
 .../suite/funcs_1/r/myisam_views.result       |  125 +-
 .../funcs_1/storedproc/storedproc_02.inc      |   33 +-
 .../funcs_1/storedproc/storedproc_03.inc      |    0
 .../funcs_1/storedproc/storedproc_06.inc      |    0
 .../funcs_1/storedproc/storedproc_07.inc      |    0
 .../funcs_1/storedproc/storedproc_08.inc      |    0
 .../funcs_1/storedproc/storedproc_08_show.inc |    0
 .../funcs_1/storedproc/storedproc_10.inc      |   10 +-
 .../funcs_1/storedproc/storedproc_master.inc  |   35 +-
 .../suite/funcs_1/t/innodb_storedproc_02.test |    0
 .../suite/funcs_1/t/innodb_storedproc_03.test |    0
 .../suite/funcs_1/t/innodb_storedproc_06.test |    0
 .../suite/funcs_1/t/innodb_storedproc_07.test |    0
 .../suite/funcs_1/t/innodb_storedproc_08.test |    0
 .../suite/funcs_1/t/innodb_storedproc_10.test |    0
 .../suite/funcs_1/t/memory_storedproc_02.test |    0
 .../suite/funcs_1/t/memory_storedproc_03.test |    0
 .../suite/funcs_1/t/memory_storedproc_06.test |    0
 .../suite/funcs_1/t/memory_storedproc_07.test |    0
 .../suite/funcs_1/t/memory_storedproc_08.test |    0
 .../suite/funcs_1/t/memory_storedproc_10.test |    0
 .../suite/funcs_1/t/myisam_storedproc_02.test |    0
 .../suite/funcs_1/t/myisam_storedproc_03.test |    0
 .../suite/funcs_1/t/myisam_storedproc_06.test |    0
 .../suite/funcs_1/t/myisam_storedproc_07.test |    0
 .../suite/funcs_1/t/myisam_storedproc_08.test |    0
 .../suite/funcs_1/t/myisam_storedproc_10.test |    0
 .../suite/funcs_1/triggers/triggers_0102.inc  |   18 +-
 .../suite/funcs_1/triggers/triggers_03.inc    |  144 +-
 .../suite/funcs_1/triggers/triggers_0407.inc  |   10 +-
 .../suite/funcs_1/triggers/triggers_08.inc    |   39 +-
 .../suite/funcs_1/triggers/triggers_09.inc    |    8 +-
 .../funcs_1/triggers/triggers_1011ext.inc     |   24 +-
 mysql-test/suite/funcs_1/views/func_view.inc  |  109 +-
 .../suite/funcs_1/views/views_master.inc      |   74 +-
 84 files changed, 6990 insertions(+), 12418 deletions(-)
 mode change 100644 => 100755 mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/memory_storedproc_02.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/memory_storedproc_03.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/memory_storedproc_07.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/memory_storedproc_08.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/memory_storedproc_10.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
 mode change 100644 => 100755 mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
 mode change 100644 => 100755 mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
 mode change 100644 => 100755 mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
 mode change 100644 => 100755 mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
 mode change 100644 => 100755 mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
 mode change 100644 => 100755 mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
 mode change 100644 => 100755 mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/memory_storedproc_02.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/memory_storedproc_03.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/memory_storedproc_06.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/memory_storedproc_07.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/memory_storedproc_08.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/memory_storedproc_10.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
 mode change 100644 => 100755 mysql-test/suite/funcs_1/t/myisam_storedproc_10.test

diff --git a/mysql-test/suite/funcs_1/cursors/cursors_master.test b/mysql-test/suite/funcs_1/cursors/cursors_master.test
index cf4c9e56dfa..19961503b77 100644
--- a/mysql-test/suite/funcs_1/cursors/cursors_master.test
+++ b/mysql-test/suite/funcs_1/cursors/cursors_master.test
@@ -1,3 +1,4 @@
 #### suite/funcs_1/cursors/cursors_master.test
+
 let $message= NOT YET IMPLEMENTED: cursor tests;
 --source include/show_msg80.inc
diff --git a/mysql-test/suite/funcs_1/datadict/datadict_master.inc b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
index 6088a5c5143..03d3eeb3777 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_master.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
@@ -3881,11 +3881,11 @@ let $message= Testcase 3.2.20.1:;
 let $is_table= referential_constraints;
 # when table is implemented remove this and the next 4 lines and "enable" 5th line:
 # and don't forget to add the test description to QATestPlanV50func
-#let $message= checking a table that will be implemented later;
-#--source include/show_msg.inc
-#--error 1109
+let $message= checking a table that will be implemented later;
+--source include/show_msg.inc
+--error 1109
 eval DESC $is_table;
---source suite/funcs_1/datadict/datadict_show_table_design.inc
+#--source suite/funcs_1/datadict/datadict_show_table_design.inc
 # -------------------------------------------------------------------------------------------------------
 
 
diff --git a/mysql-test/suite/funcs_1/datadict/datadict_tables.inc b/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
index 14e39c083b0..ea6e7c5d534 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
@@ -58,5 +58,5 @@ eval $dd_part1 triggers                              $dd_part2;
 --error 1109
 eval $dd_part1 parameters $dd_part2;
 
---error 0,1109
+--error 1109
 eval $dd_part1 referential_constraints $dd_part2;
diff --git a/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc b/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/r/innodb__datadict.result b/mysql-test/suite/funcs_1/r/innodb__datadict.result
index 25c5fbbf358..675f30da14a 100644
--- a/mysql-test/suite/funcs_1/r/innodb__datadict.result
+++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result
@@ -435,21 +435,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -472,7 +461,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -493,7 +482,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -514,7 +503,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -535,7 +524,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -556,7 +545,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -574,199 +563,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	ENGINES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	EVENTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	FILES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PARTITIONS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PLUGINS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PROCESSLIST
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	REFERENTIAL_CONSTRAINTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -787,7 +587,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -808,7 +608,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -829,7 +629,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -847,52 +647,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -913,7 +671,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -934,7 +692,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -955,7 +713,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -976,7 +734,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -997,7 +755,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -1018,7 +776,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -1143,27 +901,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	event
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Events
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1185,27 +922,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	general_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	General log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1311,48 +1027,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	ndb_binlog_index
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	latin1_swedish_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	plugin
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_bin
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL plugins
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1395,48 +1069,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	servers
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL Foreign Servers table
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	slow_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Slow log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1902,8 +1534,6 @@ t.table_type, t.engine
 from schemata s inner join tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
-NULL	db_datadict	latin1	BASE TABLE	CSV
-NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
@@ -1936,10 +1566,6 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -1952,17 +1578,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1970,8 +1585,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
-NULL	information_schema	utf8	BASE TABLE	CSV
-NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
@@ -2004,10 +1617,6 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -2020,17 +1629,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -2038,8 +1636,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
-NULL	mysql	latin1	BASE TABLE	CSV
-NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
@@ -2072,10 +1668,6 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -2088,17 +1680,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -2106,8 +1687,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
-NULL	test	latin1	BASE TABLE	CSV
-NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
@@ -2140,10 +1719,6 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -2156,17 +1731,6 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -2174,8 +1738,6 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
-NULL	test1	latin1	BASE TABLE	CSV
-NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
@@ -2208,10 +1770,6 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -2224,17 +1782,6 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -2242,8 +1789,6 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
-NULL	test4	latin1	BASE TABLE	CSV
-NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
@@ -2276,10 +1821,6 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -2292,17 +1833,6 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -2328,14 +1858,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -2350,75 +1880,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2431,60 +1892,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2515,10 +1922,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2539,20 +1942,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -2603,20 +2006,20 @@ NULL	db_datadict	v1	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_genera
 NULL	db_datadict	v1	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
 NULL	db_datadict	v1	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references	
-NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select,insert,update,references	
 NULL	db_datadict	vu	u	1		NO	varchar	81	243	NULL	NULL	utf8	utf8_general_ci	varchar(81)			select,insert,update,references	
@@ -2650,36 +2053,10 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
-NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
-NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
-NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
-NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
-NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
-NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
-NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
-NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
-NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -2713,16 +2090,6 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
-NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -2747,33 +2114,13 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
-NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
-NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -2818,16 +2165,14 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -3194,7 +2539,7 @@ cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
 eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
 select sum(id) from collations;
 sum(id)
-10840
+10741
 select collation_name, character_set_name into @x,@y
 from collation_character_set_applicability limit 1;
 select @x, @y;
@@ -3219,8 +2564,6 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -3232,8 +2575,6 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
-NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
-NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	1	NULL	NULL		BTREE	
@@ -3243,7 +2584,6 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -3274,7 +2614,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -3290,7 +2629,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -3301,7 +2639,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -3317,7 +2654,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -3328,7 +2664,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -3344,7 +2679,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -3362,8 +2696,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
-''@'%'	NULL	test	EVENT	NO
-''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -3378,8 +2710,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
-''@'%'	NULL	test\_%	EVENT	NO
-''@'%'	NULL	test\_%	TRIGGER	NO
 select * from table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 select * from column_privileges;
@@ -3388,7 +2718,6 @@ select * from table_constraints;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
@@ -3398,11 +2727,8 @@ NULL	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 NULL	mysql	name	mysql	help_topic	UNIQUE
 NULL	mysql	PRIMARY	mysql	host	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	ndb_binlog_index	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	proc	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	servers	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone_leap_second	PRIMARY KEY
@@ -3420,8 +2746,6 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_category	name	1	NULL	NULL	NULL	NULL
@@ -3433,8 +2757,6 @@ NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_topic	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -3443,7 +2765,6 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -3459,7 +2780,7 @@ NULL	mysql	PRIMARY	NULL	mysql	user	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	user	User	2	NULL	NULL	NULL	NULL
 select count(*) as max_recs from key_column_usage;
 max_recs
-45
+40
 select max(cardinality) from statistics;
 max(cardinality)
 393
@@ -3480,21 +2801,10 @@ Table or view 'COLLATIONS' is associated with the database 'information_schema'.
 Table or view 'COLLATION_CHARACTER_SET_APPLICABILITY' is associated with the database 'information_schema'.
 Table or view 'COLUMNS' is associated with the database 'information_schema'.
 Table or view 'COLUMN_PRIVILEGES' is associated with the database 'information_schema'.
-Table or view 'ENGINES' is associated with the database 'information_schema'.
-Table or view 'EVENTS' is associated with the database 'information_schema'.
-Table or view 'FILES' is associated with the database 'information_schema'.
-Table or view 'GLOBAL_STATUS' is associated with the database 'information_schema'.
-Table or view 'GLOBAL_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_schema'.
-Table or view 'PARTITIONS' is associated with the database 'information_schema'.
-Table or view 'PLUGINS' is associated with the database 'information_schema'.
-Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
-Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
 Table or view 'SCHEMA_PRIVILEGES' is associated with the database 'information_schema'.
-Table or view 'SESSION_STATUS' is associated with the database 'information_schema'.
-Table or view 'SESSION_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'STATISTICS' is associated with the database 'information_schema'.
 Table or view 'TABLES' is associated with the database 'information_schema'.
 Table or view 'TABLE_CONSTRAINTS' is associated with the database 'information_schema'.
@@ -3507,20 +2817,14 @@ Table or view 'vu' is associated with the database 'db_datadict'.
 Table or view 'vu1' is associated with the database 'db_datadict'.
 Table or view 'columns_priv' is associated with the database 'mysql'.
 Table or view 'db' is associated with the database 'mysql'.
-Table or view 'event' is associated with the database 'mysql'.
 Table or view 'func' is associated with the database 'mysql'.
-Table or view 'general_log' is associated with the database 'mysql'.
 Table or view 'help_category' is associated with the database 'mysql'.
 Table or view 'help_keyword' is associated with the database 'mysql'.
 Table or view 'help_relation' is associated with the database 'mysql'.
 Table or view 'help_topic' is associated with the database 'mysql'.
 Table or view 'host' is associated with the database 'mysql'.
-Table or view 'ndb_binlog_index' is associated with the database 'mysql'.
-Table or view 'plugin' is associated with the database 'mysql'.
 Table or view 'proc' is associated with the database 'mysql'.
 Table or view 'procs_priv' is associated with the database 'mysql'.
-Table or view 'servers' is associated with the database 'mysql'.
-Table or view 'slow_log' is associated with the database 'mysql'.
 Table or view 'tables_priv' is associated with the database 'mysql'.
 Table or view 'time_zone' is associated with the database 'mysql'.
 Table or view 'time_zone_leap_second' is associated with the database 'mysql'.
@@ -3567,12 +2871,12 @@ select * from table_constraints limit 0,5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
+NULL	mysql	name	mysql	help_category	UNIQUE
 select count(*) as max_recs from key_column_usage limit 0,5;
 max_recs
-45
+40
 select information_schema.tables.table_name as "table name",
 count(distinct(column_name)) as "no of columns in the table"
   from information_schema.tables left outer join information_schema.columns on
@@ -3585,36 +2889,19 @@ COLLATION_CHARACTER_SET_APPLICABILITY	2
 COLUMNS	19
 columns_priv	7
 COLUMN_PRIVILEGES	7
-db	22
-ENGINES	6
-event	18
-EVENTS	21
-FILES	38
+db	20
 func	4
-general_log	6
-GLOBAL_STATUS	2
-GLOBAL_VARIABLES	2
 help_category	4
 help_keyword	2
 help_relation	2
 help_topic	6
-host	20
+host	19
 KEY_COLUMN_USAGE	12
-ndb_binlog_index	7
-PARTITIONS	25
-plugin	2
-PLUGINS	10
 proc	16
-PROCESSLIST	8
 procs_priv	8
-REFERENTIAL_CONSTRAINTS	11
 ROUTINES	20
 SCHEMATA	5
 SCHEMA_PRIVILEGES	5
-servers	9
-SESSION_STATUS	2
-SESSION_VARIABLES	2
-slow_log	11
 STATISTICS	15
 t1	6
 t10	6
@@ -3640,7 +2927,7 @@ time_zone_name	2
 time_zone_transition	3
 time_zone_transition_type	5
 TRIGGERS	19
-user	39
+user	37
 USER_PRIVILEGES	4
 v1	21
 VIEWS	8
@@ -3654,7 +2941,7 @@ CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_P
 NULL	information_schema	utf8	utf8_general_ci	NULL
 SELECT * FROM tables                                LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
 SELECT * FROM columns                               LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3699,7 +2986,7 @@ TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATA
 SELECT * FROM parameters LIMIT 1;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT * FROM referential_constraints LIMIT 1;
-CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	UNIQUE_CONSTRAINT_CATALOG	UNIQUE_CONSTRAINT_SCHEMA	UNIQUE_CONSTRAINT_NAME	MATCH_OPTION	UPDATE_RULE	DELETE_RULE	TABLE_NAME	REFERENCED_TABLE_NAME
+ERROR 42S02: Unknown table 'referential_constraints' in information_schema
 use db_datadict;
 select * from schemata;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
@@ -3789,7 +3076,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3810,7 +3097,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3831,7 +3118,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3852,7 +3139,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3873,7 +3160,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3891,199 +3178,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	ENGINES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	EVENTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	FILES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PARTITIONS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PLUGINS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PROCESSLIST
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	REFERENTIAL_CONSTRAINTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4104,7 +3202,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4125,7 +3223,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4146,7 +3244,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4164,52 +3262,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4230,7 +3286,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4251,7 +3307,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4272,7 +3328,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4293,7 +3349,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4314,7 +3370,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4335,7 +3391,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4460,27 +3516,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	event
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Events
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4502,27 +3537,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	general_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	General log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4628,48 +3642,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	ndb_binlog_index
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	latin1_swedish_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	plugin
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_bin
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL plugins
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4712,48 +3684,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	servers
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL Foreign Servers table
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	slow_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Slow log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -5219,8 +4149,6 @@ t.table_type, t.engine
 from information_schema.schemata s inner join information_schema.tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
-NULL	db_datadict	latin1	BASE TABLE	CSV
-NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
@@ -5253,10 +4181,6 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -5269,17 +4193,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -5287,8 +4200,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
-NULL	information_schema	utf8	BASE TABLE	CSV
-NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
@@ -5321,10 +4232,6 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -5337,17 +4244,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -5355,8 +4251,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
-NULL	mysql	latin1	BASE TABLE	CSV
-NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
@@ -5389,10 +4283,6 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -5405,17 +4295,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -5423,8 +4302,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
-NULL	test	latin1	BASE TABLE	CSV
-NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
@@ -5457,10 +4334,6 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -5473,17 +4346,6 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -5491,8 +4353,6 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
-NULL	test1	latin1	BASE TABLE	CSV
-NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
@@ -5525,10 +4385,6 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -5541,17 +4397,6 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -5559,8 +4404,6 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
-NULL	test4	latin1	BASE TABLE	CSV
-NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
@@ -5593,10 +4436,6 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -5609,17 +4448,6 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -5694,9 +4522,9 @@ select * from information_schema.table_constraints limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
+NULL	mysql	name	mysql	help_category	UNIQUE
 select * from information_schema.key_column_usage limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Host	1	NULL	NULL	NULL	NULL
@@ -5706,7 +4534,7 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Table_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 select count(*) as max_recs from information_schema.key_column_usage limit 0, 5;
 max_recs
-45
+40
 
 root: check with db name
 ------------------------
@@ -5715,34 +4543,34 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-68
+51
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-842
+657
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
 SELECT COUNT(*) FROM information_schema. collations                            ;
 COUNT(*)
-127
+126
 SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ;
 COUNT(*)
-128
+126
 SELECT COUNT(*) FROM information_schema. routines                              ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM information_schema. statistics                            ;
 COUNT(*)
-48
+43
 SELECT COUNT(*) FROM information_schema. views                                 ;
 COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-81
+75
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
-32
+28
 SELECT COUNT(*) FROM information_schema. table_privileges                      ;
 COUNT(*)
 0
@@ -5751,18 +4579,17 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. table_constraints                     ;
 COUNT(*)
-24
+20
 SELECT COUNT(*) FROM information_schema. key_column_usage                      ;
 COUNT(*)
-45
+40
 SELECT COUNT(*) FROM information_schema. triggers                              ;
 COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. parameters ;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT COUNT(*) FROM information_schema. referential_constraints ;
-COUNT(*)
-0
+ERROR 42S02: Unknown table 'referential_constraints' in information_schema
 USE db_datadict;
 DROP VIEW v1, vu1, vu;
 DROP PROCEDURE db_datadict.sp_1;
@@ -5780,10 +4607,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-65
+48
 select count(*) as the_cols from columns;
 the_cols
-817
+632
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -5821,21 +4648,10 @@ information_schema, COLLATIONS
 information_schema, COLLATION_CHARACTER_SET_APPLICABILITY
 information_schema, COLUMNS
 information_schema, COLUMN_PRIVILEGES
-information_schema, ENGINES
-information_schema, EVENTS
-information_schema, FILES
-information_schema, GLOBAL_STATUS
-information_schema, GLOBAL_VARIABLES
 information_schema, KEY_COLUMN_USAGE
-information_schema, PARTITIONS
-information_schema, PLUGINS
-information_schema, PROCESSLIST
-information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
 information_schema, SCHEMA_PRIVILEGES
-information_schema, SESSION_STATUS
-information_schema, SESSION_VARIABLES
 information_schema, STATISTICS
 information_schema, TABLES
 information_schema, TABLE_CONSTRAINTS
@@ -5845,20 +4661,14 @@ information_schema, USER_PRIVILEGES
 information_schema, VIEWS
 mysql, columns_priv
 mysql, db
-mysql, event
 mysql, func
-mysql, general_log
 mysql, help_category
 mysql, help_keyword
 mysql, help_relation
 mysql, help_topic
 mysql, host
-mysql, ndb_binlog_index
-mysql, plugin
 mysql, proc
 mysql, procs_priv
-mysql, servers
-mysql, slow_log
 mysql, tables_priv
 mysql, time_zone
 mysql, time_zone_leap_second
@@ -5904,7 +4714,7 @@ NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
 select sum(ordinal_position) from key_column_usage;
 sum(ordinal_position)
-83
+77
 select * from schemata limit 0,5;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
 NULL	information_schema	utf8	utf8_general_ci	NULL
@@ -5951,8 +4761,6 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
-'root'@'127.0.0.1'
-'root'@'127.0.0.1'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -5978,10 +4786,6 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
-'root'@'<SERVER_NAME>'
-'root'@'<SERVER_NAME>'
-'root'@'localhost'
-'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
@@ -7490,7 +6294,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7506,7 +6309,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7517,7 +6319,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7533,7 +6334,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7544,7 +6344,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7560,7 +6359,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7641,7 +6439,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7657,7 +6454,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7668,7 +6464,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7684,7 +6479,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7695,7 +6489,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7711,7 +6504,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
@@ -7778,7 +6570,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7794,7 +6585,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7805,7 +6595,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7821,7 +6610,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7832,7 +6620,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7848,7 +6635,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7927,7 +6713,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7943,7 +6728,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7954,7 +6738,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7970,7 +6753,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7981,7 +6763,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7997,7 +6778,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -8072,7 +6852,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -8088,7 +6867,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -8099,7 +6877,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -8115,7 +6892,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -8126,7 +6902,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -8142,7 +6917,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -8230,7 +7004,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -8246,7 +7019,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -8257,7 +7029,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -8273,7 +7044,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -8284,7 +7054,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -8300,7 +7069,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
@@ -8366,7 +7134,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -8382,7 +7149,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -8393,7 +7159,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -8409,7 +7174,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -8420,7 +7184,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -8436,7 +7199,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -8478,21 +7240,10 @@ information_schema	COLLATIONS	MEMORY
 information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	MEMORY
 information_schema	COLUMNS	MyISAM
 information_schema	COLUMN_PRIVILEGES	MEMORY
-information_schema	ENGINES	MEMORY
-information_schema	EVENTS	MyISAM
-information_schema	FILES	MEMORY
-information_schema	GLOBAL_STATUS	MEMORY
-information_schema	GLOBAL_VARIABLES	MyISAM
 information_schema	KEY_COLUMN_USAGE	MEMORY
-information_schema	PARTITIONS	MyISAM
-information_schema	PLUGINS	MyISAM
-information_schema	PROCESSLIST	MyISAM
-information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
 information_schema	SCHEMA_PRIVILEGES	MEMORY
-information_schema	SESSION_STATUS	MEMORY
-information_schema	SESSION_VARIABLES	MyISAM
 information_schema	STATISTICS	MEMORY
 information_schema	TABLES	MEMORY
 information_schema	TABLE_CONSTRAINTS	MEMORY
@@ -8521,21 +7272,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -8562,21 +7302,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -8640,7 +7369,6 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
-filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -8655,7 +7383,6 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
-cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -8746,21 +7473,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -8799,14 +7515,14 @@ COLUMNS	TABLE_CATALOG	varchar(4096)
 COLUMNS	TABLE_SCHEMA	varchar(64)
 COLUMNS	TABLE_NAME	varchar(64)
 COLUMNS	COLUMN_NAME	varchar(64)
-COLUMNS	ORDINAL_POSITION	bigint(21) unsigned
+COLUMNS	ORDINAL_POSITION	bigint(21)
 COLUMNS	COLUMN_DEFAULT	longtext
 COLUMNS	IS_NULLABLE	varchar(3)
 COLUMNS	DATA_TYPE	varchar(64)
-COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned
-COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21) unsigned
-COLUMNS	NUMERIC_PRECISION	bigint(21) unsigned
-COLUMNS	NUMERIC_SCALE	bigint(21) unsigned
+COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21)
+COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21)
+COLUMNS	NUMERIC_PRECISION	bigint(21)
+COLUMNS	NUMERIC_SCALE	bigint(21)
 COLUMNS	CHARACTER_SET_NAME	varchar(64)
 COLUMNS	COLLATION_NAME	varchar(64)
 COLUMNS	COLUMN_TYPE	longtext
@@ -8821,75 +7537,6 @@ COLUMN_PRIVILEGES	TABLE_NAME	varchar(64)
 COLUMN_PRIVILEGES	COLUMN_NAME	varchar(64)
 COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 COLUMN_PRIVILEGES	IS_GRANTABLE	varchar(3)
-ENGINES	ENGINE	varchar(64)
-ENGINES	SUPPORT	varchar(8)
-ENGINES	COMMENT	varchar(80)
-ENGINES	TRANSACTIONS	varchar(3)
-ENGINES	XA	varchar(3)
-ENGINES	SAVEPOINTS	varchar(3)
-EVENTS	EVENT_CATALOG	varchar(64)
-EVENTS	EVENT_SCHEMA	varchar(64)
-EVENTS	EVENT_NAME	varchar(64)
-EVENTS	DEFINER	varchar(77)
-EVENTS	TIME_ZONE	varchar(64)
-EVENTS	EVENT_BODY	varchar(8)
-EVENTS	EVENT_DEFINITION	longtext
-EVENTS	EVENT_TYPE	varchar(9)
-EVENTS	EXECUTE_AT	datetime
-EVENTS	INTERVAL_VALUE	varchar(256)
-EVENTS	INTERVAL_FIELD	varchar(18)
-EVENTS	SQL_MODE	longtext
-EVENTS	STARTS	datetime
-EVENTS	ENDS	datetime
-EVENTS	STATUS	varchar(18)
-EVENTS	ON_COMPLETION	varchar(12)
-EVENTS	CREATED	datetime
-EVENTS	LAST_ALTERED	datetime
-EVENTS	LAST_EXECUTED	datetime
-EVENTS	EVENT_COMMENT	varchar(64)
-EVENTS	ORIGINATOR	bigint(10)
-FILES	FILE_ID	bigint(4)
-FILES	FILE_NAME	varchar(64)
-FILES	FILE_TYPE	varchar(20)
-FILES	TABLESPACE_NAME	varchar(64)
-FILES	TABLE_CATALOG	varchar(64)
-FILES	TABLE_SCHEMA	varchar(64)
-FILES	TABLE_NAME	varchar(64)
-FILES	LOGFILE_GROUP_NAME	varchar(64)
-FILES	LOGFILE_GROUP_NUMBER	bigint(4)
-FILES	ENGINE	varchar(64)
-FILES	FULLTEXT_KEYS	varchar(64)
-FILES	DELETED_ROWS	bigint(4)
-FILES	UPDATE_COUNT	bigint(4)
-FILES	FREE_EXTENTS	bigint(4)
-FILES	TOTAL_EXTENTS	bigint(4)
-FILES	EXTENT_SIZE	bigint(4)
-FILES	INITIAL_SIZE	bigint(21) unsigned
-FILES	MAXIMUM_SIZE	bigint(21) unsigned
-FILES	AUTOEXTEND_SIZE	bigint(21) unsigned
-FILES	CREATION_TIME	datetime
-FILES	LAST_UPDATE_TIME	datetime
-FILES	LAST_ACCESS_TIME	datetime
-FILES	RECOVER_TIME	bigint(4)
-FILES	TRANSACTION_COUNTER	bigint(4)
-FILES	VERSION	bigint(21) unsigned
-FILES	ROW_FORMAT	varchar(10)
-FILES	TABLE_ROWS	bigint(21) unsigned
-FILES	AVG_ROW_LENGTH	bigint(21) unsigned
-FILES	DATA_LENGTH	bigint(21) unsigned
-FILES	MAX_DATA_LENGTH	bigint(21) unsigned
-FILES	INDEX_LENGTH	bigint(21) unsigned
-FILES	DATA_FREE	bigint(21) unsigned
-FILES	CREATE_TIME	datetime
-FILES	UPDATE_TIME	datetime
-FILES	CHECK_TIME	datetime
-FILES	CHECKSUM	bigint(21) unsigned
-FILES	STATUS	varchar(20)
-FILES	EXTRA	varchar(255)
-GLOBAL_STATUS	VARIABLE_NAME	varchar(64)
-GLOBAL_STATUS	VARIABLE_VALUE	decimal(22,7)
-GLOBAL_VARIABLES	VARIABLE_NAME	varchar(64)
-GLOBAL_VARIABLES	VARIABLE_VALUE	longtext
 KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar(4096)
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar(64)
@@ -8902,60 +7549,6 @@ KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar(64)
-PARTITIONS	TABLE_CATALOG	varchar(4096)
-PARTITIONS	TABLE_SCHEMA	varchar(64)
-PARTITIONS	TABLE_NAME	varchar(64)
-PARTITIONS	PARTITION_NAME	varchar(64)
-PARTITIONS	SUBPARTITION_NAME	varchar(64)
-PARTITIONS	PARTITION_ORDINAL_POSITION	bigint(21) unsigned
-PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint(21) unsigned
-PARTITIONS	PARTITION_METHOD	varchar(12)
-PARTITIONS	SUBPARTITION_METHOD	varchar(12)
-PARTITIONS	PARTITION_EXPRESSION	longtext
-PARTITIONS	SUBPARTITION_EXPRESSION	longtext
-PARTITIONS	PARTITION_DESCRIPTION	longtext
-PARTITIONS	TABLE_ROWS	bigint(21) unsigned
-PARTITIONS	AVG_ROW_LENGTH	bigint(21) unsigned
-PARTITIONS	DATA_LENGTH	bigint(21) unsigned
-PARTITIONS	MAX_DATA_LENGTH	bigint(21) unsigned
-PARTITIONS	INDEX_LENGTH	bigint(21) unsigned
-PARTITIONS	DATA_FREE	bigint(21) unsigned
-PARTITIONS	CREATE_TIME	datetime
-PARTITIONS	UPDATE_TIME	datetime
-PARTITIONS	CHECK_TIME	datetime
-PARTITIONS	CHECKSUM	bigint(21) unsigned
-PARTITIONS	PARTITION_COMMENT	varchar(80)
-PARTITIONS	NODEGROUP	varchar(12)
-PARTITIONS	TABLESPACE_NAME	varchar(64)
-PLUGINS	PLUGIN_NAME	varchar(64)
-PLUGINS	PLUGIN_VERSION	varchar(20)
-PLUGINS	PLUGIN_STATUS	varchar(10)
-PLUGINS	PLUGIN_TYPE	varchar(80)
-PLUGINS	PLUGIN_TYPE_VERSION	varchar(20)
-PLUGINS	PLUGIN_LIBRARY	varchar(64)
-PLUGINS	PLUGIN_LIBRARY_VERSION	varchar(20)
-PLUGINS	PLUGIN_AUTHOR	varchar(64)
-PLUGINS	PLUGIN_DESCRIPTION	longtext
-PLUGINS	PLUGIN_LICENSE	varchar(80)
-PROCESSLIST	ID	bigint(4)
-PROCESSLIST	USER	varchar(16)
-PROCESSLIST	HOST	varchar(64)
-PROCESSLIST	DB	varchar(64)
-PROCESSLIST	COMMAND	varchar(16)
-PROCESSLIST	TIME	bigint(7)
-PROCESSLIST	STATE	varchar(64)
-PROCESSLIST	INFO	longtext
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar(4096)
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar(64)
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar(64)
-REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar(64)
-REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar(64)
-REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar(64)
-REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar(64)
-REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar(64)
 ROUTINES	SPECIFIC_NAME	varchar(64)
 ROUTINES	ROUTINE_CATALOG	varchar(4096)
 ROUTINES	ROUTINE_SCHEMA	varchar(64)
@@ -8986,10 +7579,6 @@ SCHEMA_PRIVILEGES	TABLE_CATALOG	varchar(4096)
 SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar(64)
 SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar(3)
-SESSION_STATUS	VARIABLE_NAME	varchar(64)
-SESSION_STATUS	VARIABLE_VALUE	decimal(22,7)
-SESSION_VARIABLES	VARIABLE_NAME	varchar(64)
-SESSION_VARIABLES	VARIABLE_VALUE	longtext
 STATISTICS	TABLE_CATALOG	varchar(4096)
 STATISTICS	TABLE_SCHEMA	varchar(64)
 STATISTICS	TABLE_NAME	varchar(64)
@@ -9010,20 +7599,20 @@ TABLES	TABLE_SCHEMA	varchar(64)
 TABLES	TABLE_NAME	varchar(64)
 TABLES	TABLE_TYPE	varchar(64)
 TABLES	ENGINE	varchar(64)
-TABLES	VERSION	bigint(21) unsigned
+TABLES	VERSION	bigint(21)
 TABLES	ROW_FORMAT	varchar(10)
-TABLES	TABLE_ROWS	bigint(21) unsigned
-TABLES	AVG_ROW_LENGTH	bigint(21) unsigned
-TABLES	DATA_LENGTH	bigint(21) unsigned
-TABLES	MAX_DATA_LENGTH	bigint(21) unsigned
-TABLES	INDEX_LENGTH	bigint(21) unsigned
-TABLES	DATA_FREE	bigint(21) unsigned
-TABLES	AUTO_INCREMENT	bigint(21) unsigned
+TABLES	TABLE_ROWS	bigint(21)
+TABLES	AVG_ROW_LENGTH	bigint(21)
+TABLES	DATA_LENGTH	bigint(21)
+TABLES	MAX_DATA_LENGTH	bigint(21)
+TABLES	INDEX_LENGTH	bigint(21)
+TABLES	DATA_FREE	bigint(21)
+TABLES	AUTO_INCREMENT	bigint(21)
 TABLES	CREATE_TIME	datetime
 TABLES	UPDATE_TIME	datetime
 TABLES	CHECK_TIME	datetime
 TABLES	TABLE_COLLATION	varchar(64)
-TABLES	CHECKSUM	bigint(21) unsigned
+TABLES	CHECKSUM	bigint(21)
 TABLES	CREATE_OPTIONS	varchar(255)
 TABLES	TABLE_COMMENT	varchar(80)
 TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
@@ -9425,7 +8014,6 @@ cp1250_general_ci
 cp1250_czech_cs
 cp1250_croatian_ci
 cp1250_bin
-cp1250_polish_ci
 gbk_chinese_ci
 gbk_bin
 latin5_turkish_ci
@@ -9633,10 +8221,10 @@ MAXLEN	bigint(3)	NO		0
 SHOW CREATE TABLE character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
-  `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
+  `DESCRIPTION` varchar(60) NOT NULL default '',
+  `MAXLEN` bigint(3) NOT NULL default '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -9714,12 +8302,12 @@ SORTLEN	bigint(3)	NO		0
 SHOW CREATE TABLE collations;
 Table	Create Table
 COLLATIONS	CREATE TEMPORARY TABLE `COLLATIONS` (
-  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ID` bigint(11) NOT NULL DEFAULT '0',
-  `IS_DEFAULT` varchar(3) NOT NULL DEFAULT '',
-  `IS_COMPILED` varchar(3) NOT NULL DEFAULT '',
-  `SORTLEN` bigint(3) NOT NULL DEFAULT '0'
+  `COLLATION_NAME` varchar(64) NOT NULL default '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `ID` bigint(11) NOT NULL default '0',
+  `IS_DEFAULT` varchar(3) NOT NULL default '',
+  `IS_COMPILED` varchar(3) NOT NULL default '',
+  `SORTLEN` bigint(3) NOT NULL default '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -9790,7 +8378,6 @@ cp1250_general_ci	cp1250	26	Yes	Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_bin	cp1250	66		Yes	1
-cp1250_polish_ci	cp1250	99		Yes	1
 gbk_chinese_ci	gbk	28	Yes	Yes	1
 gbk_bin	gbk	87		Yes	1
 latin5_turkish_ci	latin5	30	Yes		0
@@ -9884,8 +8471,8 @@ CHARACTER_SET_NAME	varchar(64)	NO
 SHOW CREATE TABLE collation_character_set_applicability;
 Table	Create Table
 COLLATION_CHARACTER_SET_APPLICABILITY	CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
-  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT ''
+  `COLLATION_NAME` varchar(64) NOT NULL default '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -9938,7 +8525,6 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
-filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -9953,7 +8539,6 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
-cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -10052,13 +8637,13 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE column_privileges;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -10164,8 +8749,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_3'@'localhost'	NULL	db_datadict	SHOW VIEW	NO
 'user_3'@'localhost'	NULL	db_datadict	CREATE ROUTINE	NO
 'user_3'@'localhost'	NULL	db_datadict	ALTER ROUTINE	NO
-'user_3'@'localhost'	NULL	db_datadict	EVENT	NO
-'user_3'@'localhost'	NULL	db_datadict	TRIGGER	NO
 SELECT * FROM information_schema.column_privileges
 WHERE grantee LIKE "'user%"
  ORDER BY grantee, table_name, column_name, privilege_type;
@@ -10206,14 +8789,14 @@ TABLE_CATALOG	varchar(4096)	YES		NULL
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
 COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(21) unsigned	NO		0	
+ORDINAL_POSITION	bigint(21)	NO		0	
 COLUMN_DEFAULT	longtext	YES		NULL	
 IS_NULLABLE	varchar(3)	NO			
 DATA_TYPE	varchar(64)	NO			
-CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL	
-CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
-NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
-NUMERIC_SCALE	bigint(21) unsigned	YES		NULL	
+CHARACTER_MAXIMUM_LENGTH	bigint(21)	YES		NULL	
+CHARACTER_OCTET_LENGTH	bigint(21)	YES		NULL	
+NUMERIC_PRECISION	bigint(21)	YES		NULL	
+NUMERIC_SCALE	bigint(21)	YES		NULL	
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 COLUMN_TYPE	longtext	NO			
@@ -10224,25 +8807,25 @@ COLUMN_COMMENT	varchar(255)	NO
 SHOW CREATE TABLE columns;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ORDINAL_POSITION` bigint(21) unsigned NOT NULL DEFAULT '0',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `ORDINAL_POSITION` bigint(21) NOT NULL default '0',
   `COLUMN_DEFAULT` longtext,
-  `IS_NULLABLE` varchar(3) NOT NULL DEFAULT '',
-  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
-  `NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
-  `COLLATION_NAME` varchar(64) DEFAULT NULL,
+  `IS_NULLABLE` varchar(3) NOT NULL default '',
+  `DATA_TYPE` varchar(64) NOT NULL default '',
+  `CHARACTER_MAXIMUM_LENGTH` bigint(21) default NULL,
+  `CHARACTER_OCTET_LENGTH` bigint(21) default NULL,
+  `NUMERIC_PRECISION` bigint(21) default NULL,
+  `NUMERIC_SCALE` bigint(21) default NULL,
+  `CHARACTER_SET_NAME` varchar(64) default NULL,
+  `COLLATION_NAME` varchar(64) default NULL,
   `COLUMN_TYPE` longtext NOT NULL,
-  `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
-  `EXTRA` varchar(20) NOT NULL DEFAULT '',
-  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
-  `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
+  `COLUMN_KEY` varchar(3) NOT NULL default '',
+  `EXTRA` varchar(20) NOT NULL default '',
+  `PRIVILEGES` varchar(80) NOT NULL default '',
+  `COLUMN_COMMENT` varchar(255) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -10259,14 +8842,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -10314,14 +8897,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -10336,75 +8919,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10417,60 +8931,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10501,10 +8961,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10525,20 +8981,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10611,36 +9067,10 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
-NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
-NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
-NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
-NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
-NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
-NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
-NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
-NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
-NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -10674,16 +9104,6 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
-NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -10708,33 +9128,13 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
-NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
-NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -10779,16 +9179,14 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -11137,14 +9535,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -11159,75 +9557,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11240,60 +9569,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11324,10 +9599,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11348,20 +9619,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -11698,14 +9969,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -11720,75 +9991,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11801,60 +10003,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11885,10 +10033,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11909,20 +10053,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -12265,9 +10409,7 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	set	latin1	latin1_swedish_ci
 1.0000	text	latin1	latin1_swedish_ci
 1.0000	tinytext	latin1	latin1_swedish_ci
-1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	longtext	utf8	utf8_general_ci
-1.0000	mediumtext	utf8	utf8_general_ci
 1.0000	text	utf8	utf8_general_ci
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
@@ -12357,14 +10499,14 @@ NULL	information_schema	COLLATIONS	SORTLEN	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	COLUMNS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21)
 1.0000	information_schema	COLUMNS	COLUMN_DEFAULT	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	COLUMNS	IS_NULLABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	COLUMNS	DATA_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	COLUMNS	CHARACTER_SET_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLLATION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	COLUMNS	COLUMN_TYPE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
@@ -12379,75 +10521,6 @@ NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(
 3.0000	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	ENGINES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	ENGINES	SUPPORT	varchar	8	24	utf8	utf8_general_ci	varchar(8)
-3.0000	information_schema	ENGINES	COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-3.0000	information_schema	ENGINES	TRANSACTIONS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	ENGINES	XA	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	ENGINES	SAVEPOINTS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	EVENTS	EVENT_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	EVENT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	EVENT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)
-3.0000	information_schema	EVENTS	TIME_ZONE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	EVENT_BODY	varchar	8	24	utf8	utf8_general_ci	varchar(8)
-1.0000	information_schema	EVENTS	EVENT_DEFINITION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-3.0000	information_schema	EVENTS	EVENT_TYPE	varchar	9	27	utf8	utf8_general_ci	varchar(9)
-NULL	information_schema	EVENTS	EXECUTE_AT	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	information_schema	EVENTS	INTERVAL_VALUE	varchar	256	768	utf8	utf8_general_ci	varchar(256)
-3.0000	information_schema	EVENTS	INTERVAL_FIELD	varchar	18	54	utf8	utf8_general_ci	varchar(18)
-1.0000	information_schema	EVENTS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-NULL	information_schema	EVENTS	STARTS	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	EVENTS	ENDS	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	information_schema	EVENTS	STATUS	varchar	18	54	utf8	utf8_general_ci	varchar(18)
-3.0000	information_schema	EVENTS	ON_COMPLETION	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-NULL	information_schema	EVENTS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	EVENTS	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	EVENTS	LAST_EXECUTED	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	information_schema	EVENTS	EVENT_COMMENT	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	EVENTS	ORIGINATOR	bigint	NULL	NULL	NULL	NULL	bigint(10)
-NULL	information_schema	FILES	FILE_ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	FILES	FILE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	FILE_TYPE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	FILES	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	TABLE_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	LOGFILE_GROUP_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	FILES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	FULLTEXT_KEYS	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	FILES	DELETED_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	UPDATE_COUNT	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	FREE_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	TOTAL_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	EXTENT_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	INITIAL_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	MAXIMUM_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	CREATION_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	LAST_UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	LAST_ACCESS_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	RECOVER_TIME	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	TRANSACTION_COUNTER	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	FILES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-NULL	information_schema	FILES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	FILES	STATUS	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	FILES	EXTRA	varchar	255	765	utf8	utf8_general_ci	varchar(255)
-3.0000	information_schema	GLOBAL_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
-3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -12460,60 +10533,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint	NU
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-3.0000	information_schema	PARTITIONS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	PARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	SUBPARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	PARTITIONS	PARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-3.0000	information_schema	PARTITIONS	SUBPARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-1.0000	information_schema	PARTITIONS	PARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-1.0000	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-1.0000	information_schema	PARTITIONS	PARTITION_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-NULL	information_schema	PARTITIONS	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	PARTITIONS	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	PARTITIONS	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	PARTITIONS	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	PARTITIONS	PARTITION_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-3.0000	information_schema	PARTITIONS	NODEGROUP	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-3.0000	information_schema	PARTITIONS	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PLUGINS	PLUGIN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PLUGINS	PLUGIN_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	PLUGINS	PLUGIN_STATUS	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-3.0000	information_schema	PLUGINS	PLUGIN_TYPE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-3.0000	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	PLUGINS	PLUGIN_AUTHOR	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	PLUGINS	PLUGIN_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-3.0000	information_schema	PLUGINS	PLUGIN_LICENSE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	PROCESSLIST	USER	varchar	16	48	utf8	utf8_general_ci	varchar(16)
-3.0000	information_schema	PROCESSLIST	HOST	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PROCESSLIST	DB	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PROCESSLIST	COMMAND	varchar	16	48	utf8	utf8_general_ci	varchar(16)
-NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
-3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	SPECIFIC_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	ROUTINE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -12544,10 +10563,6 @@ NULL	information_schema	ROUTINES	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datet
 3.0000	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	SESSION_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
-3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -12568,20 +10583,20 @@ NULL	information_schema	STATISTICS	SUB_PART	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	TABLES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	TABLE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	TABLES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
 NULL	information_schema	TABLES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 3.0000	information_schema	TABLES	TABLE_COLLATION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	TABLES	CREATE_OPTIONS	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 3.0000	information_schema	TABLES	TABLE_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
 3.0000	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
@@ -12654,36 +10669,10 @@ NULL	mysql	columns_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	db	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	db	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	db	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	event	db	char	64	192	utf8	utf8_bin	char(64)
-3.0000	mysql	event	name	char	64	192	utf8	utf8_general_ci	char(64)
-1.0000	mysql	event	body	longblob	4294967295	4294967295	NULL	NULL	longblob
-3.0000	mysql	event	definer	char	77	231	utf8	utf8_bin	char(77)
-NULL	mysql	event	execute_at	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	event	interval_value	int	NULL	NULL	NULL	NULL	int(11)
-3.0000	mysql	event	interval_field	enum	18	54	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')
-NULL	mysql	event	created	timestamp	NULL	NULL	NULL	NULL	timestamp
-NULL	mysql	event	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
-NULL	mysql	event	last_executed	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	event	starts	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	event	ends	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	mysql	event	status	enum	18	54	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')
-3.0000	mysql	event	on_completion	enum	8	24	utf8	utf8_general_ci	enum('DROP','PRESERVE')
-3.0000	mysql	event	sql_mode	set	431	1293	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')
-3.0000	mysql	event	comment	char	64	192	utf8	utf8_bin	char(64)
-NULL	mysql	event	originator	int	NULL	NULL	NULL	NULL	int(10)
-1.0000	mysql	event	time_zone	char	64	64	latin1	latin1_swedish_ci	char(64)
 3.0000	mysql	func	name	char	64	192	utf8	utf8_bin	char(64)
 NULL	mysql	func	ret	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 3.0000	mysql	func	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	func	type	enum	9	27	utf8	utf8_general_ci	enum('function','aggregate')
-NULL	mysql	general_log	event_time	timestamp	NULL	NULL	NULL	NULL	timestamp
-1.0000	mysql	general_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
-NULL	mysql	general_log	thread_id	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	general_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
-3.0000	mysql	general_log	command_type	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	mysql	general_log	argument	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_category	parent_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
@@ -12717,16 +10706,6 @@ NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5)
 3.0000	mysql	host	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	host	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-NULL	mysql	ndb_binlog_index	Position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-1.0000	mysql	ndb_binlog_index	File	varchar	255	255	latin1	latin1_swedish_ci	varchar(255)
-NULL	mysql	ndb_binlog_index	epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	inserts	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	updates	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	deletes	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	schemaops	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-3.0000	mysql	plugin	name	char	64	192	utf8	utf8_bin	char(64)
-3.0000	mysql	plugin	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	proc	db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	proc	name	char	64	192	utf8	utf8_general_ci	char(64)
 3.0000	mysql	proc	type	enum	9	27	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')
@@ -12751,33 +10730,13 @@ NULL	mysql	proc	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	procs_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 3.0000	mysql	procs_priv	Proc_priv	set	27	81	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')
 NULL	mysql	procs_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	servers	Server_name	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Host	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Db	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Username	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Password	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	servers	Port	int	NULL	NULL	NULL	NULL	int(4)
-3.0000	mysql	servers	Socket	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Wrapper	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Owner	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	slow_log	start_time	timestamp	NULL	NULL	NULL	NULL	timestamp
-1.0000	mysql	slow_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
-NULL	mysql	slow_log	query_time	time	NULL	NULL	NULL	NULL	time
-NULL	mysql	slow_log	lock_time	time	NULL	NULL	NULL	NULL	time
-NULL	mysql	slow_log	rows_sent	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	slow_log	rows_examined	int	NULL	NULL	NULL	NULL	int(11)
-3.0000	mysql	slow_log	db	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-NULL	mysql	slow_log	last_insert_id	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	slow_log	insert_id	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	slow_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
-1.0000	mysql	slow_log	sql_text	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 3.0000	mysql	tables_priv	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	tables_priv	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	User	char	16	48	utf8	utf8_bin	char(16)
 3.0000	mysql	tables_priv	Table_name	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 NULL	mysql	tables_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	tables_priv	Table_priv	set	98	294	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')
+3.0000	mysql	tables_priv	Table_priv	set	90	270	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')
 3.0000	mysql	tables_priv	Column_priv	set	31	93	utf8	utf8_general_ci	set('Select','Insert','Update','References')
 NULL	mysql	time_zone	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	time_zone	Use_leap_seconds	enum	1	3	utf8	utf8_general_ci	enum('Y','N')
@@ -12822,8 +10781,6 @@ NULL	mysql	time_zone_transition_type	Is_DST	tinyint	NULL	NULL	NULL	NULL	tinyint(
 3.0000	mysql	user	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Create_user_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	user	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	user	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	ssl_type	enum	9	27	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')
 1.0000	mysql	user	ssl_cipher	blob	65535	65535	NULL	NULL	blob
 1.0000	mysql	user	x509_issuer	blob	65535	65535	NULL	NULL	blob
@@ -13184,18 +11141,18 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE key_column_usage;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT '0',
-  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL,
-  `REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL,
-  `REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL,
-  `REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL
+  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `ORDINAL_POSITION` bigint(10) NOT NULL default '0',
+  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) default NULL,
+  `REFERENCED_TABLE_SCHEMA` varchar(64) default NULL,
+  `REFERENCED_TABLE_NAME` varchar(64) default NULL,
+  `REFERENCED_COLUMN_NAME` varchar(64) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13256,8 +11213,6 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_keyword	help_keyword_id	1	NULL	NULL	NULL	NULL
@@ -13266,8 +11221,6 @@ NULL	mysql	PRIMARY	NULL	mysql	help_relation	help_topic_id	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -13276,7 +11229,6 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -13338,26 +11290,26 @@ DEFINER	varchar(77)	NO
 SHOW CREATE TABLE routines;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_CATALOG` varchar(4096) DEFAULT NULL,
-  `ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT '',
-  `DTD_IDENTIFIER` varchar(64) DEFAULT NULL,
-  `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
+  `SPECIFIC_NAME` varchar(64) NOT NULL default '',
+  `ROUTINE_CATALOG` varchar(4096) default NULL,
+  `ROUTINE_SCHEMA` varchar(64) NOT NULL default '',
+  `ROUTINE_NAME` varchar(64) NOT NULL default '',
+  `ROUTINE_TYPE` varchar(9) NOT NULL default '',
+  `DTD_IDENTIFIER` varchar(64) default NULL,
+  `ROUTINE_BODY` varchar(8) NOT NULL default '',
   `ROUTINE_DEFINITION` longtext,
-  `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
-  `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
-  `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
-  `IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
-  `SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(64) DEFAULT NULL,
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
-  `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `EXTERNAL_NAME` varchar(64) default NULL,
+  `EXTERNAL_LANGUAGE` varchar(64) default NULL,
+  `PARAMETER_STYLE` varchar(8) NOT NULL default '',
+  `IS_DETERMINISTIC` varchar(3) NOT NULL default '',
+  `SQL_DATA_ACCESS` varchar(64) NOT NULL default '',
+  `SQL_PATH` varchar(64) default NULL,
+  `SECURITY_TYPE` varchar(7) NOT NULL default '',
+  `CREATED` datetime NOT NULL default '0000-00-00 00:00:00',
+  `LAST_ALTERED` datetime NOT NULL default '0000-00-00 00:00:00',
   `SQL_MODE` longtext NOT NULL,
-  `ROUTINE_COMMENT` varchar(64) NOT NULL DEFAULT '',
-  `DEFINER` varchar(77) NOT NULL DEFAULT ''
+  `ROUTINE_COMMENT` varchar(64) NOT NULL default '',
+  `DEFINER` varchar(77) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13682,11 +11634,11 @@ SQL_PATH	varchar(4096)	YES		NULL
 SHOW CREATE TABLE schemata;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(4096) DEFAULT NULL,
-  `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(4096) DEFAULT NULL
+  `CATALOG_NAME` varchar(4096) default NULL,
+  `SCHEMA_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL default '',
+  `SQL_PATH` varchar(4096) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13765,12 +11717,12 @@ CONSTRAINT_TYPE	varchar(64)	NO
 SHOW CREATE TABLE table_constraints;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_TYPE` varchar(64) NOT NULL DEFAULT ''
+  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `CONSTRAINT_TYPE` varchar(64) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13845,12 +11797,12 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE table_privileges;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13904,7 +11856,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
-'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = USER();
@@ -13914,7 +11865,7 @@ SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = "'user_2'@'localhost'";
 USER()	COUNT(*)
-user_2@localhost	12
+user_2@localhost	11
 connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -13934,7 +11885,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
-'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'user_1'@'localhost'	NULL	db_datadict	tb1	SELECT	NO
 'user_3'@'localhost'	NULL	db_datadict	tb3	SELECT	NO
 	
@@ -13957,46 +11907,46 @@ TABLE_SCHEMA	varchar(64)	NO
 TABLE_NAME	varchar(64)	NO			
 TABLE_TYPE	varchar(64)	NO			
 ENGINE	varchar(64)	YES		NULL	
-VERSION	bigint(21) unsigned	YES		NULL	
+VERSION	bigint(21)	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
-TABLE_ROWS	bigint(21) unsigned	YES		NULL	
-AVG_ROW_LENGTH	bigint(21) unsigned	YES		NULL	
-DATA_LENGTH	bigint(21) unsigned	YES		NULL	
-MAX_DATA_LENGTH	bigint(21) unsigned	YES		NULL	
-INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
-DATA_FREE	bigint(21) unsigned	YES		NULL	
-AUTO_INCREMENT	bigint(21) unsigned	YES		NULL	
+TABLE_ROWS	bigint(21)	YES		NULL	
+AVG_ROW_LENGTH	bigint(21)	YES		NULL	
+DATA_LENGTH	bigint(21)	YES		NULL	
+MAX_DATA_LENGTH	bigint(21)	YES		NULL	
+INDEX_LENGTH	bigint(21)	YES		NULL	
+DATA_FREE	bigint(21)	YES		NULL	
+AUTO_INCREMENT	bigint(21)	YES		NULL	
 CREATE_TIME	datetime	YES		NULL	
 UPDATE_TIME	datetime	YES		NULL	
 CHECK_TIME	datetime	YES		NULL	
 TABLE_COLLATION	varchar(64)	YES		NULL	
-CHECKSUM	bigint(21) unsigned	YES		NULL	
+CHECKSUM	bigint(21)	YES		NULL	
 CREATE_OPTIONS	varchar(255)	YES		NULL	
 TABLE_COMMENT	varchar(80)	NO			
 SHOW CREATE TABLE tables;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `ENGINE` varchar(64) DEFAULT NULL,
-  `VERSION` bigint(21) unsigned DEFAULT NULL,
-  `ROW_FORMAT` varchar(10) DEFAULT NULL,
-  `TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
-  `AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_FREE` bigint(21) unsigned DEFAULT NULL,
-  `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL,
-  `UPDATE_TIME` datetime DEFAULT NULL,
-  `CHECK_TIME` datetime DEFAULT NULL,
-  `TABLE_COLLATION` varchar(64) DEFAULT NULL,
-  `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_OPTIONS` varchar(255) DEFAULT NULL,
-  `TABLE_COMMENT` varchar(80) NOT NULL DEFAULT ''
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `TABLE_TYPE` varchar(64) NOT NULL default '',
+  `ENGINE` varchar(64) default NULL,
+  `VERSION` bigint(21) default NULL,
+  `ROW_FORMAT` varchar(10) default NULL,
+  `TABLE_ROWS` bigint(21) default NULL,
+  `AVG_ROW_LENGTH` bigint(21) default NULL,
+  `DATA_LENGTH` bigint(21) default NULL,
+  `MAX_DATA_LENGTH` bigint(21) default NULL,
+  `INDEX_LENGTH` bigint(21) default NULL,
+  `DATA_FREE` bigint(21) default NULL,
+  `AUTO_INCREMENT` bigint(21) default NULL,
+  `CREATE_TIME` datetime default NULL,
+  `UPDATE_TIME` datetime default NULL,
+  `CHECK_TIME` datetime default NULL,
+  `TABLE_COLLATION` varchar(64) default NULL,
+  `CHECKSUM` bigint(21) default NULL,
+  `CREATE_OPTIONS` varchar(255) default NULL,
+  `TABLE_COMMENT` varchar(80) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14014,20 +11964,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 
@@ -14055,33 +12005,22 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14106,33 +12045,22 @@ connect(localhost,user_2,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14155,33 +12083,22 @@ connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14205,33 +12122,22 @@ root@localhost	db_datadict
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14241,20 +12147,14 @@ NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	N
 NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
 NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Column privileges
 NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Database privileges
-NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Events
 NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		User defined functions
-NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		General log
 NULL	mysql	help_category	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help categories
 NULL	mysql	help_keyword	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help keywords
 NULL	mysql	help_relation	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		keyword-topic relation
 NULL	mysql	help_topic	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help topics
 NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Host privileges;  Merged with database privileges
-NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		MySQL plugins
 NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Stored Procedures
 NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Procedure privileges
-NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		MySQL Foreign Servers table
-NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Slow log
 NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Table privileges
 NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zones
 NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Leap seconds information for time zones
@@ -14302,14 +12202,14 @@ SECURITY_TYPE	varchar(7)	NO
 SHOW CREATE TABLE views;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
   `VIEW_DEFINITION` longtext NOT NULL,
-  `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
-  `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
-  `DEFINER` varchar(77) NOT NULL DEFAULT '',
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT ''
+  `CHECK_OPTION` varchar(8) NOT NULL default '',
+  `IS_UPDATABLE` varchar(3) NOT NULL default '',
+  `DEFINER` varchar(77) NOT NULL default '',
+  `SECURITY_TYPE` varchar(7) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14397,21 +12297,21 @@ COMMENT	varchar(16)	YES		NULL
 SHOW CREATE TABLE statistics;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `NON_UNIQUE` bigint(1) NOT NULL DEFAULT '0',
-  `INDEX_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `INDEX_NAME` varchar(64) NOT NULL DEFAULT '',
-  `SEQ_IN_INDEX` bigint(2) NOT NULL DEFAULT '0',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLLATION` varchar(1) DEFAULT NULL,
-  `CARDINALITY` bigint(21) DEFAULT NULL,
-  `SUB_PART` bigint(3) DEFAULT NULL,
-  `PACKED` varchar(10) DEFAULT NULL,
-  `NULLABLE` varchar(3) NOT NULL DEFAULT '',
-  `INDEX_TYPE` varchar(16) NOT NULL DEFAULT '',
-  `COMMENT` varchar(16) DEFAULT NULL
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `NON_UNIQUE` bigint(1) NOT NULL default '0',
+  `INDEX_SCHEMA` varchar(64) NOT NULL default '',
+  `INDEX_NAME` varchar(64) NOT NULL default '',
+  `SEQ_IN_INDEX` bigint(2) NOT NULL default '0',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `COLLATION` varchar(1) default NULL,
+  `CARDINALITY` bigint(21) default NULL,
+  `SUB_PART` bigint(3) default NULL,
+  `PACKED` varchar(10) default NULL,
+  `NULLABLE` varchar(3) NOT NULL default '',
+  `INDEX_TYPE` varchar(16) NOT NULL default '',
+  `COMMENT` varchar(16) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14489,8 +12389,6 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -14502,8 +12400,6 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
-NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
-NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	0	NULL	NULL		BTREE	
@@ -14513,7 +12409,6 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -14563,11 +12458,11 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE schema_privileges;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14614,8 +12509,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
-''@'%'	NULL	test	EVENT	NO
-''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -14630,8 +12523,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
-''@'%'	NULL	test\_%	EVENT	NO
-''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401502,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -14679,8 +12570,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
-''@'%'	NULL	test	EVENT	NO
-''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -14695,8 +12584,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
-''@'%'	NULL	test\_%	EVENT	NO
-''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401503_1,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -14733,10 +12620,10 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE user_privileges;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14778,10 +12665,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14801,10 +12688,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14816,10 +12703,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -14843,10 +12730,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14863,10 +12750,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14880,10 +12767,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14895,10 +12782,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT SELECT ON *.* TO 'user_1'@'localhost' WITH GRANT OPTION
@@ -14942,10 +12829,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14995,10 +12882,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -15010,10 +12897,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -15030,10 +12917,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -15056,10 +12943,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -15116,23 +13003,23 @@ DEFINER	longtext	NO
 SHOW CREATE TABLE triggers;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(4096) DEFAULT NULL,
-  `TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_CATALOG` varchar(4096) DEFAULT NULL,
-  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '',
-  `ACTION_ORDER` bigint(4) NOT NULL DEFAULT '0',
+  `TRIGGER_CATALOG` varchar(4096) default NULL,
+  `TRIGGER_SCHEMA` varchar(64) NOT NULL default '',
+  `TRIGGER_NAME` varchar(64) NOT NULL default '',
+  `EVENT_MANIPULATION` varchar(6) NOT NULL default '',
+  `EVENT_OBJECT_CATALOG` varchar(4096) default NULL,
+  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL default '',
+  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL default '',
+  `ACTION_ORDER` bigint(4) NOT NULL default '0',
   `ACTION_CONDITION` longtext,
   `ACTION_STATEMENT` longtext NOT NULL,
-  `ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '',
-  `ACTION_TIMING` varchar(6) NOT NULL DEFAULT '',
-  `ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL,
-  `ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL,
-  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '',
-  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '',
-  `CREATED` datetime DEFAULT NULL,
+  `ACTION_ORIENTATION` varchar(9) NOT NULL default '',
+  `ACTION_TIMING` varchar(6) NOT NULL default '',
+  `ACTION_REFERENCE_OLD_TABLE` varchar(64) default NULL,
+  `ACTION_REFERENCE_NEW_TABLE` varchar(64) default NULL,
+  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL default '',
+  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL default '',
+  `CREATED` datetime default NULL,
   `SQL_MODE` longtext NOT NULL,
   `DEFINER` longtext NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -15180,70 +13067,11 @@ ERROR 42S02: Unknown table 'parameters' in information_schema
 
 Testcase 3.2.20.1:
 --------------------------------------------------------------------------------
+
+checking a table that will be implemented later
+-----------------------------------------------
 DESC referential_constraints;
-Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-UNIQUE_CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
-UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
-UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
-MATCH_OPTION	varchar(64)	NO			
-UPDATE_RULE	varchar(64)	NO			
-DELETE_RULE	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-REFERENCED_TABLE_NAME	varchar(64)	NO			
-USE information_schema;
-DESC referential_constraints;
-Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-UNIQUE_CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
-UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
-UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
-MATCH_OPTION	varchar(64)	NO			
-UPDATE_RULE	varchar(64)	NO			
-DELETE_RULE	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-REFERENCED_TABLE_NAME	varchar(64)	NO			
-SHOW CREATE TABLE referential_constraints;
-Table	Create Table
-REFERENTIAL_CONSTRAINTS	CREATE TEMPORARY TABLE `REFERENTIAL_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `UNIQUE_CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `UNIQUE_CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `UNIQUE_CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `MATCH_OPTION` varchar(64) NOT NULL DEFAULT '',
-  `UPDATE_RULE` varchar(64) NOT NULL DEFAULT '',
-  `DELETE_RULE` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `REFERENCED_TABLE_NAME` varchar(64) NOT NULL DEFAULT ''
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
-SELECT COUNT(*) FROM information_schema.columns
-WHERE table_schema = 'information_schema'
-  AND table_name   = 'referential_constraints'
-ORDER BY ordinal_position;
-COUNT(*)
-11
-SELECT * FROM information_schema.columns
-WHERE table_schema = 'information_schema'
-  AND table_name   = 'referential_constraints'
-ORDER BY ordinal_position;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ERROR 42S02: Unknown table 'referential_constraints' in information_schema
 
 *** End of Data Dictionary Tests ***
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result
index ab4508fb302..764aac53414 100644
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -9,7 +9,7 @@ CREATE TABLE t1_values
 id BIGINT AUTO_INCREMENT,
 select_id BIGINT,
 PRIMARY KEY(id)
-) ENGINE = <engine_to_be_tested>;
+) ENGINE = 'InnoDB' ;
 ALTER TABLE t1_values ADD my_char_30        CHAR(30);
 ALTER TABLE t1_values ADD my_varchar_1000   VARCHAR(1000);
 ALTER TABLE t1_values ADD my_binary_30      BINARY(30);
@@ -123,8 +123,10 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = 1758;
-INSERT INTO t1_values SET select_id = @select_id,
-my_double = +1.758E+3;
+
+some statements disabled because of
+Bug#12440: CAST(data type DOUBLE AS TIME) strange results
+--------------------------------------------------------------------------------
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -133,20 +135,29 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_binary_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '-3333.3333';
-INSERT INTO t1_values SET select_id = @select_id,
-my_double = -0.33333333E+4;
 
-"Attention: CAST --> SIGNED INTEGER
-            Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Status: To be fixed later"
+some statements disabled because of
+Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian
 --------------------------------------------------------------------------------
 
-"Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5913"
+"Attention: CAST --> SIGNED INTEGER
+            The file with expected results suffers from
+            Bug#5083 Big integer values are inserted as negative into 
+                     decimal/string columns
+            Bug#5913 Traditional mode: BIGINT range not correctly delimited
+            Both have the status: To be fixed later"
 --------------------------------------------------------------------------------
 
 some statements disabled because of
-Bug#5913 Traditional mode: BIGINT range not correctly delimited
+Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result
+--------------------------------------------------------------------------------
+
+"Attention: CAST --> UNSIGNED INTEGER
+            The file with expected results suffers from Bug 5083 5913 9809"
+--------------------------------------------------------------------------------
+
+some statements disabled because of
+Bugs#8663: cant use bgint unsigned as input to cast
 --------------------------------------------------------------------------------
 SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values';
@@ -164,6 +175,11 @@ SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values';
+
+"Attention: IF(my_year IS NULL, ...
+            The file with expected results suffers from 
+            Bug#11689. successful CREATE VIEW but SELECT on view fails."
+--------------------------------------------------------------------------------
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_varchar_1000),
@@ -186,7 +202,7 @@ SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
 
 "Attention: LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', <numeric column>)
-            The file with expected results suffers from Bug 10963"
+            The file with expected results suffers from Bug 10963 11728"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
 because there are 32/64 Bit differences
 --------------------------------------------------------------------------------
@@ -200,9 +216,8 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select = 
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -284,19 +299,19 @@ SET sql_mode = '';
 --------------------------------------------------------------------------------
 CREATE VIEW v1 AS SELECT my_char_30, id FROM t1_values;
 SELECT my_char_30, id FROM t1_values
-WHERE select_id = 190 OR select_id IS NULL order by id;
+WHERE select_id = 187 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 190 OR select_id IS NULL) order by id;
+WHERE select_id = 187 OR select_id IS NULL);
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values;
 SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values
-WHERE select_id = 189 OR select_id IS NULL order by id;
+WHERE select_id = 186 OR select_id IS NULL;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -308,7 +323,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select concat(_latin1'A',`t1_values`.`my_char_30`) AS `CONCAT('A',my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 189 OR select_id IS NULL) order by id;
+WHERE select_id = 186 OR select_id IS NULL);
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -322,13 +337,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 188 OR select_id IS NULL order by id;
+WHERE select_id = 185 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varbinary_1000`) AS `LTRIM(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 188 OR select_id IS NULL) order by id;
+WHERE select_id = 185 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -336,13 +351,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL order by id;
+WHERE select_id = 184 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_binary_30`) AS `LTRIM(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL) order by id;
+WHERE select_id = 184 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -350,13 +365,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL order by id;
+WHERE select_id = 183 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varchar_1000`) AS `LTRIM(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL) order by id;
+WHERE select_id = 183 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -364,13 +379,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL order by id;
+WHERE select_id = 182 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_char_30`) AS `LTRIM(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL) order by id;
+WHERE select_id = 182 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -378,13 +393,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL order by id;
+WHERE select_id = 181 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varbinary_1000`) AS `LOWER(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL) order by id;
+WHERE select_id = 181 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -392,13 +407,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL order by id;
+WHERE select_id = 180 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_binary_30`) AS `LOWER(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL) order by id;
+WHERE select_id = 180 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -406,13 +421,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL order by id;
+WHERE select_id = 179 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LOWER(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL) order by id;
+WHERE select_id = 179 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -420,13 +435,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL order by id;
+WHERE select_id = 178 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_char_30`) AS `LOWER(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL) order by id;
+WHERE select_id = 178 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -434,13 +449,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL order by id;
+WHERE select_id = 177 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_decimal`) AS `LOCATE('-', ' - -ABC', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL) order by id;
+WHERE select_id = 177 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -448,13 +463,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL order by id;
+WHERE select_id = 176 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_double`) AS `LOCATE('-', ' - -ABC', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL) order by id;
+WHERE select_id = 176 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -462,13 +477,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL order by id;
+WHERE select_id = 175 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_bigint`) AS `LOCATE('-', ' - -ABC', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL) order by id;
+WHERE select_id = 175 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -476,13 +491,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL order by id;
+WHERE select_id = 174 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varbinary_1000`,3) AS `LOCATE('-', my_varbinary_1000, 3)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL) order by id;
+WHERE select_id = 174 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -490,13 +505,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL order by id;
+WHERE select_id = 173 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_binary_30`,3) AS `LOCATE('-', my_binary_30, 3)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL) order by id;
+WHERE select_id = 173 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -504,13 +519,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL order by id;
+WHERE select_id = 172 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varchar_1000`,3) AS `LOCATE('-', my_varchar_1000, 3)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL) order by id;
+WHERE select_id = 172 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -518,13 +533,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL order by id;
+WHERE select_id = 171 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_char_30`,3) AS `LOCATE('-', my_char_30, 3)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL) order by id;
+WHERE select_id = 171 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -532,13 +547,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL order by id;
+WHERE select_id = 170 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varbinary_1000, my_binary_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL) order by id;
+WHERE select_id = 170 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -546,13 +561,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL order by id;
+WHERE select_id = 169 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varbinary_1000, my_varchar_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL) order by id;
+WHERE select_id = 169 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -560,13 +575,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL order by id;
+WHERE select_id = 168 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varbinary_1000, my_char_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL) order by id;
+WHERE select_id = 168 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -574,13 +589,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL order by id;
+WHERE select_id = 167 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varbinary_1000, my_varbinary_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL) order by id;
+WHERE select_id = 167 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -588,13 +603,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL order by id;
+WHERE select_id = 166 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_binary_30, my_varbinary_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL) order by id;
+WHERE select_id = 166 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -602,13 +617,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL order by id;
+WHERE select_id = 165 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_binary_30, my_varchar_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL) order by id;
+WHERE select_id = 165 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -616,13 +631,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL order by id;
+WHERE select_id = 164 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_binary_30, my_char_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL) order by id;
+WHERE select_id = 164 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -630,13 +645,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL order by id;
+WHERE select_id = 163 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_binary_30, my_binary_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL) order by id;
+WHERE select_id = 163 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -644,13 +659,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL order by id;
+WHERE select_id = 162 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varchar_1000, my_varbinary_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL) order by id;
+WHERE select_id = 162 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -658,13 +673,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL order by id;
+WHERE select_id = 161 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varchar_1000, my_binary_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL) order by id;
+WHERE select_id = 161 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -672,13 +687,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL order by id;
+WHERE select_id = 160 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varchar_1000, my_char_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL) order by id;
+WHERE select_id = 160 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -686,13 +701,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL order by id;
+WHERE select_id = 159 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varchar_1000, my_varchar_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL) order by id;
+WHERE select_id = 159 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -700,13 +715,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL order by id;
+WHERE select_id = 158 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_char_30, my_varbinary_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL) order by id;
+WHERE select_id = 158 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -714,13 +729,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL order by id;
+WHERE select_id = 157 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_char_30, my_binary_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL) order by id;
+WHERE select_id = 157 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -728,13 +743,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL order by id;
+WHERE select_id = 156 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_char_30, my_varchar_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL) order by id;
+WHERE select_id = 156 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -742,13 +757,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values;
 SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL order by id;
+WHERE select_id = 155 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_char_30, my_char_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL) order by id;
+WHERE select_id = 155 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -756,13 +771,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL order by id;
+WHERE select_id = 154 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varbinary_1000`) AS `LOCATE('char', my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL) order by id;
+WHERE select_id = 154 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -770,13 +785,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL order by id;
+WHERE select_id = 153 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_binary_30`) AS `LOCATE('char', my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL) order by id;
+WHERE select_id = 153 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -784,13 +799,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL order by id;
+WHERE select_id = 152 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varchar_1000`) AS `LOCATE('char', my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL) order by id;
+WHERE select_id = 152 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -798,46 +813,46 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL order by id;
+WHERE select_id = 151 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `LOCATE('char', my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL) order by id;
+WHERE select_id = 151 OR select_id IS NULL);
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+CREATE VIEW v1 AS SELECT LOAD_FILE('../log/current_test'), id FROM t1_values;
+SELECT LOAD_FILE('../log/current_test'), id FROM t1_values
+WHERE select_id = 150 OR select_id IS NULL;
+LOAD_FILE('../log/current_test')	id
+CURRENT_TEST: innodb_func_view
 	1
-äÄ@
+CURRENT_TEST: innodb_func_view
 	2
-äÄ@
+CURRENT_TEST: innodb_func_view
 	3
-äÄ@
+CURRENT_TEST: innodb_func_view
 	4
-äÄ@
+CURRENT_TEST: innodb_func_view
 	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../log/current_test') AS `LOAD_FILE('../log/current_test')`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+WHERE select_id = 150 OR select_id IS NULL);
+LOAD_FILE('../log/current_test')	id
+CURRENT_TEST: innodb_func_view
 	1
-äÄ@
+CURRENT_TEST: innodb_func_view
 	2
-äÄ@
+CURRENT_TEST: innodb_func_view
 	3
-äÄ@
+CURRENT_TEST: innodb_func_view
 	4
-äÄ@
+CURRENT_TEST: innodb_func_view
 	5
 DROP VIEW v1;
 
@@ -846,13 +861,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL order by id;
+WHERE select_id = 149 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varbinary_1000`) AS `LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL) order by id;
+WHERE select_id = 149 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -860,13 +875,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL order by id;
+WHERE select_id = 148 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_binary_30`) AS `LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL) order by id;
+WHERE select_id = 148 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -874,13 +889,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL order by id;
+WHERE select_id = 147 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varchar_1000`) AS `LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL) order by id;
+WHERE select_id = 147 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -888,19 +903,19 @@ CREATE VIEW v1 AS SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL order by id;
+WHERE select_id = 146 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_char_30`) AS `LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL) order by id;
+WHERE select_id = 146 OR select_id IS NULL);
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values;
 SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL order by id;
+WHERE select_id = 145 OR select_id IS NULL;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -915,7 +930,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL) order by id;
+WHERE select_id = 145 OR select_id IS NULL);
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -930,7 +945,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values;
 SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL order by id;
+WHERE select_id = 144 OR select_id IS NULL;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -942,7 +957,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varbinary_1000`,2) AS `LEFT(my_varbinary_1000, 2)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL) order by id;
+WHERE select_id = 144 OR select_id IS NULL);
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -954,7 +969,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values;
 SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL order by id;
+WHERE select_id = 143 OR select_id IS NULL;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -966,7 +981,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL) order by id;
+WHERE select_id = 143 OR select_id IS NULL);
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -978,7 +993,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values;
 SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL order by id;
+WHERE select_id = 142 OR select_id IS NULL;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -990,7 +1005,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varchar_1000`,2) AS `LEFT(my_varchar_1000, 2)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL) order by id;
+WHERE select_id = 142 OR select_id IS NULL);
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1002,7 +1017,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values;
 SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL order by id;
+WHERE select_id = 141 OR select_id IS NULL;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1014,7 +1029,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_char_30`,2) AS `LEFT(my_char_30, 2)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL) order by id;
+WHERE select_id = 141 OR select_id IS NULL);
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1028,13 +1043,13 @@ CREATE VIEW v1 AS SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL order by id;
+WHERE select_id = 140 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LCASE(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL) order by id;
+WHERE select_id = 140 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -1042,13 +1057,13 @@ CREATE VIEW v1 AS SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values;
 SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL order by id;
+WHERE select_id = 139 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `INSTR(my_char_30, 'char')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL) order by id;
+WHERE select_id = 139 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -1056,7 +1071,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL order by id;
+WHERE select_id = 138 OR select_id IS NULL;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1068,7 +1083,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varbinary_1000`) AS `BIT_LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL) order by id;
+WHERE select_id = 138 OR select_id IS NULL);
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1082,7 +1097,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL order by id;
+WHERE select_id = 137 OR select_id IS NULL;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1094,7 +1109,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL) order by id;
+WHERE select_id = 137 OR select_id IS NULL);
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1108,7 +1123,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL order by id;
+WHERE select_id = 136 OR select_id IS NULL;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1120,7 +1135,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varchar_1000`) AS `BIT_LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL) order by id;
+WHERE select_id = 136 OR select_id IS NULL);
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1134,7 +1149,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL order by id;
+WHERE select_id = 135 OR select_id IS NULL;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1146,7 +1161,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_char_30`) AS `BIT_LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL) order by id;
+WHERE select_id = 135 OR select_id IS NULL);
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1160,7 +1175,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values;
 SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL order by id;
+WHERE select_id = 134 OR select_id IS NULL;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1172,7 +1187,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_year`,_latin1'IS_NULL') AS `IFNULL(my_year,'IS_NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL) order by id;
+WHERE select_id = 134 OR select_id IS NULL);
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1186,7 +1201,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values;
 SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL order by id;
+WHERE select_id = 133 OR select_id IS NULL;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1198,7 +1213,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_time`,_latin1'IS_NULL') AS `IFNULL(my_time,'IS_NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL) order by id;
+WHERE select_id = 133 OR select_id IS NULL);
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1212,7 +1227,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values;
 SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL order by id;
+WHERE select_id = 132 OR select_id IS NULL;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1224,7 +1239,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_timestamp`,_latin1'IS_NULL') AS `IFNULL(my_timestamp,'IS_NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL) order by id;
+WHERE select_id = 132 OR select_id IS NULL);
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1238,7 +1253,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values;
 SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL order by id;
+WHERE select_id = 131 OR select_id IS NULL;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1250,7 +1265,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_date`,_latin1'IS_NULL') AS `IFNULL(my_date,'IS_NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL) order by id;
+WHERE select_id = 131 OR select_id IS NULL);
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1264,7 +1279,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values;
 SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL order by id;
+WHERE select_id = 130 OR select_id IS NULL;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1276,7 +1291,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_datetime`,_latin1'IS_NULL') AS `IFNULL(my_datetime,'IS_NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL) order by id;
+WHERE select_id = 130 OR select_id IS NULL);
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1290,7 +1305,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values;
 SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL order by id;
+WHERE select_id = 129 OR select_id IS NULL;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1302,7 +1317,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_double`,_latin1'IS_NULL') AS `IFNULL(my_double,'IS_NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL) order by id;
+WHERE select_id = 129 OR select_id IS NULL);
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1316,7 +1331,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values;
 SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL order by id;
+WHERE select_id = 128 OR select_id IS NULL;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1328,7 +1343,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_decimal`,_latin1'IS_NULL') AS `IFNULL(my_decimal,'IS_NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL) order by id;
+WHERE select_id = 128 OR select_id IS NULL);
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1342,7 +1357,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values;
 SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL order by id;
+WHERE select_id = 127 OR select_id IS NULL;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1354,7 +1369,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_bigint`,_latin1'IS_NULL') AS `IFNULL(my_bigint,'IS_NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL) order by id;
+WHERE select_id = 127 OR select_id IS NULL);
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1368,7 +1383,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL order by id;
+WHERE select_id = 126 OR select_id IS NULL;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1380,7 +1395,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varbinary_1000`,_latin1'IS_NULL') AS `IFNULL(my_varbinary_1000,'IS_NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL) order by id;
+WHERE select_id = 126 OR select_id IS NULL);
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1394,7 +1409,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values;
 SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL order by id;
+WHERE select_id = 125 OR select_id IS NULL;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1406,7 +1421,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,_latin1'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL) order by id;
+WHERE select_id = 125 OR select_id IS NULL);
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1420,7 +1435,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values;
 SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL order by id;
+WHERE select_id = 124 OR select_id IS NULL;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1432,7 +1447,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varchar_1000`,_latin1'IS_NULL') AS `IFNULL(my_varchar_1000,'IS_NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL) order by id;
+WHERE select_id = 124 OR select_id IS NULL);
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1446,7 +1461,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values;
 SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL order by id;
+WHERE select_id = 123 OR select_id IS NULL;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1458,7 +1473,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_char_30`,_latin1'IS_NULL') AS `IFNULL(my_char_30,'IS_NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL) order by id;
+WHERE select_id = 123 OR select_id IS NULL);
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1472,7 +1487,7 @@ CREATE VIEW v1 AS SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values;
 SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL order by id;
+WHERE select_id = 122 OR select_id IS NULL;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1486,7 +1501,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL) order by id;
+WHERE select_id = 122 OR select_id IS NULL);
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1501,7 +1516,7 @@ CREATE VIEW v1 AS SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values;
 SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL order by id;
+WHERE select_id = 121 OR select_id IS NULL;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1515,7 +1530,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL) order by id;
+WHERE select_id = 121 OR select_id IS NULL);
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1530,7 +1545,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL order by id;
+WHERE select_id = 120 OR select_id IS NULL;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1544,7 +1559,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL) order by id;
+WHERE select_id = 120 OR select_id IS NULL);
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1559,7 +1574,7 @@ CREATE VIEW v1 AS SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values;
 SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL order by id;
+WHERE select_id = 119 OR select_id IS NULL;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1573,7 +1588,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL) order by id;
+WHERE select_id = 119 OR select_id IS NULL);
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1588,7 +1603,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values;
 SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL order by id;
+WHERE select_id = 118 OR select_id IS NULL;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1602,7 +1617,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL) order by id;
+WHERE select_id = 118 OR select_id IS NULL);
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1617,7 +1632,7 @@ CREATE VIEW v1 AS SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values;
 SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL order by id;
+WHERE select_id = 117 OR select_id IS NULL;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1631,7 +1646,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL) order by id;
+WHERE select_id = 117 OR select_id IS NULL);
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1646,7 +1661,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values;
 SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL order by id;
+WHERE select_id = 116 OR select_id IS NULL;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1660,7 +1675,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL) order by id;
+WHERE select_id = 116 OR select_id IS NULL);
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1675,7 +1690,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values;
 SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL order by id;
+WHERE select_id = 115 OR select_id IS NULL;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1689,7 +1704,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL) order by id;
+WHERE select_id = 115 OR select_id IS NULL);
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1704,7 +1719,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL order by id;
+WHERE select_id = 114 OR select_id IS NULL;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1718,7 +1733,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL) order by id;
+WHERE select_id = 114 OR select_id IS NULL);
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1733,7 +1748,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL order by id;
+WHERE select_id = 113 OR select_id IS NULL;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1747,7 +1762,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL) order by id;
+WHERE select_id = 113 OR select_id IS NULL);
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1762,7 +1777,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL order by id;
+WHERE select_id = 112 OR select_id IS NULL;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1776,7 +1791,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL) order by id;
+WHERE select_id = 112 OR select_id IS NULL);
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1791,7 +1806,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values;
 SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL order by id;
+WHERE select_id = 111 OR select_id IS NULL;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1805,7 +1820,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL) order by id;
+WHERE select_id = 111 OR select_id IS NULL);
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1820,7 +1835,7 @@ CREATE VIEW v1 AS SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values;
 SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL order by id;
+WHERE select_id = 110 OR select_id IS NULL;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1832,7 +1847,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_year`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_year, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL) order by id;
+WHERE select_id = 110 OR select_id IS NULL);
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1846,7 +1861,7 @@ CREATE VIEW v1 AS SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values;
 SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL order by id;
+WHERE select_id = 109 OR select_id IS NULL;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1858,7 +1873,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_time`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_time, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL) order by id;
+WHERE select_id = 109 OR select_id IS NULL);
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1872,7 +1887,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL order by id;
+WHERE select_id = 108 OR select_id IS NULL;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1884,7 +1899,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_timestamp`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL) order by id;
+WHERE select_id = 108 OR select_id IS NULL);
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1898,7 +1913,7 @@ CREATE VIEW v1 AS SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values;
 SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL order by id;
+WHERE select_id = 107 OR select_id IS NULL;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1910,7 +1925,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_date`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_date, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL) order by id;
+WHERE select_id = 107 OR select_id IS NULL);
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1924,7 +1939,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values;
 SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL order by id;
+WHERE select_id = 106 OR select_id IS NULL;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1936,7 +1951,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_datetime`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL) order by id;
+WHERE select_id = 106 OR select_id IS NULL);
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1950,7 +1965,7 @@ CREATE VIEW v1 AS SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values;
 SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL order by id;
+WHERE select_id = 105 OR select_id IS NULL;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1962,7 +1977,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_double`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_double, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL) order by id;
+WHERE select_id = 105 OR select_id IS NULL);
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1976,7 +1991,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values;
 SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL order by id;
+WHERE select_id = 104 OR select_id IS NULL;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1988,7 +2003,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_decimal`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL) order by id;
+WHERE select_id = 104 OR select_id IS NULL);
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2002,7 +2017,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values;
 SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL order by id;
+WHERE select_id = 103 OR select_id IS NULL;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2014,7 +2029,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_bigint`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL) order by id;
+WHERE select_id = 103 OR select_id IS NULL);
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2028,7 +2043,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL order by id;
+WHERE select_id = 102 OR select_id IS NULL;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2040,7 +2055,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varbinary_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL) order by id;
+WHERE select_id = 102 OR select_id IS NULL);
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2054,7 +2069,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL order by id;
+WHERE select_id = 101 OR select_id IS NULL;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2071,7 +2086,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_binary_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL) order by id;
+WHERE select_id = 101 OR select_id IS NULL);
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2090,7 +2105,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL order by id;
+WHERE select_id = 100 OR select_id IS NULL;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2102,7 +2117,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varchar_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL) order by id;
+WHERE select_id = 100 OR select_id IS NULL);
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2116,7 +2131,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values;
 SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL order by id;
+WHERE select_id = 99 OR select_id IS NULL;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2131,7 +2146,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_char_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL) order by id;
+WHERE select_id = 99 OR select_id IS NULL);
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2148,7 +2163,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL order by id;
+WHERE select_id = 98 OR select_id IS NULL;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2160,7 +2175,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using koi8r) AS `CONVERT(my_varbinary_1000 USING koi8r)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL) order by id;
+WHERE select_id = 98 OR select_id IS NULL);
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2174,7 +2189,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING koi8r), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL order by id;
+WHERE select_id = 97 OR select_id IS NULL;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2186,7 +2201,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL) order by id;
+WHERE select_id = 97 OR select_id IS NULL);
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2200,7 +2215,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING koi8r), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL order by id;
+WHERE select_id = 96 OR select_id IS NULL;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2212,7 +2227,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL) order by id;
+WHERE select_id = 96 OR select_id IS NULL);
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2226,7 +2241,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING koi8r), 
 my_char_30, id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL order by id;
+WHERE select_id = 95 OR select_id IS NULL;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2238,7 +2253,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL) order by id;
+WHERE select_id = 95 OR select_id IS NULL);
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2252,7 +2267,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING utf8), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL order by id;
+WHERE select_id = 94 OR select_id IS NULL;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2264,7 +2279,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using utf8) AS `CONVERT(my_varbinary_1000 USING utf8)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL) order by id;
+WHERE select_id = 94 OR select_id IS NULL);
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2278,7 +2293,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING utf8), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL order by id;
+WHERE select_id = 93 OR select_id IS NULL;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2290,7 +2305,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL) order by id;
+WHERE select_id = 93 OR select_id IS NULL);
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2304,7 +2319,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING utf8), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL order by id;
+WHERE select_id = 92 OR select_id IS NULL;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2316,7 +2331,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using utf8) AS `CONVERT(my_varchar_1000 USING utf8)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL) order by id;
+WHERE select_id = 92 OR select_id IS NULL);
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2330,7 +2345,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL order by id;
+WHERE select_id = 91 OR select_id IS NULL;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2342,7 +2357,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using utf8) AS `CONVERT(my_char_30 USING utf8)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL) order by id;
+WHERE select_id = 91 OR select_id IS NULL);
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2356,7 +2371,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL order by id;
+WHERE select_id = 90 OR select_id IS NULL;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2368,7 +2383,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as unsigned) AS `CAST(my_year AS UNSIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL) order by id;
+WHERE select_id = 90 OR select_id IS NULL);
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2382,7 +2397,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL order by id;
+WHERE select_id = 89 OR select_id IS NULL;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2400,7 +2415,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL) order by id;
+WHERE select_id = 89 OR select_id IS NULL);
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2420,7 +2435,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL order by id;
+WHERE select_id = 88 OR select_id IS NULL;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2438,7 +2453,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL) order by id;
+WHERE select_id = 88 OR select_id IS NULL);
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2458,7 +2473,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL order by id;
+WHERE select_id = 87 OR select_id IS NULL;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2475,7 +2490,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL) order by id;
+WHERE select_id = 87 OR select_id IS NULL);
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2494,7 +2509,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL order by id;
+WHERE select_id = 86 OR select_id IS NULL;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2511,7 +2526,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL) order by id;
+WHERE select_id = 86 OR select_id IS NULL);
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2530,7 +2545,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL order by id;
+WHERE select_id = 85 OR select_id IS NULL;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2546,7 +2561,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL) order by id;
+WHERE select_id = 85 OR select_id IS NULL);
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2564,7 +2579,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL order by id;
+WHERE select_id = 84 OR select_id IS NULL;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2576,7 +2591,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL) order by id;
+WHERE select_id = 84 OR select_id IS NULL);
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2590,7 +2605,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL order by id;
+WHERE select_id = 83 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2607,7 +2622,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL) order by id;
+WHERE select_id = 83 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2626,7 +2641,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL order by id;
+WHERE select_id = 82 OR select_id IS NULL;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2644,7 +2659,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL) order by id;
+WHERE select_id = 82 OR select_id IS NULL);
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2664,7 +2679,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL order by id;
+WHERE select_id = 81 OR select_id IS NULL;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2681,7 +2696,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL) order by id;
+WHERE select_id = 81 OR select_id IS NULL);
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2700,7 +2715,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL order by id;
+WHERE select_id = 80 OR select_id IS NULL;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2717,7 +2732,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL) order by id;
+WHERE select_id = 80 OR select_id IS NULL);
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2736,7 +2751,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL order by id;
+WHERE select_id = 79 OR select_id IS NULL;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2748,7 +2763,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as signed) AS `CAST(my_year AS SIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL) order by id;
+WHERE select_id = 79 OR select_id IS NULL);
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2762,7 +2777,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL order by id;
+WHERE select_id = 78 OR select_id IS NULL;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2779,7 +2794,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL) order by id;
+WHERE select_id = 78 OR select_id IS NULL);
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2798,7 +2813,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL order by id;
+WHERE select_id = 77 OR select_id IS NULL;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2816,7 +2831,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL) order by id;
+WHERE select_id = 77 OR select_id IS NULL);
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2836,7 +2851,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL order by id;
+WHERE select_id = 76 OR select_id IS NULL;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2853,7 +2868,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL) order by id;
+WHERE select_id = 76 OR select_id IS NULL);
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2872,7 +2887,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL order by id;
+WHERE select_id = 75 OR select_id IS NULL;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2889,7 +2904,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL) order by id;
+WHERE select_id = 75 OR select_id IS NULL);
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2904,43 +2919,11 @@ Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_double AS SIGNED INTEGER),
-my_double, id FROM t1_values;
-SELECT CAST(my_double AS SIGNED INTEGER),
-my_double, id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL order by id;
-CAST(my_double AS SIGNED INTEGER)	my_double	id
-NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
-0	0	4
--1	-1	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
-SHOW CREATE VIEW v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
-SELECT v1.* FROM v1
-WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL) order by id;
-CAST(my_double AS SIGNED INTEGER)	my_double	id
-NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
-0	0	4
--1	-1	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
-DROP VIEW v1;
-
-
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL order by id;
+WHERE select_id = 74 OR select_id IS NULL;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2955,7 +2938,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL) order by id;
+WHERE select_id = 74 OR select_id IS NULL);
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2972,7 +2955,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL order by id;
+WHERE select_id = 73 OR select_id IS NULL;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2984,7 +2967,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as signed) AS `CAST(my_bigint AS SIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL) order by id;
+WHERE select_id = 73 OR select_id IS NULL);
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2998,7 +2981,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL order by id;
+WHERE select_id = 72 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3014,7 +2997,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL) order by id;
+WHERE select_id = 72 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3032,7 +3015,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL order by id;
+WHERE select_id = 71 OR select_id IS NULL;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3049,7 +3032,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL) order by id;
+WHERE select_id = 71 OR select_id IS NULL);
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3068,7 +3051,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL order by id;
+WHERE select_id = 70 OR select_id IS NULL;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3084,7 +3067,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL) order by id;
+WHERE select_id = 70 OR select_id IS NULL);
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3102,7 +3085,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL order by id;
+WHERE select_id = 69 OR select_id IS NULL;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3118,7 +3101,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL) order by id;
+WHERE select_id = 69 OR select_id IS NULL);
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3136,25 +3119,25 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL order by id;
+WHERE select_id = 68 OR select_id IS NULL;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901	1901	2
-2155	2155	3
-2000	2000	4
-2005	2005	5
+1901.00	1901	2
+2155.00	2155	3
+2000.00	2000	4
+2005.00	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL) order by id;
+WHERE select_id = 68 OR select_id IS NULL);
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901	1901	2
-2155	2155	3
-2000	2000	4
-2005	2005	5
+1901.00	1901	2
+2155.00	2155	3
+2000.00	2000	4
+2005.00	2005	5
 DROP VIEW v1;
 
 
@@ -3162,25 +3145,25 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL order by id;
+WHERE select_id = 67 OR select_id IS NULL;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959	-838:59:59	2
-8385959	838:59:59	3
-130000	13:00:00	4
-100000	10:00:00	5
+-8385959.00	-838:59:59	2
+8385959.00	838:59:59	3
+130000.00	13:00:00	4
+100000.00	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL) order by id;
+WHERE select_id = 67 OR select_id IS NULL);
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959	-838:59:59	2
-8385959	838:59:59	3
-130000	13:00:00	4
-100000	10:00:00	5
+-8385959.00	-838:59:59	2
+8385959.00	838:59:59	3
+130000.00	13:00:00	4
+100000.00	10:00:00	5
 DROP VIEW v1;
 
 
@@ -3188,35 +3171,25 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL order by id;
+WHERE select_id = 66 OR select_id IS NULL;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0	0000-00-00 00:00:00	1
-9999999999	1970-01-01 03:00:01	2
-9999999999	2038-01-01 02:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+0.00	0000-00-00 00:00:00	1
+19700101030001.00	1970-01-01 03:00:01	2
+20380101025959.00	2038-01-01 02:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL) order by id;
+WHERE select_id = 66 OR select_id IS NULL);
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0	0000-00-00 00:00:00	1
-9999999999	1970-01-01 03:00:01	2
-9999999999	2038-01-01 02:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+0.00	0000-00-00 00:00:00	1
+19700101030001.00	1970-01-01 03:00:01	2
+20380101025959.00	2038-01-01 02:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -3224,25 +3197,25 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL order by id;
+WHERE select_id = 65 OR select_id IS NULL;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101	0001-01-01	2
-99991231	9999-12-31	3
-20040229	2004-02-29	4
-20050628	2005-06-28	5
+10101.00	0001-01-01	2
+99991231.00	9999-12-31	3
+20040229.00	2004-02-29	4
+20050628.00	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL) order by id;
+WHERE select_id = 65 OR select_id IS NULL);
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101	0001-01-01	2
-99991231	9999-12-31	3
-20040229	2004-02-29	4
-20050628	2005-06-28	5
+10101.00	0001-01-01	2
+99991231.00	9999-12-31	3
+20040229.00	2004-02-29	4
+20050628.00	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -3250,73 +3223,25 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL order by id;
+WHERE select_id = 64 OR select_id IS NULL;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-9999999999	0001-01-01 00:00:00	2
-9999999999	9999-12-31 23:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+10101000000.00	0001-01-01 00:00:00	2
+99991231235959.00	9999-12-31 23:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL) order by id;
+WHERE select_id = 64 OR select_id IS NULL);
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-9999999999	0001-01-01 00:00:00	2
-9999999999	9999-12-31 23:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-DROP VIEW v1;
-
-
-CREATE VIEW v1 AS SELECT CAST(my_double AS DECIMAL),
-my_double, id FROM t1_values;
-SELECT CAST(my_double AS DECIMAL),
-my_double, id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL order by id;
-CAST(my_double AS DECIMAL)	my_double	id
-NULL	NULL	1
--9999999999	-1.7976931348623e+308	2
-9999999999	1.7976931348623e+308	3
-0	0	4
--1	-1	5
--3333	-3333.3333	30
-Warnings:
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
-SHOW CREATE VIEW v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as decimal) AS `CAST(my_double AS DECIMAL)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
-SELECT v1.* FROM v1
-WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL) order by id;
-CAST(my_double AS DECIMAL)	my_double	id
-NULL	NULL	1
--9999999999	-1.7976931348623e+308	2
-9999999999	1.7976931348623e+308	3
-0	0	4
--1	-1	5
--3333	-3333.3333	30
-Warnings:
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+10101000000.00	0001-01-01 00:00:00	2
+99991231235959.00	9999-12-31 23:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -3324,31 +3249,25 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL order by id;
+WHERE select_id = 63 OR select_id IS NULL;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
-9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
-0	0.000000000000000000000000000000	4
--1	-1.000000000000000000000000000000	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+-10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
+10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
+0.00	0.000000000000000000000000000000	4
+-1.00	-1.000000000000000000000000000000	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL) order by id;
+WHERE select_id = 63 OR select_id IS NULL);
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
-9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
-0	0.000000000000000000000000000000	4
--1	-1.000000000000000000000000000000	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+-10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
+10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
+0.00	0.000000000000000000000000000000	4
+-1.00	-1.000000000000000000000000000000	5
 DROP VIEW v1;
 
 
@@ -3356,31 +3275,25 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL order by id;
+WHERE select_id = 62 OR select_id IS NULL;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9999999999	-9223372036854775808	2
-9999999999	9223372036854775807	3
-0	0	4
--1	-1	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+-9223372036854775808.00	-9223372036854775808	2
+9223372036854775807.00	9223372036854775807	3
+0.00	0	4
+-1.00	-1	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL) order by id;
+WHERE select_id = 62 OR select_id IS NULL);
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9999999999	-9223372036854775808	2
-9999999999	9223372036854775807	3
-0	0	4
--1	-1	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+-9223372036854775808.00	-9223372036854775808	2
+9223372036854775807.00	9223372036854775807	3
+0.00	0	4
+-1.00	-1	5
 DROP VIEW v1;
 
 
@@ -3388,14 +3301,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL order by id;
+WHERE select_id = 61 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	29
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3405,14 +3318,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL) order by id;
+WHERE select_id = 61 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	29
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3424,14 +3337,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL order by id;
+WHERE select_id = 60 OR select_id IS NULL;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	28
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3446,14 +3359,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL) order by id;
+WHERE select_id = 60 OR select_id IS NULL);
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	28
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3470,14 +3383,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL order by id;
+WHERE select_id = 59 OR select_id IS NULL;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	27
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3487,14 +3400,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL) order by id;
+WHERE select_id = 59 OR select_id IS NULL);
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	27
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3506,14 +3419,14 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL order by id;
+WHERE select_id = 58 OR select_id IS NULL;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$--	4
--1	-1	5
--3333	-3333.3333	26
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$--	4
+-1.00	-1	5
+-3333.33	-3333.3333	25
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3526,14 +3439,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL) order by id;
+WHERE select_id = 58 OR select_id IS NULL);
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$--	4
--1	-1	5
--3333	-3333.3333	26
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$--	4
+-1.00	-1	5
+-3333.33	-3333.3333	25
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3548,7 +3461,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL order by id;
+WHERE select_id = 57 OR select_id IS NULL;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3560,7 +3473,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL) order by id;
+WHERE select_id = 57 OR select_id IS NULL);
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3574,7 +3487,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL order by id;
+WHERE select_id = 56 OR select_id IS NULL;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3586,7 +3499,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as time) AS `CAST(my_time AS TIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL) order by id;
+WHERE select_id = 56 OR select_id IS NULL);
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3600,7 +3513,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL order by id;
+WHERE select_id = 55 OR select_id IS NULL;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3612,7 +3525,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as time) AS `CAST(my_timestamp AS TIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL) order by id;
+WHERE select_id = 55 OR select_id IS NULL);
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3626,7 +3539,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL order by id;
+WHERE select_id = 54 OR select_id IS NULL;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3638,7 +3551,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as time) AS `CAST(my_date AS TIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL) order by id;
+WHERE select_id = 54 OR select_id IS NULL);
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3652,7 +3565,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL order by id;
+WHERE select_id = 53 OR select_id IS NULL;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3664,7 +3577,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as time) AS `CAST(my_datetime AS TIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL) order by id;
+WHERE select_id = 53 OR select_id IS NULL);
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3674,45 +3587,11 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_double AS TIME),
-my_double, id FROM t1_values;
-SELECT CAST(my_double AS TIME),
-my_double, id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL order by id;
-CAST(my_double AS TIME)	my_double	id
-NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
-00:00:00	0	4
--00:00:01	-1	5
-00:17:58	1758	25
-Warnings:
-Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
-SHOW CREATE VIEW v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
-SELECT v1.* FROM v1
-WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL) order by id;
-CAST(my_double AS TIME)	my_double	id
-NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
-00:00:00	0	4
--00:00:01	-1	5
-00:17:58	1758	25
-Warnings:
-Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
-DROP VIEW v1;
-
-
 CREATE VIEW v1 AS SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL order by id;
+WHERE select_id = 52 OR select_id IS NULL;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3728,7 +3607,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL) order by id;
+WHERE select_id = 52 OR select_id IS NULL);
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3746,7 +3625,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL order by id;
+WHERE select_id = 51 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3763,7 +3642,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as time) AS `CAST(my_varbinary_1000 AS TIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL) order by id;
+WHERE select_id = 51 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3782,7 +3661,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL order by id;
+WHERE select_id = 50 OR select_id IS NULL;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3801,7 +3680,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as time) AS `CAST(my_binary_30 AS TIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL) order by id;
+WHERE select_id = 50 OR select_id IS NULL);
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3822,7 +3701,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL order by id;
+WHERE select_id = 49 OR select_id IS NULL;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3839,7 +3718,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as time) AS `CAST(my_varchar_1000 AS TIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL) order by id;
+WHERE select_id = 49 OR select_id IS NULL);
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3858,7 +3737,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL order by id;
+WHERE select_id = 48 OR select_id IS NULL;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3875,7 +3754,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as time) AS `CAST(my_char_30 AS TIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL) order by id;
+WHERE select_id = 48 OR select_id IS NULL);
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3894,7 +3773,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL order by id;
+WHERE select_id = 47 OR select_id IS NULL;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3902,16 +3781,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL) order by id;
+WHERE select_id = 47 OR select_id IS NULL);
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3919,10 +3798,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -3930,31 +3809,35 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL order by id;
+WHERE select_id = 46 OR select_id IS NULL;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 13:00:00	13:00:00	4
-0000-00-00 10:00:00	10:00:00	5
+0000-00-00 00:00:00	13:00:00	4
+0000-00-00 00:00:00	10:00:00	5
 Warnings:
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL) order by id;
+WHERE select_id = 46 OR select_id IS NULL);
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 13:00:00	13:00:00	4
-0000-00-00 10:00:00	10:00:00	5
+0000-00-00 00:00:00	13:00:00	4
+0000-00-00 00:00:00	10:00:00	5
 Warnings:
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
 DROP VIEW v1;
 
 
@@ -3962,7 +3845,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL order by id;
+WHERE select_id = 45 OR select_id IS NULL;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3974,7 +3857,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as datetime) AS `CAST(my_timestamp AS DATETIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL) order by id;
+WHERE select_id = 45 OR select_id IS NULL);
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3988,7 +3871,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL order by id;
+WHERE select_id = 44 OR select_id IS NULL;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -4000,7 +3883,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as datetime) AS `CAST(my_date AS DATETIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL) order by id;
+WHERE select_id = 44 OR select_id IS NULL);
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -4014,7 +3897,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL order by id;
+WHERE select_id = 43 OR select_id IS NULL;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4026,7 +3909,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as datetime) AS `CAST(my_datetime AS DATETIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL) order by id;
+WHERE select_id = 43 OR select_id IS NULL);
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4040,7 +3923,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL order by id;
+WHERE select_id = 42 OR select_id IS NULL;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4049,17 +3932,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL) order by id;
+WHERE select_id = 42 OR select_id IS NULL);
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4068,11 +3951,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4080,7 +3963,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL order by id;
+WHERE select_id = 41 OR select_id IS NULL;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4089,17 +3972,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL) order by id;
+WHERE select_id = 41 OR select_id IS NULL);
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4108,11 +3991,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4120,7 +4003,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL order by id;
+WHERE select_id = 40 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4129,16 +4012,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as datetime) AS `CAST(my_varbinary_1000 AS DATETIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL) order by id;
+WHERE select_id = 40 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4147,10 +4030,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4158,7 +4041,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL order by id;
+WHERE select_id = 39 OR select_id IS NULL;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4167,17 +4050,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as datetime) AS `CAST(my_binary_30 AS DATETIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL) order by id;
+WHERE select_id = 39 OR select_id IS NULL);
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4186,10 +4069,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 DROP VIEW v1;
 
@@ -4198,7 +4081,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL order by id;
+WHERE select_id = 38 OR select_id IS NULL;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4207,16 +4090,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as datetime) AS `CAST(my_varchar_1000 AS DATETIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL) order by id;
+WHERE select_id = 38 OR select_id IS NULL);
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4225,10 +4108,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4236,7 +4119,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL order by id;
+WHERE select_id = 37 OR select_id IS NULL;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4245,16 +4128,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as datetime) AS `CAST(my_char_30 AS DATETIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL) order by id;
+WHERE select_id = 37 OR select_id IS NULL);
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4263,10 +4146,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4274,7 +4157,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL order by id;
+WHERE select_id = 36 OR select_id IS NULL;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4282,16 +4165,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL) order by id;
+WHERE select_id = 36 OR select_id IS NULL);
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4299,10 +4182,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -4310,7 +4193,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL order by id;
+WHERE select_id = 35 OR select_id IS NULL;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4322,7 +4205,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL) order by id;
+WHERE select_id = 35 OR select_id IS NULL);
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4336,7 +4219,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL order by id;
+WHERE select_id = 34 OR select_id IS NULL;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4348,7 +4231,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as date) AS `CAST(my_timestamp AS DATE)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL) order by id;
+WHERE select_id = 34 OR select_id IS NULL);
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4362,7 +4245,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL order by id;
+WHERE select_id = 33 OR select_id IS NULL;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4374,7 +4257,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as date) AS `CAST(my_date AS DATE)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL) order by id;
+WHERE select_id = 33 OR select_id IS NULL);
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4388,7 +4271,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL order by id;
+WHERE select_id = 32 OR select_id IS NULL;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4400,7 +4283,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as date) AS `CAST(my_datetime AS DATE)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL) order by id;
+WHERE select_id = 32 OR select_id IS NULL);
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4414,7 +4297,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL order by id;
+WHERE select_id = 31 OR select_id IS NULL;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4423,16 +4306,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL) order by id;
+WHERE select_id = 31 OR select_id IS NULL);
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4441,10 +4324,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4452,7 +4335,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL order by id;
+WHERE select_id = 30 OR select_id IS NULL;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4461,16 +4344,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL) order by id;
+WHERE select_id = 30 OR select_id IS NULL);
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4479,10 +4362,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4490,7 +4373,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL order by id;
+WHERE select_id = 29 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4499,16 +4382,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as date) AS `CAST(my_varbinary_1000 AS DATE)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL) order by id;
+WHERE select_id = 29 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4517,10 +4400,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4528,7 +4411,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL order by id;
+WHERE select_id = 28 OR select_id IS NULL;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4537,17 +4420,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as date) AS `CAST(my_binary_30 AS DATE)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL) order by id;
+WHERE select_id = 28 OR select_id IS NULL);
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4556,10 +4439,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 DROP VIEW v1;
 
@@ -4568,7 +4451,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL order by id;
+WHERE select_id = 27 OR select_id IS NULL;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4577,16 +4460,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as date) AS `CAST(my_varchar_1000 AS DATE)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL) order by id;
+WHERE select_id = 27 OR select_id IS NULL);
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4595,10 +4478,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4606,7 +4489,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL order by id;
+WHERE select_id = 26 OR select_id IS NULL;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4615,16 +4498,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as date) AS `CAST(my_char_30 AS DATE)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL) order by id;
+WHERE select_id = 26 OR select_id IS NULL);
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4633,10 +4516,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4644,7 +4527,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL order by id;
+WHERE select_id = 25 OR select_id IS NULL;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4656,7 +4539,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset latin1) AS `CAST(my_year AS CHAR)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL) order by id;
+WHERE select_id = 25 OR select_id IS NULL);
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4670,7 +4553,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL order by id;
+WHERE select_id = 24 OR select_id IS NULL;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4682,7 +4565,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset latin1) AS `CAST(my_time AS CHAR)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL) order by id;
+WHERE select_id = 24 OR select_id IS NULL);
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4696,7 +4579,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL order by id;
+WHERE select_id = 23 OR select_id IS NULL;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4708,7 +4591,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset latin1) AS `CAST(my_timestamp AS CHAR)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL) order by id;
+WHERE select_id = 23 OR select_id IS NULL);
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4722,7 +4605,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL order by id;
+WHERE select_id = 22 OR select_id IS NULL;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4734,7 +4617,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset latin1) AS `CAST(my_date AS CHAR)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL) order by id;
+WHERE select_id = 22 OR select_id IS NULL);
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4748,7 +4631,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL order by id;
+WHERE select_id = 21 OR select_id IS NULL;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4760,7 +4643,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset latin1) AS `CAST(my_datetime AS CHAR)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL) order by id;
+WHERE select_id = 21 OR select_id IS NULL);
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4774,7 +4657,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL order by id;
+WHERE select_id = 20 OR select_id IS NULL;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4786,7 +4669,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset latin1) AS `CAST(my_double AS CHAR)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL) order by id;
+WHERE select_id = 20 OR select_id IS NULL);
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4800,7 +4683,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL order by id;
+WHERE select_id = 19 OR select_id IS NULL;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4812,7 +4695,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset latin1) AS `CAST(my_decimal AS CHAR)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL) order by id;
+WHERE select_id = 19 OR select_id IS NULL);
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4826,7 +4709,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL order by id;
+WHERE select_id = 18 OR select_id IS NULL;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4838,7 +4721,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset latin1) AS `CAST(my_bigint AS CHAR)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL) order by id;
+WHERE select_id = 18 OR select_id IS NULL);
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4852,7 +4735,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL order by id;
+WHERE select_id = 17 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4864,7 +4747,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset latin1) AS `CAST(my_varbinary_1000 AS CHAR)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL) order by id;
+WHERE select_id = 17 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4878,7 +4761,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL order by id;
+WHERE select_id = 16 OR select_id IS NULL;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4890,7 +4773,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL) order by id;
+WHERE select_id = 16 OR select_id IS NULL);
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4904,7 +4787,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL order by id;
+WHERE select_id = 15 OR select_id IS NULL;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4916,7 +4799,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset latin1) AS `CAST(my_varchar_1000 AS CHAR)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL) order by id;
+WHERE select_id = 15 OR select_id IS NULL);
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4930,7 +4813,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL order by id;
+WHERE select_id = 14 OR select_id IS NULL;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4942,7 +4825,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset latin1) AS `CAST(my_char_30 AS CHAR)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL) order by id;
+WHERE select_id = 14 OR select_id IS NULL);
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4956,7 +4839,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL order by id;
+WHERE select_id = 13 OR select_id IS NULL;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4968,7 +4851,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset binary) AS `CAST(my_year AS BINARY)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL) order by id;
+WHERE select_id = 13 OR select_id IS NULL);
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4982,7 +4865,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL order by id;
+WHERE select_id = 12 OR select_id IS NULL;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4994,7 +4877,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset binary) AS `CAST(my_time AS BINARY)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL) order by id;
+WHERE select_id = 12 OR select_id IS NULL);
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -5008,7 +4891,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL order by id;
+WHERE select_id = 11 OR select_id IS NULL;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -5020,7 +4903,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset binary) AS `CAST(my_timestamp AS BINARY)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL) order by id;
+WHERE select_id = 11 OR select_id IS NULL);
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -5034,7 +4917,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL order by id;
+WHERE select_id = 10 OR select_id IS NULL;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -5046,7 +4929,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset binary) AS `CAST(my_date AS BINARY)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL) order by id;
+WHERE select_id = 10 OR select_id IS NULL);
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -5060,7 +4943,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL order by id;
+WHERE select_id = 9 OR select_id IS NULL;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -5072,7 +4955,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset binary) AS `CAST(my_datetime AS BINARY)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL) order by id;
+WHERE select_id = 9 OR select_id IS NULL);
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -5086,7 +4969,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL order by id;
+WHERE select_id = 8 OR select_id IS NULL;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -5098,7 +4981,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset binary) AS `CAST(my_double AS BINARY)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL) order by id;
+WHERE select_id = 8 OR select_id IS NULL);
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -5112,7 +4995,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL order by id;
+WHERE select_id = 7 OR select_id IS NULL;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5124,7 +5007,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset binary) AS `CAST(my_decimal AS BINARY)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL) order by id;
+WHERE select_id = 7 OR select_id IS NULL);
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5138,7 +5021,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL order by id;
+WHERE select_id = 6 OR select_id IS NULL;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5150,7 +5033,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset binary) AS `CAST(my_bigint AS BINARY)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL) order by id;
+WHERE select_id = 6 OR select_id IS NULL);
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5164,7 +5047,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL order by id;
+WHERE select_id = 5 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5176,7 +5059,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset binary) AS `CAST(my_varbinary_1000 AS BINARY)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL) order by id;
+WHERE select_id = 5 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5190,7 +5073,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL order by id;
+WHERE select_id = 4 OR select_id IS NULL;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5202,7 +5085,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL) order by id;
+WHERE select_id = 4 OR select_id IS NULL);
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5216,7 +5099,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL order by id;
+WHERE select_id = 3 OR select_id IS NULL;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5228,7 +5111,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset binary) AS `CAST(my_varchar_1000 AS BINARY)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL) order by id;
+WHERE select_id = 3 OR select_id IS NULL);
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5242,7 +5125,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL order by id;
+WHERE select_id = 2 OR select_id IS NULL;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5254,7 +5137,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset binary) AS `CAST(my_char_30 AS BINARY)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL) order by id;
+WHERE select_id = 2 OR select_id IS NULL);
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5266,7 +5149,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT sqrt(my_bigint), my_bigint, id FROM t1_values;
 SELECT sqrt(my_bigint), my_bigint, id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL order by id;
+WHERE select_id = 1 OR select_id IS NULL;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -5280,7 +5163,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sqrt(`t1_values`.`my_bigint`) AS `sqrt(my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL) order by id;
+WHERE select_id = 1 OR select_id IS NULL);
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc.result b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
index fbc908b8ccf..f05c7ef73c4 100644
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
@@ -3,16 +3,19 @@
 .                         IMPORTANT NOTICE:
 .                         -----------------
 .
-.  FIXME: The .result files are still NOT CHECKED for correctness!
+.  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
+.         for correctness!
 .
 .  FIXME: Several tests are affected by known problems around DECIMAL
-.  FIXME: and NUMERIC that will be checked again after WL#2984 once
+.  FIXME: and NUMERIC that needs to be checked again after WL#2984
 .  FIXME: has been completed. Some of them are marked in the result.
 .
-. Currently (Dec 06, 2005) this .result file is checked OK for Linux
-. with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
-. Using the available Windows version 5.0.16 there are differences
-. that can be ignored (e.g. WL#2984).
+.  This .result file has been checked OK with Linux 5.0.23-bk,
+.  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
+.
+. This file has been saved although it might contain failures / wrong
+. results to be able to detect _new_ differences in the behaviour.
+. Hopefully the remaining checks can be made soon.
 .
 --------------------------------------------------------------------------------
 	FIXME: There are subtests that are switched off due to known bugs:
@@ -96,21 +99,20 @@ USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
-f1	f2	f3	f4	f5	f6
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
 set @v1 = f1;
 SELECT @v1, @v1;
 END//
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
-@v1	@v1
-abc	abc
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 binary ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -119,12 +121,12 @@ SELECT @v1;
 END//
 CALL sp1( 34 );
 @v1
-34
+3
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 blob ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -137,8 +139,6 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 int )  language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -151,8 +151,6 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
@@ -161,13 +159,19 @@ BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
+ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
+ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(60, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
@@ -175,51 +179,56 @@ SELECT @v1;
 END//
 CALL sp1( 17976931340000 );
 @v1
-17976931340000
+17976931340000.000000000000000000000000000000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 set("value1", "value1") ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
 CALL sp1( "value1, value1" );
 f1
-value1, value1
+value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) language sql SELECT f1;
 CALL sp1( 'abc' );
@@ -269,7 +278,9 @@ SHOW PROCEDURE status like 'sp1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 DROP PROCEDURE sp1;
 
 Testcase 4.1.2:
@@ -333,11 +344,13 @@ CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  lang
   BEGIN
 return f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SELECT fn1( "value1" );
 fn1( "value1" )
-0.000000000000000000000000000000
+1.000000000000000000000000000000
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: 'value1'
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -346,11 +359,14 @@ CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) langua
   BEGIN
 return f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
 SELECT fn1( "value1, value1" );
 fn1( "value1, value1" )
-0.000000000000000000000000000000
+1.000000000000000000000000000000
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: 'value1, value1'
+Note	1291	Column '' has duplicated value 'value1' in SET
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -441,7 +457,7 @@ CREATE PROCEDURE sp1 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE PROCEDURE `sp1`(f1 char(20) )
+sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(f1 char(20) )
 SELECT * from t1 where f2 = f1
 DROP PROCEDURE sp1;
 
@@ -454,7 +470,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50)
 return concat('hello, ', s, '!');
 show CREATE FUNCTION fn1;
 Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(s char(20)) RETURNS char(50)
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50)
 return concat('hello, ', s, '!')
 DROP FUNCTION fn1;
 
@@ -498,7 +514,7 @@ CREATE PROCEDURE sp7b (a char (20), out b char(20))
 SELECT f1 into b from t1 where t1.f2= a;
 CALL sp7b('xyz', @out_param);
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 SELECT @out_param;
 @out_param
 NULL
@@ -511,8 +527,8 @@ END//
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
 Warnings:
-Warning	1329	No data to FETCH
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data - zero rows fetched, selected, or processed
 SELECT @out_param;
 @out_param
 NULL
@@ -2565,12 +2581,12 @@ alter procedure sp1 sql security definer;
 alter function sp1 sql security definer;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE PROCEDURE `sp1`()
+sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
     COMMENT 'this is a procedure'
 set @x= 3
 show CREATE FUNCTION sp1;
 Function	sql_mode	Create Function
-sp1		CREATE FUNCTION `sp1`() RETURNS int(11)
+sp1		CREATE DEFINER=`root`@`localhost` FUNCTION `sp1`() RETURNS int(11)
     COMMENT 'this is a function'
 return 4
 USE db_storedproc;
@@ -4587,6 +4603,9 @@ END begin_label//
 CALL sp1();
 @v1	@v2
 1	2
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.7:
@@ -4621,6 +4640,9 @@ declare y char;
 SELECT f1, f2 into x, y from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.9:
@@ -4703,9 +4725,9 @@ fetch cur1 into e;
 SELECT x, y, z, a, b, c, d, e;
 close cur1;
 END//
+ERROR 42000: Too big scale 255 specified for column ''. Maximum is 30.
 CALL sp6();
-x	y	z	a	b	c	d	e
-a	1	1.1	value1	1200000000000	mediumtext	2005-02-02 12:12:12	a`
+ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -4737,7 +4759,7 @@ BEGIN
 declare x char, integer default '0';
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0';
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -4746,7 +4768,7 @@ BEGIN
 declare x1, x2 char, integer default '0', 1;
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0', 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0', 1;
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -5988,7 +6010,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+000	000	000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -5997,7 +6023,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+001	001	001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6024,7 +6050,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000	00000	00000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6033,7 +6063,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00001	00001	00001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6060,7 +6090,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000000	00000000	00000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6069,7 +6103,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00000001	00000001	00000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6096,7 +6130,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+0000000000	0000000000	0000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6105,7 +6143,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+0000000001	0000000001	0000000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6123,7 +6161,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+18446744073709551615	18446744073709551615	18446744073709551615
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6132,7 +6170,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000000000000000000	00000000000000000000	00000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6141,7 +6183,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00000000000000000001	00000000000000000001	00000000000000000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6150,7 +6192,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
+-9999999999	-9999999999	-9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6161,7 +6207,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6170,7 +6220,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
+0000000000	0000000000	0000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6181,7 +6235,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6192,7 +6250,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6203,7 +6265,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6214,7 +6280,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6225,7 +6295,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6252,7 +6326,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6261,7 +6335,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6270,7 +6344,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+1.17549e-38	1.17549e-38	1.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6279,7 +6353,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+1.17549e-38	1.17549e-38	1.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6288,7 +6362,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+01.17549e-38	01.17549e-38	01.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6297,7 +6371,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+01.17549e-38	01.17549e-38	01.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6333,7 +6407,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-20050202122012	20050202122012	20050202122012
+2005-02-02 12:20:12	2005-02-02 12:20:12	2005-02-02 12:20:12
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -12384,10 +12458,13 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	abaa	3
+NULL	a	3
+Warnings:
+Warning	1265	Data truncated for column 'y' at row 3
+Warning	1265	Data truncated for column 'y' at row 1
 SELECT @v1, @v2;
 @v1	@v2
-4	a`
+4	a
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12454,7 +12531,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1264	Out of range value adjusted for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12481,9 +12558,11 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-temp
+t
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12501,7 +12580,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'asd'
+Warning	1265	Data truncated for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12527,7 +12606,9 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-asd
+0000-00-00 00:00:00
+Warnings:
+Warning	1264	Out of range value adjusted for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12571,7 +12652,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12602,6 +12683,8 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12665,6 +12748,8 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12672,6 +12757,8 @@ declare x tinyint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12679,6 +12766,8 @@ declare x tinyint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12686,6 +12775,8 @@ declare x tinyint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12693,6 +12784,8 @@ declare x tinyint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12700,6 +12793,8 @@ declare x smallint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12707,6 +12802,8 @@ declare x smallint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12714,6 +12811,8 @@ declare x smallint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12721,6 +12820,8 @@ declare x smallint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12728,6 +12829,8 @@ declare x mediumint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12735,6 +12838,8 @@ declare x mediumint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12742,6 +12847,8 @@ declare x mediumint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12749,6 +12856,8 @@ declare x mediumint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12756,6 +12865,8 @@ declare x int;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12763,6 +12874,8 @@ declare x int unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12770,6 +12883,8 @@ declare x int zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12777,6 +12892,8 @@ declare x int unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12784,6 +12901,8 @@ declare x bigint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12791,6 +12910,8 @@ declare x bigint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12798,6 +12919,8 @@ declare x bigint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12805,6 +12928,8 @@ declare x bigint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12813,7 +12938,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12822,7 +12947,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12831,7 +12956,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12840,7 +12965,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12849,7 +12974,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12858,7 +12983,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12867,7 +12992,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12876,7 +13001,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12884,6 +13009,8 @@ declare x real;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12891,6 +13018,8 @@ declare x real unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12898,6 +13027,8 @@ declare x real zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12905,6 +13036,8 @@ declare x real unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12912,6 +13045,8 @@ declare x float;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12919,6 +13054,8 @@ declare x float unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12926,6 +13063,8 @@ declare x float zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12933,6 +13072,8 @@ declare x float unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12940,6 +13081,8 @@ declare x date;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12947,6 +13090,8 @@ declare x time;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12954,6 +13099,8 @@ declare x datetime;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12961,6 +13108,8 @@ declare x timestamp;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12968,6 +13117,8 @@ declare x year;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12975,6 +13126,8 @@ declare x year(3);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12982,6 +13135,8 @@ declare x year(4);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12989,6 +13144,8 @@ declare x enum("1enum", "2enum");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12996,6 +13153,8 @@ declare x set("1set", "2set");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.38:
@@ -13643,7 +13802,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13669,7 +13828,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -14926,7 +15085,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
-0
+-46744073709551616
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -14945,6 +15104,8 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -14972,6 +15133,10 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -14980,7 +15145,9 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -14989,7 +15156,10 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15008,6 +15178,10 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15016,7 +15190,9 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15025,7 +15201,10 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15061,7 +15240,10 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15097,7 +15279,10 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000001
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15106,7 +15291,10 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-1
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15115,7 +15303,10 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000001
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15124,7 +15315,10 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15142,7 +15336,9 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15151,7 +15347,9 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15160,7 +15358,9 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15178,7 +15378,9 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15187,7 +15389,9 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15196,7 +15400,9 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15214,7 +15420,9 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15223,7 +15431,9 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15232,7 +15442,9 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15250,7 +15462,9 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15259,7 +15473,9 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15268,7 +15484,9 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15286,7 +15504,9 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15295,7 +15515,9 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15304,7 +15526,9 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15322,7 +15546,9 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15331,7 +15557,9 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15340,7 +15568,9 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15349,7 +15579,10 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483648
+-2147483638
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15385,7 +15618,9 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15412,7 +15647,11 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-0
+16777215
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15421,7 +15660,9 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15430,7 +15671,9 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15440,6 +15683,9 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15448,7 +15694,9 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15457,7 +15705,10 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15466,7 +15717,9 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15476,6 +15729,9 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15484,7 +15740,9 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15493,7 +15751,10 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15502,7 +15763,12 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999999.999999999999999999999999999999
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15512,6 +15778,10 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15521,6 +15791,10 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15529,7 +15803,10 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15577,7 +15854,9 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15586,7 +15865,9 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15595,7 +15876,10 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15613,7 +15897,9 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15622,7 +15908,9 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15631,7 +15919,9 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15667,7 +15957,11 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-0
+65535
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15703,7 +15997,11 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-0
+255
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
@@ -15759,7 +16057,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-26:00:00
+25:59:59
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -15768,7 +16066,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:01
+1998-01-02 01:01:00
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -15778,6 +16076,8 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -15787,6 +16087,8 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
 CREATE FUNCTION fn96( f1 char binary) returns char binary
 BEGIN
@@ -15796,6 +16098,8 @@ END//
 SELECT fn96( 'h');
 fn96( 'h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -15917,7 +16221,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
--9223372036854775808
+18400000000000000000
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -15926,7 +16230,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-184000000000000000
+00184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -15935,7 +16239,9 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
--9220000000000000
+00000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
@@ -15947,7 +16253,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
@@ -15959,7 +16265,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -15968,7 +16274,11 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -15977,7 +16287,9 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
@@ -15989,7 +16301,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
@@ -16001,7 +16316,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
@@ -16013,7 +16328,11 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
@@ -16025,7 +16344,9 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
@@ -16037,7 +16358,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
@@ -16049,7 +16373,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000
+-1000000000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
@@ -16061,7 +16385,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000
+10000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
@@ -16073,7 +16397,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-10000000000000000.000000000
+000000000000000010000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
@@ -16085,7 +16409,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
--1000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
@@ -16094,7 +16421,7 @@ SELECT f1;
 END//
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000.000000000
+-1000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
@@ -16103,10 +16430,10 @@ SELECT f1;
 END//
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+100000000000000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+1000000000000000000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
@@ -16118,10 +16445,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp20_duz( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+0000000000000000000000000000000000000000000100000000000000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+0000000000000000000000000000000000000001000000000000000000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
@@ -16133,7 +16460,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-1.000000000
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
@@ -16145,7 +16475,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-1.000000000
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
@@ -16157,7 +16490,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-1.000000000
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
@@ -16169,7 +16505,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16187,7 +16526,9 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16196,7 +16537,9 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16205,7 +16548,9 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16223,7 +16568,9 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16232,7 +16579,9 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16241,7 +16590,9 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16259,7 +16610,9 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16268,7 +16621,9 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16277,7 +16632,9 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16295,7 +16652,9 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16304,7 +16663,9 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16313,7 +16674,9 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16331,7 +16694,9 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16340,7 +16705,9 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16349,7 +16716,9 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16367,7 +16736,9 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16376,7 +16747,9 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16385,7 +16758,9 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16394,7 +16769,10 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2150000000
+-2147483638
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16421,7 +16799,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-215000000
+0215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16430,7 +16808,9 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16457,7 +16837,11 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
--8388602
+16777215
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16466,7 +16850,9 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16475,7 +16861,9 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16484,7 +16872,10 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16493,7 +16884,9 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16502,7 +16895,10 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16511,7 +16907,9 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16520,7 +16918,10 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16529,7 +16930,9 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16538,7 +16941,10 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
@@ -16547,7 +16953,12 @@ SELECT f1;
 END//
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
@@ -16556,7 +16967,11 @@ SELECT f1;
 END//
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
@@ -16565,7 +16980,11 @@ SELECT f1;
 END//
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
@@ -16574,7 +16993,10 @@ SELECT f1;
 END//
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
@@ -16583,7 +17005,7 @@ SELECT f1;
 END//
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000.000000000
+-10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
@@ -16592,7 +17014,7 @@ SELECT f1;
 END//
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
@@ -16601,7 +17023,7 @@ SELECT f1;
 END//
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
@@ -16610,7 +17032,7 @@ SELECT f1;
 END//
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -16619,7 +17041,9 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -16628,7 +17052,9 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -16637,7 +17063,10 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
--999999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -16646,7 +17075,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.10000
+1.1
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -16655,7 +17084,9 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-1.10000
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -16664,7 +17095,9 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -16673,7 +17106,9 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -16709,7 +17144,11 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
--32602
+65535
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -16745,7 +17184,11 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
--102
+255
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp89;
 DROP PROCEDURE IF EXISTS sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -16765,7 +17208,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-26:00:00.999997
+25:59:59
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -16774,7 +17217,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:01.000001
+1998-01-02 01:01:00
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -16783,7 +17226,9 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -16792,7 +17237,9 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -16801,7 +17248,9 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -16846,7 +17295,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-61
+2061
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -16901,6 +17350,8 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -16937,9 +17388,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
+2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	2033	2084	2033	2084
+2061	2071	2061	2071	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17010,9 +17461,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
+a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17155,7 +17606,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-9223372036854775807	NULL
+18400000000000000000	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17163,7 +17614,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-9223372036854775807	9223372036854775807	NULL
+18400000000000000000	18400000000000000000	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17171,7 +17622,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
--2	-2	-2
+18353255926290448384	18353255926290448384	18353255926290448384
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17179,7 +17630,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
--2	-2
+18353255926290448384	18353255926290448384
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17237,9 +17688,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17291,9 +17742,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17337,9 +17788,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17372,9 +17823,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17407,9 +17858,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17442,9 +17893,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17477,9 +17928,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17545,9 +17996,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -17579,9 +18030,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -17613,9 +18064,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -17647,9 +18098,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -17681,9 +18132,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -17715,9 +18166,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -17783,9 +18234,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -17817,9 +18268,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -17851,9 +18302,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -17919,9 +18370,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -17953,9 +18404,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -17987,9 +18438,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18021,9 +18472,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18089,9 +18540,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18123,9 +18574,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18191,9 +18642,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18225,9 +18676,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18293,9 +18744,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18327,9 +18778,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18361,9 +18812,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18395,9 +18846,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18429,9 +18880,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18463,9 +18914,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18497,9 +18948,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18531,9 +18982,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -18565,9 +19016,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -18599,9 +19050,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -18633,9 +19084,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -18667,9 +19118,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -18701,9 +19152,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -18735,9 +19186,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -18769,9 +19220,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -18803,9 +19254,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -18837,9 +19288,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -18871,9 +19322,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -18905,9 +19356,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	61	61	71	61	61	71
+2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	61	71	61	71
+2061	2071	2061	2071	2061	2071	2061	2071
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19041,9 +19492,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
+a	a	a	a	a	a	a	a	a	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	aah	ah	aah
+a	a	a	a	a	a	a	a
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19075,9 +19526,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
+a	a	a	a	a	a	a	a	NULL	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	NULL	ah	aah
+a	a	a	a	a	NULL	a	a
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19177,9 +19628,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19211,9 +19662,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19245,9 +19696,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19279,9 +19730,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19313,9 +19764,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19347,9 +19798,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19381,9 +19832,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19415,9 +19866,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19449,9 +19900,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19483,9 +19934,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19517,9 +19968,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -19551,9 +20002,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -19585,9 +20036,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -19619,9 +20070,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -19653,9 +20104,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -19687,9 +20138,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -19721,9 +20172,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -19823,9 +20274,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -19857,9 +20308,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -19925,9 +20376,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -19959,9 +20410,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -19993,9 +20444,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20027,9 +20478,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20061,9 +20512,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20095,9 +20546,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20129,9 +20580,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20163,9 +20614,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20231,9 +20682,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20265,9 +20716,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20299,9 +20750,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20367,9 +20818,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20435,9 +20886,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20463,7 +20914,7 @@ insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
 Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
+sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
@@ -20499,7 +20950,7 @@ SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
 Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
+sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
@@ -20542,7 +20993,7 @@ show warnings;
 END//
 show CREATE PROCEDURE sp4;
 Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -20590,14 +21041,14 @@ set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
 Procedure	sql_mode	Create Procedure
-sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
 END
 show CREATE PROCEDURE sp6b;
 Procedure	sql_mode	Create Procedure
-sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
@@ -20605,7 +21056,7 @@ set @y=@x;
 END
 show CREATE PROCEDURE sp6c;
 Procedure	sql_mode	Create Procedure
-sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
@@ -20791,7 +21242,7 @@ END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
 Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
@@ -20823,7 +21274,7 @@ END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
 Procedure	sql_mode	Create Procedure
-sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
+sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
old mode 100644
new mode 100755
index 60ea7393c73..5560fb1fd73
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
@@ -166,7 +166,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
+SELECT f1, f2 into @x, @y from t2 limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -209,7 +209,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
+SELECT f4, f3 into @x, @y from t2 limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -544,9 +544,6 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
-Warnings:
-Note	1051	Unknown table 'tqq'
-Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()
@@ -1087,8 +1084,7 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
-where f4 >=-5000 order by f4 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1171,7 +1167,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2 order by f4;
+SELECT f1, f2, f4, f5 from t2;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1191,21 +1187,21 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
 open cur1;
 open cur2;
 BEGIN
-declare continue handler for sqlstate '02000' set count=1;
+declare continue handler for sqlstate '02000' set count = 1;
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-1-', count, newf1, newf2, newf4, newf5;
 insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-set count= 4;
+set count = 4;
 BEGIN
-while count> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-2-', count, newf1, newf2, newf4, newf5;
-set count = count- 1;
+set count = count - 1;
 END while;
 SELECT '-3-', count, newf1, newf2, newf4, newf4;
 END;
@@ -1274,10 +1270,8 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
-where f4>=-5000 order by f4 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
-where f4>=-5000 order by f4 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1308,10 +1302,8 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
-WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
-WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_03.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
old mode 100644
new mode 100755
index 5bb5b3cbbc2..ec2b4850d30
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
@@ -80,7 +80,7 @@ connect(localhost,user_1,,db_storedproc,MYSQL_PORT,MYSQL_SOCK);
 user_1@localhost	db_storedproc
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
+SELECT * FROM db_storedproc.t1 LIMIT 1;
 END//
 CREATE FUNCTION fn31105(n INT) RETURNS INT
 BEGIN
@@ -209,7 +209,7 @@ CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -226,7 +226,7 @@ CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -246,7 +246,7 @@ CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -279,7 +279,7 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
index 02a82db0901..a2bb203b294 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
@@ -199,9 +199,6 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
-ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
-CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
-BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 insert into t1 (f2) values ('insert 3.5.1.7');
 select * from t1;
 f1	f2	f3
@@ -210,14 +207,12 @@ update t1 set f2='update 3.5.1.7';
 select * from t1;
 f1	f2	f3
 NULL	update 3.5.1.7	42
-select trigger_name from information_schema.triggers order by trigger_name;
+select trigger_name from information_schema.triggers;
 trigger_name
 trg5_1
 trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
 drop trigger trg5_1;
 drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
-ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
-drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 drop table t1;
 
 Testcase 3.5.1.8:
@@ -319,7 +314,7 @@ insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 select @test_var1, @test_var2, @test_var3;
 @test_var1	@test_var2	@test_var3
 trig1	trig2	trig3
-select * from t1 order by f2;
+select * from t1;
 f1	f2
 trig1	1
 trig1	2
@@ -329,7 +324,7 @@ trig2	3
 select * from trig_db3.t1;
 f1	f2
 trig3	4
-select * from t1 order by f2;
+select * from t1;
 f1	f2
 trig1	1
 trig1	2
@@ -354,10 +349,10 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1 
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers;
 trigger_schema	trigger_name	event_object_table
-trig_db1	trig1_a	t1
 trig_db1	trig1_b	t1
+trig_db1	trig1_a	t1
 trig_db2	trig2	t1
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03.result b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
index c72a792a3a5..18300c6fc6b 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
@@ -82,16 +82,16 @@ Testcase 3.5.3.2/6:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 grant ALL  on *.* to test_noprivs@localhost;
-revoke TRIGGER on *.* from test_noprivs@localhost;
+revoke SUPER  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -104,10 +104,10 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-Got one of the listed errors
+ERROR 42000: Access denied; you need the SUPER privilege for this operation
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 select current_user;
@@ -122,12 +122,15 @@ root@localhost
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
 ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1'
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
+
+note: once 15166 is fixed a similar case for SELECT needs to be added
+---------------------------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -136,10 +139,10 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-Got one of the listed errors
+ERROR 42000: Access denied; you need the SUPER privilege for this operation
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -148,12 +151,12 @@ use priv_db;
 drop trigger trg1_2;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-no');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 drop trigger trg1_2;
 
 Testcase 3.5.3.7a:
@@ -163,12 +166,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke UPDATE  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
+grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -177,24 +180,24 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-select f1 from t1 order by f1;
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
 use priv_db;
 select current_user;
@@ -202,220 +205,236 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 drop trigger trg4a_2;
 
 Testcase 3.5.3.7b:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs;
+grant SUPER on *.* to test_noprivs;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1b
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
+insert 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2b';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT on priv_db.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.7-2a
+update 3.5.3.7-1b
 insert 3.5.3.7-2b
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
 -----------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2c';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2c');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
-trig 3.5.3.7-2c
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
+trig 3.5.3.7-2c
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
-trig 3.5.3.7-2c
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
+trig 3.5.3.7-2c
+insert 3.5.3.7-1d
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2d';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2d');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
-trig 3.5.3.7-2c
-trig 3.5.3.7-2d
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
+trig 3.5.3.7-2c
+insert 3.5.3.7-1d
+trig 3.5.3.7-2d
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -425,12 +444,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke SELECT  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
+grant SUPER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -439,7 +458,7 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 
 Trigger create disabled - should fail - Bug 8887
 ------------------------------------------------
@@ -458,13 +477,17 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-2a
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2a');
 select @test_var;
 @test_var
@@ -474,26 +497,26 @@ drop trigger trg5a_2;
 Testcase: 3.5.3.8b
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke SELECT  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -510,7 +533,7 @@ before trig 3.5.3.8-1b
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -520,6 +543,10 @@ insert into t1 (f1) values ('insert 3.5.3.8-2b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-2b
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE on priv_db.* to test_yesprivs@localhost;
 update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 select @test_var;
 @test_var
@@ -529,26 +556,26 @@ drop trigger trg5b_2;
 Testcase 3.5.3.8c:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -561,12 +588,16 @@ before trig 3.5.3.8-1c
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2c';
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2c');
 select @test_var;
 @test_var
@@ -576,24 +607,24 @@ drop trigger trg5c_2;
 Testcase: 3.5.3.8d:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
@@ -607,12 +638,16 @@ before trig 3.5.3.8-1d
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2d';
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2d');
 select @test_var;
 @test_var
@@ -627,12 +662,12 @@ drop table if exists t2;
 create table t1 (f1 int) engine= innodb;
 create table t2 (f2 int) engine= innodb;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t2` TO 'test_yesprivs'@'localhost'
 GRANT SELECT, UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -648,10 +683,10 @@ ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 4
-select f2 from t2 order by f2;
+select f2 from t2;
 f2
 4
 use priv_db;
@@ -664,11 +699,11 @@ ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
-2
 4
-select f2 from t2 order by f2;
+2
+select f2 from t2;
 f2
 1
 use priv_db;
@@ -681,12 +716,12 @@ ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
-1
-2
 4
-select f2 from t2 order by f2;
+2
+1
+select f2 from t2;
 f2
 1
 select @aaa;
@@ -702,13 +737,13 @@ ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
-1
-1
-2
 4
-select f2 from t2 order by f2;
+2
+1
+1
+select f2 from t2;
 f2
 drop database if exists priv_db;
 drop user test_yesprivs@localhost;
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
index 8a7ee3dc55d..ce7c51ec630 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
@@ -93,18 +93,18 @@ Create trigger trg1 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.1';
 Use db_drop;
 Insert into t1 values ('Insert error 3.5.4.1');
-Select * from t1 order by f1;
+Select * from t1;
 f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers;
 trigger_schema	trigger_name	event_object_table
 Insert into t1 values ('Insert no trigger 3.5.4.1');
-Select * from t1 order by f1;
+Select * from t1;
 f1
-Insert no trigger 3.5.4.1
 Trigger 3.5.4.1
+Insert no trigger 3.5.4.1
 drop trigger trg1;
 drop database if exists db_drop;
 revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -258,7 +258,7 @@ use dbtest_one;
 Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Select * from dbtest_two.t2 order by f1;
+Select * from dbtest_two.t2;
 f1
 1st Insert 3.5.
 2nd Insert 3.5.
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_08.result b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
index 44d53923241..0f2d54f01ba 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
@@ -139,10 +139,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
+select * from db_test.t1_i;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u order by u120;
+select * from db_test.t1_u;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -150,7 +150,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d order by d120;
+select * from db_test.t1_d;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -162,22 +162,14 @@ select @test_var;
 3.5.8.4 - single SQL - insert
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
-BEGIN
 insert into db_test.t1_i 
 values (new.f120, new.f136, new.f144, new.f163);
-END//
-Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-f120	f122	f136	f144	f163
-1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
-i120	i136	i144	i163
-1	00222	0000023456	1.050000000000000000000000000000
 update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 I	Test 3.5.8.4-Single Insert	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
+select * from db_test.t1_i;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
 I	00222	0000023456	1.050000000000000000000000000000
@@ -194,14 +186,14 @@ update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 U	Test 3.5.8.4-Single Update	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u order by u120;
+select * from db_test.t1_u;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 
 3.5.8.3/4 - single SQL - delete
 -------------------------------
@@ -214,7 +206,7 @@ f122='Test 3.5.8.4-Single Delete'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 D	Test 3.5.8.4-Single Delete	00444	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_d order by d120;
+select * from db_test.t1_d;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -261,29 +253,29 @@ END//
 set @test_var='Empty', @test_var2=0;
 Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	one	2nd else
 Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	two	2nd else
 D	Test 3.5.8.5-if	00102	two	2nd else
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
-d	Test 3.5.8.5-if	00010	three	2nd if
 D	Test 3.5.8.5-if	00101	three	2nd if
 D	Test 3.5.8.5-if	00102	three	2nd if
+d	Test 3.5.8.5-if	00010	three	2nd if
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
-d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00101	three	2nd else
 D	Test 3.5.8.5-if	00102	three	2nd else
+d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00103	three	2nd else
 create trigger trg3 before update on tb3 for each row
 BEGIN
@@ -343,20 +335,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -366,34 +358,34 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
-1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
 B	Test 3.5.8.5-case	00191	0000000016	1*0000099999
 C	Test 3.5.8.5-case	00200	0000000001	1*0000099999
+1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 Insert into tb3 (f120, f122, f136, f144) 
 values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 create trigger trg3a before update on tb3 for each row
 BEGIN
 CASE
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_09.result b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
index 6ea93683847..54b191e401e 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
@@ -120,7 +120,7 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
 Insert into tb3 (f122, f136, f163) 
 values ('Test 3.5.9.3', 7, 123.17);
 Update tb3 Set f136=8 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -136,7 +136,7 @@ a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
 f118	f121	f122	f136	f163
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 @tr_var_b4_136, @tr_var_b4_163;
@@ -176,7 +176,7 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
 Insert into tb3 (f122, f136, f151, f163) 
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%' order by f163;
+where f122 like 'Test 3.5.9.4%';
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -194,9 +194,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1048	Column 'f136' cannot be null
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig' order by f163;
+where f122 like 'Test 3.5.9.4-trig';
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
index 6c9c1fb98c0..182747e3153 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
@@ -87,7 +87,7 @@ Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1);
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+from tb3 where f122 like 'Test 3.5.10.1/2/3%';
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -101,7 +101,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+where f122 like 'Test 3.5.10.1/2/3%';
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -115,7 +115,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+where f122 like 'Test 3.5.10.1/2/3%';
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -146,7 +146,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
-Select * from tb_load order by f1 limit 10;
+Select * from tb_load limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -241,7 +241,7 @@ insert into t3 (f1) values (new.f1+1000);
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3 order by f1;
+select * from t3;
 f1
 12
 102
@@ -276,14 +276,14 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1 order by f1;
+select * from t1;
 f1
 0
-select * from t2 order by f2;
+select * from t2;
 f2
-select * from t3 order by f3;
+select * from t3;
 f3
-select * from t4 order by f4;
+select * from t4;
 f4
 drop trigger tr1;
 drop trigger tr2;
@@ -369,7 +369,7 @@ create table t4 (f4 tinyint) engine = innodb;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL
+  `f1` int(11) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 insert into t1 values (1);
 create trigger tr1 after insert on t1
@@ -381,14 +381,14 @@ for each row insert into t4 (f4) values (new.f3+1000);
 set autocommit=0;
 start transaction;
 insert into t1 values (1);
-ERROR 22003: Out of range value for column 'f4' at row 1
+ERROR 22003: Out of range value adjusted for column 'f4' at row 1
 commit;
-select * from t1 order by f1;
+select * from t1;
 f1
 1
-select * from t2 order by f2;
+select * from t2;
 f2
-select * from t3 order by f3;
+select * from t3;
 f3
 drop trigger tr1;
 drop trigger tr2;
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result b/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
index b8d2b768cb1..56dd5d6740e 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
@@ -116,7 +116,7 @@ insert into t1 values (3,'Department C');
 insert into t2 values (1,2,'Emp 1');
 insert into t2 values (2,3,'Emp 2');
 insert into t2 values (3,4,'Emp 3');
-ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f_id`) REFERENCES `t1` (`id`) ON UPDATE CASCADE)
+ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f_id`) REFERENCES `t1` (`id`) ON UPDATE CASCADE)
 create trigger tr_t2 before insert on t2 for each row
 insert into t1 values(new.f_id, concat('New Department ', new.f_id));
 lock tables t1 write, t2 write;
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
index be0f36f49be..63d1c8a3131 100644
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -1926,7 +1926,7 @@ f1	f2
 2	two
 4	four
 INSERT INTO v1 VALUES(2,'two');
-ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '2' for key 1
 INSERT INTO v1 VALUES(3,'three');
 affected rows: 1
 INSERT INTO v1 VALUES(6,'six');
@@ -1945,7 +1945,7 @@ f1	f2
 3	three
 4	four
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
-ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '2' for key 1
 UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
@@ -1992,12 +1992,12 @@ DROP VIEW  IF EXISTS test.v1;
 CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
 ENGINE = innodb;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1 order by f1, f2;
+SELECT * FROM t1;
 f1	f2
 A	1
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 f1	f2
 A	1
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -2005,7 +2005,7 @@ affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 INSERT INTO v1 VALUES('B',2);
 affected rows: 1
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 f1	f2
 A	2
 B	2
@@ -2013,7 +2013,7 @@ UPDATE v1 SET f2 = 4;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 INSERT INTO v1 VALUES('B',3);
 ERROR HY000: CHECK OPTION failed 'test.v1'
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 f1	f2
 A	2
 B	2
@@ -10580,7 +10580,7 @@ f1	f2	f3	f4
 DELETE FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '0' for key 1
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10649,7 +10649,7 @@ DROP VIEW v1;
 CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '0' for key 1
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10984,11 +10984,11 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(5)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11008,12 +11008,12 @@ f4x	char(5)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4x	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(10);
@@ -11031,14 +11031,14 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(10)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
 2	NULL	<-- 10 -->	t1 2
 2	NULL	<-- 10 -->	v1 2
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11067,7 +11067,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(8)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11076,7 +11076,7 @@ f1	f2	f4	report
 2	NULL	<-- 10 -	v1 2
 3	NULL	<-- 10 -	t1 3
 3	NULL	<-- 10 -	v1 3
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11100,7 +11100,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11111,7 +11111,7 @@ f1	f2	f4	report
 3	NULL	<-- 10 -	v1 3
 4	NULL	<------ 20 -------->	t1 4
 4	NULL	<------ 20 -------->	v1 4
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11139,7 +11139,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11152,7 +11152,7 @@ f1	f2	f4	report
 4	NULL	<------ 20 -------->	v1 4
 <------------- 30 ----------->	NULL	<------ 20 -------->	t1 5
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11176,7 +11176,7 @@ f4	varchar(20)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report
 -1	ABC	t1 0
 -1	ABC	v1 0
@@ -11190,7 +11190,7 @@ f1	f4	report
 <------------- 30 ----------->	<------ 20 -------->	t1 5
 <------------- 30 ----------->	<------ 20 -------->	v1 5
 ABC	<------ 20 -------->	t1 6
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
 INSERT INTO t1 SET f1 = 'ABC', f2 = '1500-12-04',
@@ -11209,7 +11209,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11225,7 +11225,7 @@ f1	f4	report	f2
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	1500-12-04
 ABC	<------ 20 -------->	v1 7	1500-12-04
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11259,7 +11259,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11274,10 +11274,10 @@ f1	f4	report	f2
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	NULL
-ABC	<------ 20 -------->	t1 8	-0.00033
 ABC	<------ 20 -------->	v1 7	NULL
+ABC	<------ 20 -------->	t1 8	-0.00033
 ABC	<------ 20 -------->	v1 8	-0.00033
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11292,8 +11292,8 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	-0.00033	<------ 20 -------->	t1 8
 ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	t1 8
 ABC	-0.00033	<------ 20 -------->	v1 8
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
 INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
@@ -11316,7 +11316,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report	f2	f3
 -1	ABC	t1 0	NULL	NULL
 -1	ABC	v1 0	NULL	NULL
@@ -11331,12 +11331,12 @@ f1	f4	report	f2	f3
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL	NULL
 ABC	<------ 20 -------->	t1 6	NULL	NULL
 ABC	<------ 20 -------->	t1 7	NULL	NULL
-ABC	<------ 20 -------->	t1 8	-0.00033	NULL
-ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
 ABC	<------ 20 -------->	v1 7	NULL	NULL
+ABC	<------ 20 -------->	t1 8	-0.00033	NULL
 ABC	<------ 20 -------->	v1 8	-0.00033	NULL
+ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
 ABC	<------ 20 -------->	v1 9a	-0.00033	NULL
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11351,10 +11351,10 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	-0.00033	<------ 20 -------->	t1 8
-ABC	-0.00033	<------ 20 -------->	t1 9
 ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	t1 8
 ABC	-0.00033	<------ 20 -------->	v1 8
+ABC	-0.00033	<------ 20 -------->	t1 9
 ABC	-0.00033	<------ 20 -------->	v1 9a
 DROP TABLE t1;
 DROP VIEW  v1;
@@ -11369,10 +11369,10 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1 order by f1, f2;
+SELECT * FROM t1;
 f1	f2
 ABC	3
-SELECT * FROM v1 order by 2;
+SELECT * FROM v1;
 f1	my_sqrt
 ABC	1.7320508075689
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
@@ -11385,21 +11385,21 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1 order by f1, f2;
+SELECT * FROM t1;
 f1	f2
 ABC	3
 ABC	DEF
-SELECT * FROM v1 order by 2;
+SELECT * FROM v1;
 f1	my_sqrt
-ABC	0
 ABC	1.7320508075689
+ABC	0
 SELECT SQRT('DEF');
 SQRT('DEF')
 0
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2 order by 1;
+SELECT * FROM v2;
 SQRT('DEF')
 0
 Warnings:
@@ -11409,27 +11409,27 @@ DESCRIBE v2;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM v2 order by 2;
+SELECT * FROM v2;
 f1	my_sqrt
-ABC	0
 ABC	1.7320508075689
-CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
-SELECT * FROM t2 order by 2;
-f1	my_sqrt
 ABC	0
+CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
+SELECT * FROM t2;
+f1	my_sqrt
 ABC	1.73205080756888
+ABC	0
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
-SELECT * FROM t2 order by 2;
+SELECT * FROM t2;
 f1	my_sqrt
-ABC	0
 ABC	1.73205080756888
+ABC	0
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
-SELECT * FROM t2 order by 2;
+SELECT * FROM t2;
 f1	my_sqrt
-ABC	0
 ABC	1.73205080756888
+ABC	0
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/memory__datadict.result b/mysql-test/suite/funcs_1/r/memory__datadict.result
index 0ef00f0e553..1dea8a5f4a9 100644
--- a/mysql-test/suite/funcs_1/r/memory__datadict.result
+++ b/mysql-test/suite/funcs_1/r/memory__datadict.result
@@ -433,21 +433,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -470,7 +459,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -491,7 +480,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -512,7 +501,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -533,7 +522,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -554,7 +543,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -572,199 +561,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	ENGINES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	EVENTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	FILES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PARTITIONS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PLUGINS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PROCESSLIST
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	REFERENTIAL_CONSTRAINTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -785,7 +585,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -806,7 +606,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -827,7 +627,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -845,52 +645,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -911,7 +669,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -932,7 +690,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -953,7 +711,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -974,7 +732,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -995,7 +753,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -1016,7 +774,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -1141,27 +899,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	event
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Events
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1183,27 +920,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	general_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	General log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1309,48 +1025,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	ndb_binlog_index
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	latin1_swedish_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	plugin
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_bin
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL plugins
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1393,48 +1067,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	servers
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL Foreign Servers table
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	slow_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Slow log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1900,8 +1532,6 @@ t.table_type, t.engine
 from schemata s inner join tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
-NULL	db_datadict	latin1	BASE TABLE	CSV
-NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
@@ -1934,10 +1564,6 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -1950,17 +1576,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1968,8 +1583,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
-NULL	information_schema	utf8	BASE TABLE	CSV
-NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
@@ -2002,10 +1615,6 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -2018,17 +1627,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -2036,8 +1634,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
-NULL	mysql	latin1	BASE TABLE	CSV
-NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
@@ -2070,10 +1666,6 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -2086,17 +1678,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -2104,8 +1685,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
-NULL	test	latin1	BASE TABLE	CSV
-NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
@@ -2138,10 +1717,6 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -2154,17 +1729,6 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -2172,8 +1736,6 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
-NULL	test1	latin1	BASE TABLE	CSV
-NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
@@ -2206,10 +1768,6 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -2222,17 +1780,6 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -2240,8 +1787,6 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
-NULL	test4	latin1	BASE TABLE	CSV
-NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
@@ -2274,10 +1819,6 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -2290,17 +1831,6 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -2326,14 +1856,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -2348,75 +1878,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2429,60 +1890,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2513,10 +1920,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2537,20 +1940,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -2601,20 +2004,20 @@ NULL	db_datadict	v1	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_genera
 NULL	db_datadict	v1	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
 NULL	db_datadict	v1	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references	
-NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select,insert,update,references	
 NULL	db_datadict	vu	u	1		NO	varchar	81	243	NULL	NULL	utf8	utf8_general_ci	varchar(81)			select,insert,update,references	
@@ -2648,36 +2051,10 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
-NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
-NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
-NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
-NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
-NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
-NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
-NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
-NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
-NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -2711,16 +2088,6 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
-NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -2745,33 +2112,13 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
-NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
-NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -2816,16 +2163,14 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -3177,7 +2522,7 @@ cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
 eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
 select sum(id) from collations;
 sum(id)
-10840
+10741
 select collation_name, character_set_name into @x,@y
 from collation_character_set_applicability limit 1;
 select @x, @y;
@@ -3202,8 +2547,6 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -3215,8 +2558,6 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
-NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
-NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	1	NULL	NULL		BTREE	
@@ -3226,7 +2567,6 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -3257,7 +2597,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -3273,7 +2612,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -3284,7 +2622,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -3300,7 +2637,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -3311,7 +2647,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -3327,7 +2662,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -3345,8 +2679,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
-''@'%'	NULL	test	EVENT	NO
-''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -3361,8 +2693,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
-''@'%'	NULL	test\_%	EVENT	NO
-''@'%'	NULL	test\_%	TRIGGER	NO
 select * from table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 select * from column_privileges;
@@ -3371,7 +2701,6 @@ select * from table_constraints;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
@@ -3381,11 +2710,8 @@ NULL	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 NULL	mysql	name	mysql	help_topic	UNIQUE
 NULL	mysql	PRIMARY	mysql	host	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	ndb_binlog_index	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	proc	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	servers	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone_leap_second	PRIMARY KEY
@@ -3403,8 +2729,6 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_category	name	1	NULL	NULL	NULL	NULL
@@ -3416,8 +2740,6 @@ NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_topic	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -3426,7 +2748,6 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -3442,7 +2763,7 @@ NULL	mysql	PRIMARY	NULL	mysql	user	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	user	User	2	NULL	NULL	NULL	NULL
 select count(*) as max_recs from key_column_usage;
 max_recs
-45
+40
 select max(cardinality) from statistics;
 max(cardinality)
 393
@@ -3463,21 +2784,10 @@ Table or view 'COLLATIONS' is associated with the database 'information_schema'.
 Table or view 'COLLATION_CHARACTER_SET_APPLICABILITY' is associated with the database 'information_schema'.
 Table or view 'COLUMNS' is associated with the database 'information_schema'.
 Table or view 'COLUMN_PRIVILEGES' is associated with the database 'information_schema'.
-Table or view 'ENGINES' is associated with the database 'information_schema'.
-Table or view 'EVENTS' is associated with the database 'information_schema'.
-Table or view 'FILES' is associated with the database 'information_schema'.
-Table or view 'GLOBAL_STATUS' is associated with the database 'information_schema'.
-Table or view 'GLOBAL_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_schema'.
-Table or view 'PARTITIONS' is associated with the database 'information_schema'.
-Table or view 'PLUGINS' is associated with the database 'information_schema'.
-Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
-Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
 Table or view 'SCHEMA_PRIVILEGES' is associated with the database 'information_schema'.
-Table or view 'SESSION_STATUS' is associated with the database 'information_schema'.
-Table or view 'SESSION_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'STATISTICS' is associated with the database 'information_schema'.
 Table or view 'TABLES' is associated with the database 'information_schema'.
 Table or view 'TABLE_CONSTRAINTS' is associated with the database 'information_schema'.
@@ -3490,20 +2800,14 @@ Table or view 'vu' is associated with the database 'db_datadict'.
 Table or view 'vu1' is associated with the database 'db_datadict'.
 Table or view 'columns_priv' is associated with the database 'mysql'.
 Table or view 'db' is associated with the database 'mysql'.
-Table or view 'event' is associated with the database 'mysql'.
 Table or view 'func' is associated with the database 'mysql'.
-Table or view 'general_log' is associated with the database 'mysql'.
 Table or view 'help_category' is associated with the database 'mysql'.
 Table or view 'help_keyword' is associated with the database 'mysql'.
 Table or view 'help_relation' is associated with the database 'mysql'.
 Table or view 'help_topic' is associated with the database 'mysql'.
 Table or view 'host' is associated with the database 'mysql'.
-Table or view 'ndb_binlog_index' is associated with the database 'mysql'.
-Table or view 'plugin' is associated with the database 'mysql'.
 Table or view 'proc' is associated with the database 'mysql'.
 Table or view 'procs_priv' is associated with the database 'mysql'.
-Table or view 'servers' is associated with the database 'mysql'.
-Table or view 'slow_log' is associated with the database 'mysql'.
 Table or view 'tables_priv' is associated with the database 'mysql'.
 Table or view 'time_zone' is associated with the database 'mysql'.
 Table or view 'time_zone_leap_second' is associated with the database 'mysql'.
@@ -3550,12 +2854,12 @@ select * from table_constraints limit 0,5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
+NULL	mysql	name	mysql	help_category	UNIQUE
 select count(*) as max_recs from key_column_usage limit 0,5;
 max_recs
-45
+40
 select information_schema.tables.table_name as "table name",
 count(distinct(column_name)) as "no of columns in the table"
   from information_schema.tables left outer join information_schema.columns on
@@ -3568,36 +2872,19 @@ COLLATION_CHARACTER_SET_APPLICABILITY	2
 COLUMNS	19
 columns_priv	7
 COLUMN_PRIVILEGES	7
-db	22
-ENGINES	6
-event	18
-EVENTS	21
-FILES	38
+db	20
 func	4
-general_log	6
-GLOBAL_STATUS	2
-GLOBAL_VARIABLES	2
 help_category	4
 help_keyword	2
 help_relation	2
 help_topic	6
-host	20
+host	19
 KEY_COLUMN_USAGE	12
-ndb_binlog_index	7
-PARTITIONS	25
-plugin	2
-PLUGINS	10
 proc	16
-PROCESSLIST	8
 procs_priv	8
-REFERENTIAL_CONSTRAINTS	11
 ROUTINES	20
 SCHEMATA	5
 SCHEMA_PRIVILEGES	5
-servers	9
-SESSION_STATUS	2
-SESSION_VARIABLES	2
-slow_log	11
 STATISTICS	15
 t1	6
 t10	6
@@ -3623,7 +2910,7 @@ time_zone_name	2
 time_zone_transition	3
 time_zone_transition_type	5
 TRIGGERS	19
-user	39
+user	37
 USER_PRIVILEGES	4
 v1	21
 VIEWS	8
@@ -3637,7 +2924,7 @@ CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_P
 NULL	information_schema	utf8	utf8_general_ci	NULL
 SELECT * FROM tables                                LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
 SELECT * FROM columns                               LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3682,7 +2969,7 @@ TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATA
 SELECT * FROM parameters LIMIT 1;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT * FROM referential_constraints LIMIT 1;
-CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	UNIQUE_CONSTRAINT_CATALOG	UNIQUE_CONSTRAINT_SCHEMA	UNIQUE_CONSTRAINT_NAME	MATCH_OPTION	UPDATE_RULE	DELETE_RULE	TABLE_NAME	REFERENCED_TABLE_NAME
+ERROR 42S02: Unknown table 'referential_constraints' in information_schema
 use db_datadict;
 select * from schemata;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
@@ -3772,7 +3059,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3793,7 +3080,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3814,7 +3101,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3835,7 +3122,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3856,7 +3143,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3874,199 +3161,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	ENGINES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	EVENTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	FILES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PARTITIONS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PLUGINS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PROCESSLIST
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	REFERENTIAL_CONSTRAINTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4087,7 +3185,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4108,7 +3206,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4129,7 +3227,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4147,52 +3245,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4213,7 +3269,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4234,7 +3290,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4255,7 +3311,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4276,7 +3332,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4297,7 +3353,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4318,7 +3374,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4443,27 +3499,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	event
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Events
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4485,27 +3520,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	general_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	General log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4611,48 +3625,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	ndb_binlog_index
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	latin1_swedish_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	plugin
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_bin
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL plugins
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4695,48 +3667,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	servers
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL Foreign Servers table
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	slow_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Slow log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -5202,8 +4132,6 @@ t.table_type, t.engine
 from information_schema.schemata s inner join information_schema.tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
-NULL	db_datadict	latin1	BASE TABLE	CSV
-NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
@@ -5236,10 +4164,6 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -5252,17 +4176,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -5270,8 +4183,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
-NULL	information_schema	utf8	BASE TABLE	CSV
-NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
@@ -5304,10 +4215,6 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -5320,17 +4227,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -5338,8 +4234,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
-NULL	mysql	latin1	BASE TABLE	CSV
-NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
@@ -5372,10 +4266,6 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -5388,17 +4278,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -5406,8 +4285,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
-NULL	test	latin1	BASE TABLE	CSV
-NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
@@ -5440,10 +4317,6 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -5456,17 +4329,6 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -5474,8 +4336,6 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
-NULL	test1	latin1	BASE TABLE	CSV
-NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
@@ -5508,10 +4368,6 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -5524,17 +4380,6 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -5542,8 +4387,6 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
-NULL	test4	latin1	BASE TABLE	CSV
-NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
@@ -5576,10 +4419,6 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -5592,17 +4431,6 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -5677,9 +4505,9 @@ select * from information_schema.table_constraints limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
+NULL	mysql	name	mysql	help_category	UNIQUE
 select * from information_schema.key_column_usage limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Host	1	NULL	NULL	NULL	NULL
@@ -5689,7 +4517,7 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Table_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 select count(*) as max_recs from information_schema.key_column_usage limit 0, 5;
 max_recs
-45
+40
 
 root: check with db name
 ------------------------
@@ -5698,34 +4526,34 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-68
+51
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-827
+642
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
 SELECT COUNT(*) FROM information_schema. collations                            ;
 COUNT(*)
-127
+126
 SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ;
 COUNT(*)
-128
+126
 SELECT COUNT(*) FROM information_schema. routines                              ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM information_schema. statistics                            ;
 COUNT(*)
-48
+43
 SELECT COUNT(*) FROM information_schema. views                                 ;
 COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-81
+75
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
-32
+28
 SELECT COUNT(*) FROM information_schema. table_privileges                      ;
 COUNT(*)
 0
@@ -5734,18 +4562,17 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. table_constraints                     ;
 COUNT(*)
-24
+20
 SELECT COUNT(*) FROM information_schema. key_column_usage                      ;
 COUNT(*)
-45
+40
 SELECT COUNT(*) FROM information_schema. triggers                              ;
 COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. parameters ;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT COUNT(*) FROM information_schema. referential_constraints ;
-COUNT(*)
-0
+ERROR 42S02: Unknown table 'referential_constraints' in information_schema
 USE db_datadict;
 DROP VIEW v1, vu1, vu;
 DROP PROCEDURE db_datadict.sp_1;
@@ -5763,10 +4590,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-65
+48
 select count(*) as the_cols from columns;
 the_cols
-802
+617
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -5804,21 +4631,10 @@ information_schema, COLLATIONS
 information_schema, COLLATION_CHARACTER_SET_APPLICABILITY
 information_schema, COLUMNS
 information_schema, COLUMN_PRIVILEGES
-information_schema, ENGINES
-information_schema, EVENTS
-information_schema, FILES
-information_schema, GLOBAL_STATUS
-information_schema, GLOBAL_VARIABLES
 information_schema, KEY_COLUMN_USAGE
-information_schema, PARTITIONS
-information_schema, PLUGINS
-information_schema, PROCESSLIST
-information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
 information_schema, SCHEMA_PRIVILEGES
-information_schema, SESSION_STATUS
-information_schema, SESSION_VARIABLES
 information_schema, STATISTICS
 information_schema, TABLES
 information_schema, TABLE_CONSTRAINTS
@@ -5828,20 +4644,14 @@ information_schema, USER_PRIVILEGES
 information_schema, VIEWS
 mysql, columns_priv
 mysql, db
-mysql, event
 mysql, func
-mysql, general_log
 mysql, help_category
 mysql, help_keyword
 mysql, help_relation
 mysql, help_topic
 mysql, host
-mysql, ndb_binlog_index
-mysql, plugin
 mysql, proc
 mysql, procs_priv
-mysql, servers
-mysql, slow_log
 mysql, tables_priv
 mysql, time_zone
 mysql, time_zone_leap_second
@@ -5887,7 +4697,7 @@ NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
 select sum(ordinal_position) from key_column_usage;
 sum(ordinal_position)
-83
+77
 select * from schemata limit 0,5;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
 NULL	information_schema	utf8	utf8_general_ci	NULL
@@ -5934,8 +4744,6 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
-'root'@'127.0.0.1'
-'root'@'127.0.0.1'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -5961,10 +4769,6 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
-'root'@'<SERVER_NAME>'
-'root'@'<SERVER_NAME>'
-'root'@'localhost'
-'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
@@ -7473,7 +6277,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7489,7 +6292,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7500,7 +6302,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7516,7 +6317,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7527,7 +6327,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7543,7 +6342,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7624,7 +6422,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7640,7 +6437,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7651,7 +6447,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7667,7 +6462,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7678,7 +6472,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7694,7 +6487,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
@@ -7761,7 +6553,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7777,7 +6568,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7788,7 +6578,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7804,7 +6593,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7815,7 +6603,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7831,7 +6618,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7910,7 +6696,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7926,7 +6711,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7937,7 +6721,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7953,7 +6736,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7964,7 +6746,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7980,7 +6761,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -8055,7 +6835,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -8071,7 +6850,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -8082,7 +6860,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -8098,7 +6875,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -8109,7 +6885,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -8125,7 +6900,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -8213,7 +6987,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -8229,7 +7002,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -8240,7 +7012,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -8256,7 +7027,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -8267,7 +7037,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -8283,7 +7052,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
@@ -8349,7 +7117,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -8365,7 +7132,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -8376,7 +7142,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -8392,7 +7157,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -8403,7 +7167,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -8419,7 +7182,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -8461,21 +7223,10 @@ information_schema	COLLATIONS	MEMORY
 information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	MEMORY
 information_schema	COLUMNS	MyISAM
 information_schema	COLUMN_PRIVILEGES	MEMORY
-information_schema	ENGINES	MEMORY
-information_schema	EVENTS	MyISAM
-information_schema	FILES	MEMORY
-information_schema	GLOBAL_STATUS	MEMORY
-information_schema	GLOBAL_VARIABLES	MyISAM
 information_schema	KEY_COLUMN_USAGE	MEMORY
-information_schema	PARTITIONS	MyISAM
-information_schema	PLUGINS	MyISAM
-information_schema	PROCESSLIST	MyISAM
-information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
 information_schema	SCHEMA_PRIVILEGES	MEMORY
-information_schema	SESSION_STATUS	MEMORY
-information_schema	SESSION_VARIABLES	MyISAM
 information_schema	STATISTICS	MEMORY
 information_schema	TABLES	MEMORY
 information_schema	TABLE_CONSTRAINTS	MEMORY
@@ -8504,21 +7255,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -8545,21 +7285,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -8623,7 +7352,6 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
-filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -8638,7 +7366,6 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
-cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -8729,21 +7456,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -8782,14 +7498,14 @@ COLUMNS	TABLE_CATALOG	varchar(4096)
 COLUMNS	TABLE_SCHEMA	varchar(64)
 COLUMNS	TABLE_NAME	varchar(64)
 COLUMNS	COLUMN_NAME	varchar(64)
-COLUMNS	ORDINAL_POSITION	bigint(21) unsigned
+COLUMNS	ORDINAL_POSITION	bigint(21)
 COLUMNS	COLUMN_DEFAULT	longtext
 COLUMNS	IS_NULLABLE	varchar(3)
 COLUMNS	DATA_TYPE	varchar(64)
-COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned
-COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21) unsigned
-COLUMNS	NUMERIC_PRECISION	bigint(21) unsigned
-COLUMNS	NUMERIC_SCALE	bigint(21) unsigned
+COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21)
+COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21)
+COLUMNS	NUMERIC_PRECISION	bigint(21)
+COLUMNS	NUMERIC_SCALE	bigint(21)
 COLUMNS	CHARACTER_SET_NAME	varchar(64)
 COLUMNS	COLLATION_NAME	varchar(64)
 COLUMNS	COLUMN_TYPE	longtext
@@ -8804,75 +7520,6 @@ COLUMN_PRIVILEGES	TABLE_NAME	varchar(64)
 COLUMN_PRIVILEGES	COLUMN_NAME	varchar(64)
 COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 COLUMN_PRIVILEGES	IS_GRANTABLE	varchar(3)
-ENGINES	ENGINE	varchar(64)
-ENGINES	SUPPORT	varchar(8)
-ENGINES	COMMENT	varchar(80)
-ENGINES	TRANSACTIONS	varchar(3)
-ENGINES	XA	varchar(3)
-ENGINES	SAVEPOINTS	varchar(3)
-EVENTS	EVENT_CATALOG	varchar(64)
-EVENTS	EVENT_SCHEMA	varchar(64)
-EVENTS	EVENT_NAME	varchar(64)
-EVENTS	DEFINER	varchar(77)
-EVENTS	TIME_ZONE	varchar(64)
-EVENTS	EVENT_BODY	varchar(8)
-EVENTS	EVENT_DEFINITION	longtext
-EVENTS	EVENT_TYPE	varchar(9)
-EVENTS	EXECUTE_AT	datetime
-EVENTS	INTERVAL_VALUE	varchar(256)
-EVENTS	INTERVAL_FIELD	varchar(18)
-EVENTS	SQL_MODE	longtext
-EVENTS	STARTS	datetime
-EVENTS	ENDS	datetime
-EVENTS	STATUS	varchar(18)
-EVENTS	ON_COMPLETION	varchar(12)
-EVENTS	CREATED	datetime
-EVENTS	LAST_ALTERED	datetime
-EVENTS	LAST_EXECUTED	datetime
-EVENTS	EVENT_COMMENT	varchar(64)
-EVENTS	ORIGINATOR	bigint(10)
-FILES	FILE_ID	bigint(4)
-FILES	FILE_NAME	varchar(64)
-FILES	FILE_TYPE	varchar(20)
-FILES	TABLESPACE_NAME	varchar(64)
-FILES	TABLE_CATALOG	varchar(64)
-FILES	TABLE_SCHEMA	varchar(64)
-FILES	TABLE_NAME	varchar(64)
-FILES	LOGFILE_GROUP_NAME	varchar(64)
-FILES	LOGFILE_GROUP_NUMBER	bigint(4)
-FILES	ENGINE	varchar(64)
-FILES	FULLTEXT_KEYS	varchar(64)
-FILES	DELETED_ROWS	bigint(4)
-FILES	UPDATE_COUNT	bigint(4)
-FILES	FREE_EXTENTS	bigint(4)
-FILES	TOTAL_EXTENTS	bigint(4)
-FILES	EXTENT_SIZE	bigint(4)
-FILES	INITIAL_SIZE	bigint(21) unsigned
-FILES	MAXIMUM_SIZE	bigint(21) unsigned
-FILES	AUTOEXTEND_SIZE	bigint(21) unsigned
-FILES	CREATION_TIME	datetime
-FILES	LAST_UPDATE_TIME	datetime
-FILES	LAST_ACCESS_TIME	datetime
-FILES	RECOVER_TIME	bigint(4)
-FILES	TRANSACTION_COUNTER	bigint(4)
-FILES	VERSION	bigint(21) unsigned
-FILES	ROW_FORMAT	varchar(10)
-FILES	TABLE_ROWS	bigint(21) unsigned
-FILES	AVG_ROW_LENGTH	bigint(21) unsigned
-FILES	DATA_LENGTH	bigint(21) unsigned
-FILES	MAX_DATA_LENGTH	bigint(21) unsigned
-FILES	INDEX_LENGTH	bigint(21) unsigned
-FILES	DATA_FREE	bigint(21) unsigned
-FILES	CREATE_TIME	datetime
-FILES	UPDATE_TIME	datetime
-FILES	CHECK_TIME	datetime
-FILES	CHECKSUM	bigint(21) unsigned
-FILES	STATUS	varchar(20)
-FILES	EXTRA	varchar(255)
-GLOBAL_STATUS	VARIABLE_NAME	varchar(64)
-GLOBAL_STATUS	VARIABLE_VALUE	decimal(22,7)
-GLOBAL_VARIABLES	VARIABLE_NAME	varchar(64)
-GLOBAL_VARIABLES	VARIABLE_VALUE	longtext
 KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar(4096)
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar(64)
@@ -8885,60 +7532,6 @@ KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar(64)
-PARTITIONS	TABLE_CATALOG	varchar(4096)
-PARTITIONS	TABLE_SCHEMA	varchar(64)
-PARTITIONS	TABLE_NAME	varchar(64)
-PARTITIONS	PARTITION_NAME	varchar(64)
-PARTITIONS	SUBPARTITION_NAME	varchar(64)
-PARTITIONS	PARTITION_ORDINAL_POSITION	bigint(21) unsigned
-PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint(21) unsigned
-PARTITIONS	PARTITION_METHOD	varchar(12)
-PARTITIONS	SUBPARTITION_METHOD	varchar(12)
-PARTITIONS	PARTITION_EXPRESSION	longtext
-PARTITIONS	SUBPARTITION_EXPRESSION	longtext
-PARTITIONS	PARTITION_DESCRIPTION	longtext
-PARTITIONS	TABLE_ROWS	bigint(21) unsigned
-PARTITIONS	AVG_ROW_LENGTH	bigint(21) unsigned
-PARTITIONS	DATA_LENGTH	bigint(21) unsigned
-PARTITIONS	MAX_DATA_LENGTH	bigint(21) unsigned
-PARTITIONS	INDEX_LENGTH	bigint(21) unsigned
-PARTITIONS	DATA_FREE	bigint(21) unsigned
-PARTITIONS	CREATE_TIME	datetime
-PARTITIONS	UPDATE_TIME	datetime
-PARTITIONS	CHECK_TIME	datetime
-PARTITIONS	CHECKSUM	bigint(21) unsigned
-PARTITIONS	PARTITION_COMMENT	varchar(80)
-PARTITIONS	NODEGROUP	varchar(12)
-PARTITIONS	TABLESPACE_NAME	varchar(64)
-PLUGINS	PLUGIN_NAME	varchar(64)
-PLUGINS	PLUGIN_VERSION	varchar(20)
-PLUGINS	PLUGIN_STATUS	varchar(10)
-PLUGINS	PLUGIN_TYPE	varchar(80)
-PLUGINS	PLUGIN_TYPE_VERSION	varchar(20)
-PLUGINS	PLUGIN_LIBRARY	varchar(64)
-PLUGINS	PLUGIN_LIBRARY_VERSION	varchar(20)
-PLUGINS	PLUGIN_AUTHOR	varchar(64)
-PLUGINS	PLUGIN_DESCRIPTION	longtext
-PLUGINS	PLUGIN_LICENSE	varchar(80)
-PROCESSLIST	ID	bigint(4)
-PROCESSLIST	USER	varchar(16)
-PROCESSLIST	HOST	varchar(64)
-PROCESSLIST	DB	varchar(64)
-PROCESSLIST	COMMAND	varchar(16)
-PROCESSLIST	TIME	bigint(7)
-PROCESSLIST	STATE	varchar(64)
-PROCESSLIST	INFO	longtext
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar(4096)
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar(64)
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar(64)
-REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar(64)
-REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar(64)
-REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar(64)
-REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar(64)
-REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar(64)
 ROUTINES	SPECIFIC_NAME	varchar(64)
 ROUTINES	ROUTINE_CATALOG	varchar(4096)
 ROUTINES	ROUTINE_SCHEMA	varchar(64)
@@ -8969,10 +7562,6 @@ SCHEMA_PRIVILEGES	TABLE_CATALOG	varchar(4096)
 SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar(64)
 SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar(3)
-SESSION_STATUS	VARIABLE_NAME	varchar(64)
-SESSION_STATUS	VARIABLE_VALUE	decimal(22,7)
-SESSION_VARIABLES	VARIABLE_NAME	varchar(64)
-SESSION_VARIABLES	VARIABLE_VALUE	longtext
 STATISTICS	TABLE_CATALOG	varchar(4096)
 STATISTICS	TABLE_SCHEMA	varchar(64)
 STATISTICS	TABLE_NAME	varchar(64)
@@ -8993,20 +7582,20 @@ TABLES	TABLE_SCHEMA	varchar(64)
 TABLES	TABLE_NAME	varchar(64)
 TABLES	TABLE_TYPE	varchar(64)
 TABLES	ENGINE	varchar(64)
-TABLES	VERSION	bigint(21) unsigned
+TABLES	VERSION	bigint(21)
 TABLES	ROW_FORMAT	varchar(10)
-TABLES	TABLE_ROWS	bigint(21) unsigned
-TABLES	AVG_ROW_LENGTH	bigint(21) unsigned
-TABLES	DATA_LENGTH	bigint(21) unsigned
-TABLES	MAX_DATA_LENGTH	bigint(21) unsigned
-TABLES	INDEX_LENGTH	bigint(21) unsigned
-TABLES	DATA_FREE	bigint(21) unsigned
-TABLES	AUTO_INCREMENT	bigint(21) unsigned
+TABLES	TABLE_ROWS	bigint(21)
+TABLES	AVG_ROW_LENGTH	bigint(21)
+TABLES	DATA_LENGTH	bigint(21)
+TABLES	MAX_DATA_LENGTH	bigint(21)
+TABLES	INDEX_LENGTH	bigint(21)
+TABLES	DATA_FREE	bigint(21)
+TABLES	AUTO_INCREMENT	bigint(21)
 TABLES	CREATE_TIME	datetime
 TABLES	UPDATE_TIME	datetime
 TABLES	CHECK_TIME	datetime
 TABLES	TABLE_COLLATION	varchar(64)
-TABLES	CHECKSUM	bigint(21) unsigned
+TABLES	CHECKSUM	bigint(21)
 TABLES	CREATE_OPTIONS	varchar(255)
 TABLES	TABLE_COMMENT	varchar(80)
 TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
@@ -9393,7 +7982,6 @@ cp1250_general_ci
 cp1250_czech_cs
 cp1250_croatian_ci
 cp1250_bin
-cp1250_polish_ci
 gbk_chinese_ci
 gbk_bin
 latin5_turkish_ci
@@ -9601,10 +8189,10 @@ MAXLEN	bigint(3)	NO		0
 SHOW CREATE TABLE character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
-  `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
+  `DESCRIPTION` varchar(60) NOT NULL default '',
+  `MAXLEN` bigint(3) NOT NULL default '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -9682,12 +8270,12 @@ SORTLEN	bigint(3)	NO		0
 SHOW CREATE TABLE collations;
 Table	Create Table
 COLLATIONS	CREATE TEMPORARY TABLE `COLLATIONS` (
-  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ID` bigint(11) NOT NULL DEFAULT '0',
-  `IS_DEFAULT` varchar(3) NOT NULL DEFAULT '',
-  `IS_COMPILED` varchar(3) NOT NULL DEFAULT '',
-  `SORTLEN` bigint(3) NOT NULL DEFAULT '0'
+  `COLLATION_NAME` varchar(64) NOT NULL default '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `ID` bigint(11) NOT NULL default '0',
+  `IS_DEFAULT` varchar(3) NOT NULL default '',
+  `IS_COMPILED` varchar(3) NOT NULL default '',
+  `SORTLEN` bigint(3) NOT NULL default '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -9758,7 +8346,6 @@ cp1250_general_ci	cp1250	26	Yes	Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_bin	cp1250	66		Yes	1
-cp1250_polish_ci	cp1250	99		Yes	1
 gbk_chinese_ci	gbk	28	Yes	Yes	1
 gbk_bin	gbk	87		Yes	1
 latin5_turkish_ci	latin5	30	Yes		0
@@ -9852,8 +8439,8 @@ CHARACTER_SET_NAME	varchar(64)	NO
 SHOW CREATE TABLE collation_character_set_applicability;
 Table	Create Table
 COLLATION_CHARACTER_SET_APPLICABILITY	CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
-  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT ''
+  `COLLATION_NAME` varchar(64) NOT NULL default '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -9906,7 +8493,6 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
-filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -9921,7 +8507,6 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
-cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -10020,13 +8605,13 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE column_privileges;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -10132,8 +8717,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_3'@'localhost'	NULL	db_datadict	SHOW VIEW	NO
 'user_3'@'localhost'	NULL	db_datadict	CREATE ROUTINE	NO
 'user_3'@'localhost'	NULL	db_datadict	ALTER ROUTINE	NO
-'user_3'@'localhost'	NULL	db_datadict	EVENT	NO
-'user_3'@'localhost'	NULL	db_datadict	TRIGGER	NO
 SELECT * FROM information_schema.column_privileges
 WHERE grantee LIKE "'user%"
  ORDER BY grantee, table_name, column_name, privilege_type;
@@ -10174,14 +8757,14 @@ TABLE_CATALOG	varchar(4096)	YES		NULL
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
 COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(21) unsigned	NO		0	
+ORDINAL_POSITION	bigint(21)	NO		0	
 COLUMN_DEFAULT	longtext	YES		NULL	
 IS_NULLABLE	varchar(3)	NO			
 DATA_TYPE	varchar(64)	NO			
-CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL	
-CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
-NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
-NUMERIC_SCALE	bigint(21) unsigned	YES		NULL	
+CHARACTER_MAXIMUM_LENGTH	bigint(21)	YES		NULL	
+CHARACTER_OCTET_LENGTH	bigint(21)	YES		NULL	
+NUMERIC_PRECISION	bigint(21)	YES		NULL	
+NUMERIC_SCALE	bigint(21)	YES		NULL	
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 COLUMN_TYPE	longtext	NO			
@@ -10192,25 +8775,25 @@ COLUMN_COMMENT	varchar(255)	NO
 SHOW CREATE TABLE columns;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ORDINAL_POSITION` bigint(21) unsigned NOT NULL DEFAULT '0',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `ORDINAL_POSITION` bigint(21) NOT NULL default '0',
   `COLUMN_DEFAULT` longtext,
-  `IS_NULLABLE` varchar(3) NOT NULL DEFAULT '',
-  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
-  `NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
-  `COLLATION_NAME` varchar(64) DEFAULT NULL,
+  `IS_NULLABLE` varchar(3) NOT NULL default '',
+  `DATA_TYPE` varchar(64) NOT NULL default '',
+  `CHARACTER_MAXIMUM_LENGTH` bigint(21) default NULL,
+  `CHARACTER_OCTET_LENGTH` bigint(21) default NULL,
+  `NUMERIC_PRECISION` bigint(21) default NULL,
+  `NUMERIC_SCALE` bigint(21) default NULL,
+  `CHARACTER_SET_NAME` varchar(64) default NULL,
+  `COLLATION_NAME` varchar(64) default NULL,
   `COLUMN_TYPE` longtext NOT NULL,
-  `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
-  `EXTRA` varchar(20) NOT NULL DEFAULT '',
-  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
-  `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
+  `COLUMN_KEY` varchar(3) NOT NULL default '',
+  `EXTRA` varchar(20) NOT NULL default '',
+  `PRIVILEGES` varchar(80) NOT NULL default '',
+  `COLUMN_COMMENT` varchar(255) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -10227,14 +8810,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -10282,14 +8865,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -10304,75 +8887,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10385,60 +8899,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10469,10 +8929,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10493,20 +8949,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10579,36 +9035,10 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
-NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
-NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
-NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
-NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
-NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
-NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
-NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
-NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
-NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -10642,16 +9072,6 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
-NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -10676,33 +9096,13 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
-NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
-NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -10747,16 +9147,14 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -11090,14 +9488,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -11112,75 +9510,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11193,60 +9522,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11277,10 +9552,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11301,20 +9572,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -11636,14 +9907,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -11658,75 +9929,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11739,60 +9941,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11823,10 +9971,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11847,20 +9991,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -12183,9 +10327,7 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	enum	latin1	latin1_swedish_ci
 1.0000	set	latin1	latin1_swedish_ci
 1.0000	text	latin1	latin1_swedish_ci
-1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	longtext	utf8	utf8_general_ci
-1.0000	mediumtext	utf8	utf8_general_ci
 1.0000	text	utf8	utf8_general_ci
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
@@ -12270,14 +10412,14 @@ NULL	information_schema	COLLATIONS	SORTLEN	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	COLUMNS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21)
 1.0000	information_schema	COLUMNS	COLUMN_DEFAULT	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	COLUMNS	IS_NULLABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	COLUMNS	DATA_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	COLUMNS	CHARACTER_SET_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLLATION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	COLUMNS	COLUMN_TYPE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
@@ -12292,75 +10434,6 @@ NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(
 3.0000	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	ENGINES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	ENGINES	SUPPORT	varchar	8	24	utf8	utf8_general_ci	varchar(8)
-3.0000	information_schema	ENGINES	COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-3.0000	information_schema	ENGINES	TRANSACTIONS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	ENGINES	XA	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	ENGINES	SAVEPOINTS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	EVENTS	EVENT_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	EVENT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	EVENT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)
-3.0000	information_schema	EVENTS	TIME_ZONE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	EVENT_BODY	varchar	8	24	utf8	utf8_general_ci	varchar(8)
-1.0000	information_schema	EVENTS	EVENT_DEFINITION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-3.0000	information_schema	EVENTS	EVENT_TYPE	varchar	9	27	utf8	utf8_general_ci	varchar(9)
-NULL	information_schema	EVENTS	EXECUTE_AT	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	information_schema	EVENTS	INTERVAL_VALUE	varchar	256	768	utf8	utf8_general_ci	varchar(256)
-3.0000	information_schema	EVENTS	INTERVAL_FIELD	varchar	18	54	utf8	utf8_general_ci	varchar(18)
-1.0000	information_schema	EVENTS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-NULL	information_schema	EVENTS	STARTS	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	EVENTS	ENDS	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	information_schema	EVENTS	STATUS	varchar	18	54	utf8	utf8_general_ci	varchar(18)
-3.0000	information_schema	EVENTS	ON_COMPLETION	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-NULL	information_schema	EVENTS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	EVENTS	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	EVENTS	LAST_EXECUTED	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	information_schema	EVENTS	EVENT_COMMENT	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	EVENTS	ORIGINATOR	bigint	NULL	NULL	NULL	NULL	bigint(10)
-NULL	information_schema	FILES	FILE_ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	FILES	FILE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	FILE_TYPE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	FILES	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	TABLE_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	LOGFILE_GROUP_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	FILES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	FULLTEXT_KEYS	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	FILES	DELETED_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	UPDATE_COUNT	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	FREE_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	TOTAL_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	EXTENT_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	INITIAL_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	MAXIMUM_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	CREATION_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	LAST_UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	LAST_ACCESS_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	RECOVER_TIME	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	TRANSACTION_COUNTER	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	FILES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-NULL	information_schema	FILES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	FILES	STATUS	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	FILES	EXTRA	varchar	255	765	utf8	utf8_general_ci	varchar(255)
-3.0000	information_schema	GLOBAL_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
-3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -12373,60 +10446,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint	NU
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-3.0000	information_schema	PARTITIONS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	PARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	SUBPARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	PARTITIONS	PARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-3.0000	information_schema	PARTITIONS	SUBPARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-1.0000	information_schema	PARTITIONS	PARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-1.0000	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-1.0000	information_schema	PARTITIONS	PARTITION_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-NULL	information_schema	PARTITIONS	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	PARTITIONS	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	PARTITIONS	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	PARTITIONS	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	PARTITIONS	PARTITION_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-3.0000	information_schema	PARTITIONS	NODEGROUP	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-3.0000	information_schema	PARTITIONS	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PLUGINS	PLUGIN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PLUGINS	PLUGIN_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	PLUGINS	PLUGIN_STATUS	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-3.0000	information_schema	PLUGINS	PLUGIN_TYPE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-3.0000	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	PLUGINS	PLUGIN_AUTHOR	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	PLUGINS	PLUGIN_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-3.0000	information_schema	PLUGINS	PLUGIN_LICENSE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	PROCESSLIST	USER	varchar	16	48	utf8	utf8_general_ci	varchar(16)
-3.0000	information_schema	PROCESSLIST	HOST	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PROCESSLIST	DB	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PROCESSLIST	COMMAND	varchar	16	48	utf8	utf8_general_ci	varchar(16)
-NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
-3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	SPECIFIC_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	ROUTINE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -12457,10 +10476,6 @@ NULL	information_schema	ROUTINES	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datet
 3.0000	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	SESSION_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
-3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -12481,20 +10496,20 @@ NULL	information_schema	STATISTICS	SUB_PART	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	TABLES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	TABLE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	TABLES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
 NULL	information_schema	TABLES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 3.0000	information_schema	TABLES	TABLE_COLLATION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	TABLES	CREATE_OPTIONS	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 3.0000	information_schema	TABLES	TABLE_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
 3.0000	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
@@ -12567,36 +10582,10 @@ NULL	mysql	columns_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	db	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	db	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	db	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	event	db	char	64	192	utf8	utf8_bin	char(64)
-3.0000	mysql	event	name	char	64	192	utf8	utf8_general_ci	char(64)
-1.0000	mysql	event	body	longblob	4294967295	4294967295	NULL	NULL	longblob
-3.0000	mysql	event	definer	char	77	231	utf8	utf8_bin	char(77)
-NULL	mysql	event	execute_at	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	event	interval_value	int	NULL	NULL	NULL	NULL	int(11)
-3.0000	mysql	event	interval_field	enum	18	54	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')
-NULL	mysql	event	created	timestamp	NULL	NULL	NULL	NULL	timestamp
-NULL	mysql	event	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
-NULL	mysql	event	last_executed	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	event	starts	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	event	ends	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	mysql	event	status	enum	18	54	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')
-3.0000	mysql	event	on_completion	enum	8	24	utf8	utf8_general_ci	enum('DROP','PRESERVE')
-3.0000	mysql	event	sql_mode	set	431	1293	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')
-3.0000	mysql	event	comment	char	64	192	utf8	utf8_bin	char(64)
-NULL	mysql	event	originator	int	NULL	NULL	NULL	NULL	int(10)
-1.0000	mysql	event	time_zone	char	64	64	latin1	latin1_swedish_ci	char(64)
 3.0000	mysql	func	name	char	64	192	utf8	utf8_bin	char(64)
 NULL	mysql	func	ret	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 3.0000	mysql	func	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	func	type	enum	9	27	utf8	utf8_general_ci	enum('function','aggregate')
-NULL	mysql	general_log	event_time	timestamp	NULL	NULL	NULL	NULL	timestamp
-1.0000	mysql	general_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
-NULL	mysql	general_log	thread_id	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	general_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
-3.0000	mysql	general_log	command_type	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	mysql	general_log	argument	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_category	parent_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
@@ -12630,16 +10619,6 @@ NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5)
 3.0000	mysql	host	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	host	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-NULL	mysql	ndb_binlog_index	Position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-1.0000	mysql	ndb_binlog_index	File	varchar	255	255	latin1	latin1_swedish_ci	varchar(255)
-NULL	mysql	ndb_binlog_index	epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	inserts	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	updates	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	deletes	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	schemaops	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-3.0000	mysql	plugin	name	char	64	192	utf8	utf8_bin	char(64)
-3.0000	mysql	plugin	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	proc	db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	proc	name	char	64	192	utf8	utf8_general_ci	char(64)
 3.0000	mysql	proc	type	enum	9	27	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')
@@ -12664,33 +10643,13 @@ NULL	mysql	proc	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	procs_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 3.0000	mysql	procs_priv	Proc_priv	set	27	81	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')
 NULL	mysql	procs_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	servers	Server_name	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Host	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Db	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Username	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Password	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	servers	Port	int	NULL	NULL	NULL	NULL	int(4)
-3.0000	mysql	servers	Socket	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Wrapper	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Owner	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	slow_log	start_time	timestamp	NULL	NULL	NULL	NULL	timestamp
-1.0000	mysql	slow_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
-NULL	mysql	slow_log	query_time	time	NULL	NULL	NULL	NULL	time
-NULL	mysql	slow_log	lock_time	time	NULL	NULL	NULL	NULL	time
-NULL	mysql	slow_log	rows_sent	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	slow_log	rows_examined	int	NULL	NULL	NULL	NULL	int(11)
-3.0000	mysql	slow_log	db	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-NULL	mysql	slow_log	last_insert_id	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	slow_log	insert_id	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	slow_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
-1.0000	mysql	slow_log	sql_text	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 3.0000	mysql	tables_priv	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	tables_priv	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	User	char	16	48	utf8	utf8_bin	char(16)
 3.0000	mysql	tables_priv	Table_name	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 NULL	mysql	tables_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	tables_priv	Table_priv	set	98	294	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')
+3.0000	mysql	tables_priv	Table_priv	set	90	270	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')
 3.0000	mysql	tables_priv	Column_priv	set	31	93	utf8	utf8_general_ci	set('Select','Insert','Update','References')
 NULL	mysql	time_zone	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	time_zone	Use_leap_seconds	enum	1	3	utf8	utf8_general_ci	enum('Y','N')
@@ -12735,8 +10694,6 @@ NULL	mysql	time_zone_transition_type	Is_DST	tinyint	NULL	NULL	NULL	NULL	tinyint(
 3.0000	mysql	user	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Create_user_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	user	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	user	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	ssl_type	enum	9	27	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')
 1.0000	mysql	user	ssl_cipher	blob	65535	65535	NULL	NULL	blob
 1.0000	mysql	user	x509_issuer	blob	65535	65535	NULL	NULL	blob
@@ -13082,18 +11039,18 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE key_column_usage;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT '0',
-  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL,
-  `REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL,
-  `REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL,
-  `REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL
+  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `ORDINAL_POSITION` bigint(10) NOT NULL default '0',
+  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) default NULL,
+  `REFERENCED_TABLE_SCHEMA` varchar(64) default NULL,
+  `REFERENCED_TABLE_NAME` varchar(64) default NULL,
+  `REFERENCED_COLUMN_NAME` varchar(64) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13154,8 +11111,6 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_keyword	help_keyword_id	1	NULL	NULL	NULL	NULL
@@ -13164,8 +11119,6 @@ NULL	mysql	PRIMARY	NULL	mysql	help_relation	help_topic_id	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -13174,7 +11127,6 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -13236,26 +11188,26 @@ DEFINER	varchar(77)	NO
 SHOW CREATE TABLE routines;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_CATALOG` varchar(4096) DEFAULT NULL,
-  `ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT '',
-  `DTD_IDENTIFIER` varchar(64) DEFAULT NULL,
-  `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
+  `SPECIFIC_NAME` varchar(64) NOT NULL default '',
+  `ROUTINE_CATALOG` varchar(4096) default NULL,
+  `ROUTINE_SCHEMA` varchar(64) NOT NULL default '',
+  `ROUTINE_NAME` varchar(64) NOT NULL default '',
+  `ROUTINE_TYPE` varchar(9) NOT NULL default '',
+  `DTD_IDENTIFIER` varchar(64) default NULL,
+  `ROUTINE_BODY` varchar(8) NOT NULL default '',
   `ROUTINE_DEFINITION` longtext,
-  `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
-  `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
-  `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
-  `IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
-  `SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(64) DEFAULT NULL,
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
-  `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `EXTERNAL_NAME` varchar(64) default NULL,
+  `EXTERNAL_LANGUAGE` varchar(64) default NULL,
+  `PARAMETER_STYLE` varchar(8) NOT NULL default '',
+  `IS_DETERMINISTIC` varchar(3) NOT NULL default '',
+  `SQL_DATA_ACCESS` varchar(64) NOT NULL default '',
+  `SQL_PATH` varchar(64) default NULL,
+  `SECURITY_TYPE` varchar(7) NOT NULL default '',
+  `CREATED` datetime NOT NULL default '0000-00-00 00:00:00',
+  `LAST_ALTERED` datetime NOT NULL default '0000-00-00 00:00:00',
   `SQL_MODE` longtext NOT NULL,
-  `ROUTINE_COMMENT` varchar(64) NOT NULL DEFAULT '',
-  `DEFINER` varchar(77) NOT NULL DEFAULT ''
+  `ROUTINE_COMMENT` varchar(64) NOT NULL default '',
+  `DEFINER` varchar(77) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13580,11 +11532,11 @@ SQL_PATH	varchar(4096)	YES		NULL
 SHOW CREATE TABLE schemata;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(4096) DEFAULT NULL,
-  `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(4096) DEFAULT NULL
+  `CATALOG_NAME` varchar(4096) default NULL,
+  `SCHEMA_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL default '',
+  `SQL_PATH` varchar(4096) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13663,12 +11615,12 @@ CONSTRAINT_TYPE	varchar(64)	NO
 SHOW CREATE TABLE table_constraints;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_TYPE` varchar(64) NOT NULL DEFAULT ''
+  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `CONSTRAINT_TYPE` varchar(64) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13743,12 +11695,12 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE table_privileges;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13802,7 +11754,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
-'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = USER();
@@ -13812,7 +11763,7 @@ SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = "'user_2'@'localhost'";
 USER()	COUNT(*)
-user_2@localhost	12
+user_2@localhost	11
 connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -13832,7 +11783,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
-'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'user_1'@'localhost'	NULL	db_datadict	tb1	SELECT	NO
 'user_3'@'localhost'	NULL	db_datadict	tb3	SELECT	NO
 	
@@ -13855,46 +11805,46 @@ TABLE_SCHEMA	varchar(64)	NO
 TABLE_NAME	varchar(64)	NO			
 TABLE_TYPE	varchar(64)	NO			
 ENGINE	varchar(64)	YES		NULL	
-VERSION	bigint(21) unsigned	YES		NULL	
+VERSION	bigint(21)	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
-TABLE_ROWS	bigint(21) unsigned	YES		NULL	
-AVG_ROW_LENGTH	bigint(21) unsigned	YES		NULL	
-DATA_LENGTH	bigint(21) unsigned	YES		NULL	
-MAX_DATA_LENGTH	bigint(21) unsigned	YES		NULL	
-INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
-DATA_FREE	bigint(21) unsigned	YES		NULL	
-AUTO_INCREMENT	bigint(21) unsigned	YES		NULL	
+TABLE_ROWS	bigint(21)	YES		NULL	
+AVG_ROW_LENGTH	bigint(21)	YES		NULL	
+DATA_LENGTH	bigint(21)	YES		NULL	
+MAX_DATA_LENGTH	bigint(21)	YES		NULL	
+INDEX_LENGTH	bigint(21)	YES		NULL	
+DATA_FREE	bigint(21)	YES		NULL	
+AUTO_INCREMENT	bigint(21)	YES		NULL	
 CREATE_TIME	datetime	YES		NULL	
 UPDATE_TIME	datetime	YES		NULL	
 CHECK_TIME	datetime	YES		NULL	
 TABLE_COLLATION	varchar(64)	YES		NULL	
-CHECKSUM	bigint(21) unsigned	YES		NULL	
+CHECKSUM	bigint(21)	YES		NULL	
 CREATE_OPTIONS	varchar(255)	YES		NULL	
 TABLE_COMMENT	varchar(80)	NO			
 SHOW CREATE TABLE tables;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `ENGINE` varchar(64) DEFAULT NULL,
-  `VERSION` bigint(21) unsigned DEFAULT NULL,
-  `ROW_FORMAT` varchar(10) DEFAULT NULL,
-  `TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
-  `AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_FREE` bigint(21) unsigned DEFAULT NULL,
-  `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL,
-  `UPDATE_TIME` datetime DEFAULT NULL,
-  `CHECK_TIME` datetime DEFAULT NULL,
-  `TABLE_COLLATION` varchar(64) DEFAULT NULL,
-  `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_OPTIONS` varchar(255) DEFAULT NULL,
-  `TABLE_COMMENT` varchar(80) NOT NULL DEFAULT ''
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `TABLE_TYPE` varchar(64) NOT NULL default '',
+  `ENGINE` varchar(64) default NULL,
+  `VERSION` bigint(21) default NULL,
+  `ROW_FORMAT` varchar(10) default NULL,
+  `TABLE_ROWS` bigint(21) default NULL,
+  `AVG_ROW_LENGTH` bigint(21) default NULL,
+  `DATA_LENGTH` bigint(21) default NULL,
+  `MAX_DATA_LENGTH` bigint(21) default NULL,
+  `INDEX_LENGTH` bigint(21) default NULL,
+  `DATA_FREE` bigint(21) default NULL,
+  `AUTO_INCREMENT` bigint(21) default NULL,
+  `CREATE_TIME` datetime default NULL,
+  `UPDATE_TIME` datetime default NULL,
+  `CHECK_TIME` datetime default NULL,
+  `TABLE_COLLATION` varchar(64) default NULL,
+  `CHECKSUM` bigint(21) default NULL,
+  `CREATE_OPTIONS` varchar(255) default NULL,
+  `TABLE_COMMENT` varchar(80) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13912,20 +11862,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 
@@ -13953,33 +11903,22 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14004,33 +11943,22 @@ connect(localhost,user_2,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14053,33 +11981,22 @@ connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14103,33 +12020,22 @@ root@localhost	db_datadict
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14139,20 +12045,14 @@ NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	N
 NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
 NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Column privileges
 NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Database privileges
-NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Events
 NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		User defined functions
-NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		General log
 NULL	mysql	help_category	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help categories
 NULL	mysql	help_keyword	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help keywords
 NULL	mysql	help_relation	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		keyword-topic relation
 NULL	mysql	help_topic	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help topics
 NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Host privileges;  Merged with database privileges
-NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		MySQL plugins
 NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Stored Procedures
 NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Procedure privileges
-NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		MySQL Foreign Servers table
-NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Slow log
 NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Table privileges
 NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zones
 NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Leap seconds information for time zones
@@ -14200,14 +12100,14 @@ SECURITY_TYPE	varchar(7)	NO
 SHOW CREATE TABLE views;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
   `VIEW_DEFINITION` longtext NOT NULL,
-  `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
-  `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
-  `DEFINER` varchar(77) NOT NULL DEFAULT '',
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT ''
+  `CHECK_OPTION` varchar(8) NOT NULL default '',
+  `IS_UPDATABLE` varchar(3) NOT NULL default '',
+  `DEFINER` varchar(77) NOT NULL default '',
+  `SECURITY_TYPE` varchar(7) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14295,21 +12195,21 @@ COMMENT	varchar(16)	YES		NULL
 SHOW CREATE TABLE statistics;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `NON_UNIQUE` bigint(1) NOT NULL DEFAULT '0',
-  `INDEX_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `INDEX_NAME` varchar(64) NOT NULL DEFAULT '',
-  `SEQ_IN_INDEX` bigint(2) NOT NULL DEFAULT '0',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLLATION` varchar(1) DEFAULT NULL,
-  `CARDINALITY` bigint(21) DEFAULT NULL,
-  `SUB_PART` bigint(3) DEFAULT NULL,
-  `PACKED` varchar(10) DEFAULT NULL,
-  `NULLABLE` varchar(3) NOT NULL DEFAULT '',
-  `INDEX_TYPE` varchar(16) NOT NULL DEFAULT '',
-  `COMMENT` varchar(16) DEFAULT NULL
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `NON_UNIQUE` bigint(1) NOT NULL default '0',
+  `INDEX_SCHEMA` varchar(64) NOT NULL default '',
+  `INDEX_NAME` varchar(64) NOT NULL default '',
+  `SEQ_IN_INDEX` bigint(2) NOT NULL default '0',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `COLLATION` varchar(1) default NULL,
+  `CARDINALITY` bigint(21) default NULL,
+  `SUB_PART` bigint(3) default NULL,
+  `PACKED` varchar(10) default NULL,
+  `NULLABLE` varchar(3) NOT NULL default '',
+  `INDEX_TYPE` varchar(16) NOT NULL default '',
+  `COMMENT` varchar(16) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14387,8 +12287,6 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -14400,8 +12298,6 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
-NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
-NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	0	NULL	NULL		BTREE	
@@ -14411,7 +12307,6 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -14461,11 +12356,11 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE schema_privileges;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14512,8 +12407,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
-''@'%'	NULL	test	EVENT	NO
-''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -14528,8 +12421,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
-''@'%'	NULL	test\_%	EVENT	NO
-''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401502,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -14577,8 +12468,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
-''@'%'	NULL	test	EVENT	NO
-''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -14593,8 +12482,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
-''@'%'	NULL	test\_%	EVENT	NO
-''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401503_1,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -14631,10 +12518,10 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE user_privileges;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14676,10 +12563,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14699,10 +12586,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14714,10 +12601,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -14741,10 +12628,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14761,10 +12648,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14778,10 +12665,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14793,10 +12680,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT SELECT ON *.* TO 'user_1'@'localhost' WITH GRANT OPTION
@@ -14840,10 +12727,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14893,10 +12780,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14908,10 +12795,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -14928,10 +12815,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -14954,10 +12841,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -15014,23 +12901,23 @@ DEFINER	longtext	NO
 SHOW CREATE TABLE triggers;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(4096) DEFAULT NULL,
-  `TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_CATALOG` varchar(4096) DEFAULT NULL,
-  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '',
-  `ACTION_ORDER` bigint(4) NOT NULL DEFAULT '0',
+  `TRIGGER_CATALOG` varchar(4096) default NULL,
+  `TRIGGER_SCHEMA` varchar(64) NOT NULL default '',
+  `TRIGGER_NAME` varchar(64) NOT NULL default '',
+  `EVENT_MANIPULATION` varchar(6) NOT NULL default '',
+  `EVENT_OBJECT_CATALOG` varchar(4096) default NULL,
+  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL default '',
+  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL default '',
+  `ACTION_ORDER` bigint(4) NOT NULL default '0',
   `ACTION_CONDITION` longtext,
   `ACTION_STATEMENT` longtext NOT NULL,
-  `ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '',
-  `ACTION_TIMING` varchar(6) NOT NULL DEFAULT '',
-  `ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL,
-  `ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL,
-  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '',
-  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '',
-  `CREATED` datetime DEFAULT NULL,
+  `ACTION_ORIENTATION` varchar(9) NOT NULL default '',
+  `ACTION_TIMING` varchar(6) NOT NULL default '',
+  `ACTION_REFERENCE_OLD_TABLE` varchar(64) default NULL,
+  `ACTION_REFERENCE_NEW_TABLE` varchar(64) default NULL,
+  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL default '',
+  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL default '',
+  `CREATED` datetime default NULL,
   `SQL_MODE` longtext NOT NULL,
   `DEFINER` longtext NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -15078,70 +12965,11 @@ ERROR 42S02: Unknown table 'parameters' in information_schema
 
 Testcase 3.2.20.1:
 --------------------------------------------------------------------------------
+
+checking a table that will be implemented later
+-----------------------------------------------
 DESC referential_constraints;
-Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-UNIQUE_CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
-UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
-UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
-MATCH_OPTION	varchar(64)	NO			
-UPDATE_RULE	varchar(64)	NO			
-DELETE_RULE	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-REFERENCED_TABLE_NAME	varchar(64)	NO			
-USE information_schema;
-DESC referential_constraints;
-Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-UNIQUE_CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
-UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
-UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
-MATCH_OPTION	varchar(64)	NO			
-UPDATE_RULE	varchar(64)	NO			
-DELETE_RULE	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-REFERENCED_TABLE_NAME	varchar(64)	NO			
-SHOW CREATE TABLE referential_constraints;
-Table	Create Table
-REFERENTIAL_CONSTRAINTS	CREATE TEMPORARY TABLE `REFERENTIAL_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `UNIQUE_CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `UNIQUE_CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `UNIQUE_CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `MATCH_OPTION` varchar(64) NOT NULL DEFAULT '',
-  `UPDATE_RULE` varchar(64) NOT NULL DEFAULT '',
-  `DELETE_RULE` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `REFERENCED_TABLE_NAME` varchar(64) NOT NULL DEFAULT ''
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
-SELECT COUNT(*) FROM information_schema.columns
-WHERE table_schema = 'information_schema'
-  AND table_name   = 'referential_constraints'
-ORDER BY ordinal_position;
-COUNT(*)
-11
-SELECT * FROM information_schema.columns
-WHERE table_schema = 'information_schema'
-  AND table_name   = 'referential_constraints'
-ORDER BY ordinal_position;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ERROR 42S02: Unknown table 'referential_constraints' in information_schema
 
 *** End of Data Dictionary Tests ***
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result
index ab4508fb302..50caa20e8c7 100644
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -9,7 +9,7 @@ CREATE TABLE t1_values
 id BIGINT AUTO_INCREMENT,
 select_id BIGINT,
 PRIMARY KEY(id)
-) ENGINE = <engine_to_be_tested>;
+) ENGINE = 'MEMORY' ;
 ALTER TABLE t1_values ADD my_char_30        CHAR(30);
 ALTER TABLE t1_values ADD my_varchar_1000   VARCHAR(1000);
 ALTER TABLE t1_values ADD my_binary_30      BINARY(30);
@@ -123,8 +123,10 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = 1758;
-INSERT INTO t1_values SET select_id = @select_id,
-my_double = +1.758E+3;
+
+some statements disabled because of
+Bug#12440: CAST(data type DOUBLE AS TIME) strange results
+--------------------------------------------------------------------------------
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -133,20 +135,29 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_binary_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '-3333.3333';
-INSERT INTO t1_values SET select_id = @select_id,
-my_double = -0.33333333E+4;
 
-"Attention: CAST --> SIGNED INTEGER
-            Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Status: To be fixed later"
+some statements disabled because of
+Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian
 --------------------------------------------------------------------------------
 
-"Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5913"
+"Attention: CAST --> SIGNED INTEGER
+            The file with expected results suffers from
+            Bug#5083 Big integer values are inserted as negative into 
+                     decimal/string columns
+            Bug#5913 Traditional mode: BIGINT range not correctly delimited
+            Both have the status: To be fixed later"
 --------------------------------------------------------------------------------
 
 some statements disabled because of
-Bug#5913 Traditional mode: BIGINT range not correctly delimited
+Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result
+--------------------------------------------------------------------------------
+
+"Attention: CAST --> UNSIGNED INTEGER
+            The file with expected results suffers from Bug 5083 5913 9809"
+--------------------------------------------------------------------------------
+
+some statements disabled because of
+Bugs#8663: cant use bgint unsigned as input to cast
 --------------------------------------------------------------------------------
 SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values';
@@ -164,6 +175,11 @@ SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values';
+
+"Attention: IF(my_year IS NULL, ...
+            The file with expected results suffers from 
+            Bug#11689. successful CREATE VIEW but SELECT on view fails."
+--------------------------------------------------------------------------------
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_varchar_1000),
@@ -186,7 +202,7 @@ SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
 
 "Attention: LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', <numeric column>)
-            The file with expected results suffers from Bug 10963"
+            The file with expected results suffers from Bug 10963 11728"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
 because there are 32/64 Bit differences
 --------------------------------------------------------------------------------
@@ -200,9 +216,8 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select = 
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -284,19 +299,19 @@ SET sql_mode = '';
 --------------------------------------------------------------------------------
 CREATE VIEW v1 AS SELECT my_char_30, id FROM t1_values;
 SELECT my_char_30, id FROM t1_values
-WHERE select_id = 190 OR select_id IS NULL order by id;
+WHERE select_id = 187 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 190 OR select_id IS NULL) order by id;
+WHERE select_id = 187 OR select_id IS NULL);
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values;
 SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values
-WHERE select_id = 189 OR select_id IS NULL order by id;
+WHERE select_id = 186 OR select_id IS NULL;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -308,7 +323,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select concat(_latin1'A',`t1_values`.`my_char_30`) AS `CONCAT('A',my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 189 OR select_id IS NULL) order by id;
+WHERE select_id = 186 OR select_id IS NULL);
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -322,13 +337,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 188 OR select_id IS NULL order by id;
+WHERE select_id = 185 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varbinary_1000`) AS `LTRIM(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 188 OR select_id IS NULL) order by id;
+WHERE select_id = 185 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -336,13 +351,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL order by id;
+WHERE select_id = 184 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_binary_30`) AS `LTRIM(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL) order by id;
+WHERE select_id = 184 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -350,13 +365,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL order by id;
+WHERE select_id = 183 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varchar_1000`) AS `LTRIM(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL) order by id;
+WHERE select_id = 183 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -364,13 +379,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL order by id;
+WHERE select_id = 182 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_char_30`) AS `LTRIM(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL) order by id;
+WHERE select_id = 182 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -378,13 +393,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL order by id;
+WHERE select_id = 181 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varbinary_1000`) AS `LOWER(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL) order by id;
+WHERE select_id = 181 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -392,13 +407,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL order by id;
+WHERE select_id = 180 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_binary_30`) AS `LOWER(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL) order by id;
+WHERE select_id = 180 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -406,13 +421,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL order by id;
+WHERE select_id = 179 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LOWER(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL) order by id;
+WHERE select_id = 179 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -420,13 +435,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL order by id;
+WHERE select_id = 178 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_char_30`) AS `LOWER(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL) order by id;
+WHERE select_id = 178 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -434,13 +449,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL order by id;
+WHERE select_id = 177 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_decimal`) AS `LOCATE('-', ' - -ABC', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL) order by id;
+WHERE select_id = 177 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -448,13 +463,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL order by id;
+WHERE select_id = 176 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_double`) AS `LOCATE('-', ' - -ABC', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL) order by id;
+WHERE select_id = 176 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -462,13 +477,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL order by id;
+WHERE select_id = 175 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_bigint`) AS `LOCATE('-', ' - -ABC', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL) order by id;
+WHERE select_id = 175 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -476,13 +491,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL order by id;
+WHERE select_id = 174 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varbinary_1000`,3) AS `LOCATE('-', my_varbinary_1000, 3)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL) order by id;
+WHERE select_id = 174 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -490,13 +505,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL order by id;
+WHERE select_id = 173 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_binary_30`,3) AS `LOCATE('-', my_binary_30, 3)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL) order by id;
+WHERE select_id = 173 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -504,13 +519,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL order by id;
+WHERE select_id = 172 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varchar_1000`,3) AS `LOCATE('-', my_varchar_1000, 3)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL) order by id;
+WHERE select_id = 172 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -518,13 +533,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL order by id;
+WHERE select_id = 171 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_char_30`,3) AS `LOCATE('-', my_char_30, 3)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL) order by id;
+WHERE select_id = 171 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -532,13 +547,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL order by id;
+WHERE select_id = 170 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varbinary_1000, my_binary_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL) order by id;
+WHERE select_id = 170 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -546,13 +561,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL order by id;
+WHERE select_id = 169 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varbinary_1000, my_varchar_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL) order by id;
+WHERE select_id = 169 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -560,13 +575,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL order by id;
+WHERE select_id = 168 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varbinary_1000, my_char_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL) order by id;
+WHERE select_id = 168 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -574,13 +589,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL order by id;
+WHERE select_id = 167 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varbinary_1000, my_varbinary_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL) order by id;
+WHERE select_id = 167 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -588,13 +603,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL order by id;
+WHERE select_id = 166 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_binary_30, my_varbinary_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL) order by id;
+WHERE select_id = 166 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -602,13 +617,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL order by id;
+WHERE select_id = 165 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_binary_30, my_varchar_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL) order by id;
+WHERE select_id = 165 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -616,13 +631,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL order by id;
+WHERE select_id = 164 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_binary_30, my_char_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL) order by id;
+WHERE select_id = 164 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -630,13 +645,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL order by id;
+WHERE select_id = 163 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_binary_30, my_binary_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL) order by id;
+WHERE select_id = 163 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -644,13 +659,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL order by id;
+WHERE select_id = 162 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varchar_1000, my_varbinary_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL) order by id;
+WHERE select_id = 162 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -658,13 +673,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL order by id;
+WHERE select_id = 161 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varchar_1000, my_binary_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL) order by id;
+WHERE select_id = 161 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -672,13 +687,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL order by id;
+WHERE select_id = 160 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varchar_1000, my_char_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL) order by id;
+WHERE select_id = 160 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -686,13 +701,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL order by id;
+WHERE select_id = 159 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varchar_1000, my_varchar_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL) order by id;
+WHERE select_id = 159 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -700,13 +715,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL order by id;
+WHERE select_id = 158 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_char_30, my_varbinary_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL) order by id;
+WHERE select_id = 158 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -714,13 +729,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL order by id;
+WHERE select_id = 157 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_char_30, my_binary_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL) order by id;
+WHERE select_id = 157 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -728,13 +743,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL order by id;
+WHERE select_id = 156 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_char_30, my_varchar_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL) order by id;
+WHERE select_id = 156 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -742,13 +757,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values;
 SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL order by id;
+WHERE select_id = 155 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_char_30, my_char_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL) order by id;
+WHERE select_id = 155 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -756,13 +771,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL order by id;
+WHERE select_id = 154 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varbinary_1000`) AS `LOCATE('char', my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL) order by id;
+WHERE select_id = 154 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -770,13 +785,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL order by id;
+WHERE select_id = 153 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_binary_30`) AS `LOCATE('char', my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL) order by id;
+WHERE select_id = 153 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -784,13 +799,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL order by id;
+WHERE select_id = 152 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varchar_1000`) AS `LOCATE('char', my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL) order by id;
+WHERE select_id = 152 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -798,46 +813,46 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL order by id;
+WHERE select_id = 151 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `LOCATE('char', my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL) order by id;
+WHERE select_id = 151 OR select_id IS NULL);
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+CREATE VIEW v1 AS SELECT LOAD_FILE('../log/current_test'), id FROM t1_values;
+SELECT LOAD_FILE('../log/current_test'), id FROM t1_values
+WHERE select_id = 150 OR select_id IS NULL;
+LOAD_FILE('../log/current_test')	id
+CURRENT_TEST: memory_func_view
 	1
-äÄ@
+CURRENT_TEST: memory_func_view
 	2
-äÄ@
+CURRENT_TEST: memory_func_view
 	3
-äÄ@
+CURRENT_TEST: memory_func_view
 	4
-äÄ@
+CURRENT_TEST: memory_func_view
 	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../log/current_test') AS `LOAD_FILE('../log/current_test')`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+WHERE select_id = 150 OR select_id IS NULL);
+LOAD_FILE('../log/current_test')	id
+CURRENT_TEST: memory_func_view
 	1
-äÄ@
+CURRENT_TEST: memory_func_view
 	2
-äÄ@
+CURRENT_TEST: memory_func_view
 	3
-äÄ@
+CURRENT_TEST: memory_func_view
 	4
-äÄ@
+CURRENT_TEST: memory_func_view
 	5
 DROP VIEW v1;
 
@@ -846,13 +861,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL order by id;
+WHERE select_id = 149 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varbinary_1000`) AS `LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL) order by id;
+WHERE select_id = 149 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -860,13 +875,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL order by id;
+WHERE select_id = 148 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_binary_30`) AS `LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL) order by id;
+WHERE select_id = 148 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -874,13 +889,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL order by id;
+WHERE select_id = 147 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varchar_1000`) AS `LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL) order by id;
+WHERE select_id = 147 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -888,19 +903,19 @@ CREATE VIEW v1 AS SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL order by id;
+WHERE select_id = 146 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_char_30`) AS `LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL) order by id;
+WHERE select_id = 146 OR select_id IS NULL);
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values;
 SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL order by id;
+WHERE select_id = 145 OR select_id IS NULL;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -915,7 +930,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL) order by id;
+WHERE select_id = 145 OR select_id IS NULL);
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -930,7 +945,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values;
 SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL order by id;
+WHERE select_id = 144 OR select_id IS NULL;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -942,7 +957,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varbinary_1000`,2) AS `LEFT(my_varbinary_1000, 2)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL) order by id;
+WHERE select_id = 144 OR select_id IS NULL);
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -954,7 +969,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values;
 SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL order by id;
+WHERE select_id = 143 OR select_id IS NULL;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -966,7 +981,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL) order by id;
+WHERE select_id = 143 OR select_id IS NULL);
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -978,7 +993,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values;
 SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL order by id;
+WHERE select_id = 142 OR select_id IS NULL;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -990,7 +1005,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varchar_1000`,2) AS `LEFT(my_varchar_1000, 2)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL) order by id;
+WHERE select_id = 142 OR select_id IS NULL);
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1002,7 +1017,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values;
 SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL order by id;
+WHERE select_id = 141 OR select_id IS NULL;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1014,7 +1029,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_char_30`,2) AS `LEFT(my_char_30, 2)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL) order by id;
+WHERE select_id = 141 OR select_id IS NULL);
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1028,13 +1043,13 @@ CREATE VIEW v1 AS SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL order by id;
+WHERE select_id = 140 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LCASE(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL) order by id;
+WHERE select_id = 140 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -1042,13 +1057,13 @@ CREATE VIEW v1 AS SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values;
 SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL order by id;
+WHERE select_id = 139 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `INSTR(my_char_30, 'char')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL) order by id;
+WHERE select_id = 139 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -1056,7 +1071,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL order by id;
+WHERE select_id = 138 OR select_id IS NULL;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1068,7 +1083,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varbinary_1000`) AS `BIT_LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL) order by id;
+WHERE select_id = 138 OR select_id IS NULL);
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1082,7 +1097,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL order by id;
+WHERE select_id = 137 OR select_id IS NULL;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1094,7 +1109,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL) order by id;
+WHERE select_id = 137 OR select_id IS NULL);
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1108,7 +1123,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL order by id;
+WHERE select_id = 136 OR select_id IS NULL;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1120,7 +1135,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varchar_1000`) AS `BIT_LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL) order by id;
+WHERE select_id = 136 OR select_id IS NULL);
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1134,7 +1149,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL order by id;
+WHERE select_id = 135 OR select_id IS NULL;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1146,7 +1161,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_char_30`) AS `BIT_LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL) order by id;
+WHERE select_id = 135 OR select_id IS NULL);
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1160,7 +1175,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values;
 SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL order by id;
+WHERE select_id = 134 OR select_id IS NULL;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1172,7 +1187,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_year`,_latin1'IS_NULL') AS `IFNULL(my_year,'IS_NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL) order by id;
+WHERE select_id = 134 OR select_id IS NULL);
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1186,7 +1201,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values;
 SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL order by id;
+WHERE select_id = 133 OR select_id IS NULL;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1198,7 +1213,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_time`,_latin1'IS_NULL') AS `IFNULL(my_time,'IS_NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL) order by id;
+WHERE select_id = 133 OR select_id IS NULL);
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1212,7 +1227,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values;
 SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL order by id;
+WHERE select_id = 132 OR select_id IS NULL;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1224,7 +1239,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_timestamp`,_latin1'IS_NULL') AS `IFNULL(my_timestamp,'IS_NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL) order by id;
+WHERE select_id = 132 OR select_id IS NULL);
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1238,7 +1253,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values;
 SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL order by id;
+WHERE select_id = 131 OR select_id IS NULL;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1250,7 +1265,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_date`,_latin1'IS_NULL') AS `IFNULL(my_date,'IS_NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL) order by id;
+WHERE select_id = 131 OR select_id IS NULL);
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1264,7 +1279,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values;
 SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL order by id;
+WHERE select_id = 130 OR select_id IS NULL;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1276,7 +1291,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_datetime`,_latin1'IS_NULL') AS `IFNULL(my_datetime,'IS_NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL) order by id;
+WHERE select_id = 130 OR select_id IS NULL);
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1290,7 +1305,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values;
 SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL order by id;
+WHERE select_id = 129 OR select_id IS NULL;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1302,7 +1317,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_double`,_latin1'IS_NULL') AS `IFNULL(my_double,'IS_NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL) order by id;
+WHERE select_id = 129 OR select_id IS NULL);
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1316,7 +1331,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values;
 SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL order by id;
+WHERE select_id = 128 OR select_id IS NULL;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1328,7 +1343,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_decimal`,_latin1'IS_NULL') AS `IFNULL(my_decimal,'IS_NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL) order by id;
+WHERE select_id = 128 OR select_id IS NULL);
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1342,7 +1357,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values;
 SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL order by id;
+WHERE select_id = 127 OR select_id IS NULL;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1354,7 +1369,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_bigint`,_latin1'IS_NULL') AS `IFNULL(my_bigint,'IS_NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL) order by id;
+WHERE select_id = 127 OR select_id IS NULL);
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1368,7 +1383,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL order by id;
+WHERE select_id = 126 OR select_id IS NULL;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1380,7 +1395,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varbinary_1000`,_latin1'IS_NULL') AS `IFNULL(my_varbinary_1000,'IS_NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL) order by id;
+WHERE select_id = 126 OR select_id IS NULL);
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1394,7 +1409,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values;
 SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL order by id;
+WHERE select_id = 125 OR select_id IS NULL;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1406,7 +1421,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,_latin1'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL) order by id;
+WHERE select_id = 125 OR select_id IS NULL);
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1420,7 +1435,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values;
 SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL order by id;
+WHERE select_id = 124 OR select_id IS NULL;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1432,7 +1447,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varchar_1000`,_latin1'IS_NULL') AS `IFNULL(my_varchar_1000,'IS_NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL) order by id;
+WHERE select_id = 124 OR select_id IS NULL);
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1446,7 +1461,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values;
 SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL order by id;
+WHERE select_id = 123 OR select_id IS NULL;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1458,7 +1473,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_char_30`,_latin1'IS_NULL') AS `IFNULL(my_char_30,'IS_NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL) order by id;
+WHERE select_id = 123 OR select_id IS NULL);
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1472,7 +1487,7 @@ CREATE VIEW v1 AS SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values;
 SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL order by id;
+WHERE select_id = 122 OR select_id IS NULL;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1486,7 +1501,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL) order by id;
+WHERE select_id = 122 OR select_id IS NULL);
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1501,7 +1516,7 @@ CREATE VIEW v1 AS SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values;
 SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL order by id;
+WHERE select_id = 121 OR select_id IS NULL;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1515,7 +1530,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL) order by id;
+WHERE select_id = 121 OR select_id IS NULL);
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1530,7 +1545,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL order by id;
+WHERE select_id = 120 OR select_id IS NULL;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1544,7 +1559,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL) order by id;
+WHERE select_id = 120 OR select_id IS NULL);
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1559,7 +1574,7 @@ CREATE VIEW v1 AS SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values;
 SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL order by id;
+WHERE select_id = 119 OR select_id IS NULL;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1573,7 +1588,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL) order by id;
+WHERE select_id = 119 OR select_id IS NULL);
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1588,7 +1603,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values;
 SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL order by id;
+WHERE select_id = 118 OR select_id IS NULL;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1602,7 +1617,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL) order by id;
+WHERE select_id = 118 OR select_id IS NULL);
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1617,7 +1632,7 @@ CREATE VIEW v1 AS SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values;
 SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL order by id;
+WHERE select_id = 117 OR select_id IS NULL;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1631,7 +1646,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL) order by id;
+WHERE select_id = 117 OR select_id IS NULL);
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1646,7 +1661,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values;
 SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL order by id;
+WHERE select_id = 116 OR select_id IS NULL;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1660,7 +1675,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL) order by id;
+WHERE select_id = 116 OR select_id IS NULL);
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1675,7 +1690,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values;
 SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL order by id;
+WHERE select_id = 115 OR select_id IS NULL;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1689,7 +1704,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL) order by id;
+WHERE select_id = 115 OR select_id IS NULL);
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1704,7 +1719,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL order by id;
+WHERE select_id = 114 OR select_id IS NULL;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1718,7 +1733,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL) order by id;
+WHERE select_id = 114 OR select_id IS NULL);
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1733,7 +1748,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL order by id;
+WHERE select_id = 113 OR select_id IS NULL;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1747,7 +1762,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL) order by id;
+WHERE select_id = 113 OR select_id IS NULL);
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1762,7 +1777,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL order by id;
+WHERE select_id = 112 OR select_id IS NULL;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1776,7 +1791,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL) order by id;
+WHERE select_id = 112 OR select_id IS NULL);
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1791,7 +1806,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values;
 SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL order by id;
+WHERE select_id = 111 OR select_id IS NULL;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1805,7 +1820,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL) order by id;
+WHERE select_id = 111 OR select_id IS NULL);
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1820,7 +1835,7 @@ CREATE VIEW v1 AS SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values;
 SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL order by id;
+WHERE select_id = 110 OR select_id IS NULL;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1832,7 +1847,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_year`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_year, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL) order by id;
+WHERE select_id = 110 OR select_id IS NULL);
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1846,7 +1861,7 @@ CREATE VIEW v1 AS SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values;
 SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL order by id;
+WHERE select_id = 109 OR select_id IS NULL;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1858,7 +1873,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_time`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_time, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL) order by id;
+WHERE select_id = 109 OR select_id IS NULL);
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1872,7 +1887,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL order by id;
+WHERE select_id = 108 OR select_id IS NULL;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1884,7 +1899,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_timestamp`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL) order by id;
+WHERE select_id = 108 OR select_id IS NULL);
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1898,7 +1913,7 @@ CREATE VIEW v1 AS SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values;
 SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL order by id;
+WHERE select_id = 107 OR select_id IS NULL;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1910,7 +1925,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_date`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_date, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL) order by id;
+WHERE select_id = 107 OR select_id IS NULL);
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1924,7 +1939,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values;
 SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL order by id;
+WHERE select_id = 106 OR select_id IS NULL;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1936,7 +1951,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_datetime`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL) order by id;
+WHERE select_id = 106 OR select_id IS NULL);
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1950,7 +1965,7 @@ CREATE VIEW v1 AS SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values;
 SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL order by id;
+WHERE select_id = 105 OR select_id IS NULL;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1962,7 +1977,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_double`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_double, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL) order by id;
+WHERE select_id = 105 OR select_id IS NULL);
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1976,7 +1991,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values;
 SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL order by id;
+WHERE select_id = 104 OR select_id IS NULL;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1988,7 +2003,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_decimal`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL) order by id;
+WHERE select_id = 104 OR select_id IS NULL);
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2002,7 +2017,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values;
 SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL order by id;
+WHERE select_id = 103 OR select_id IS NULL;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2014,7 +2029,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_bigint`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL) order by id;
+WHERE select_id = 103 OR select_id IS NULL);
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2028,7 +2043,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL order by id;
+WHERE select_id = 102 OR select_id IS NULL;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2040,7 +2055,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varbinary_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL) order by id;
+WHERE select_id = 102 OR select_id IS NULL);
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2054,7 +2069,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL order by id;
+WHERE select_id = 101 OR select_id IS NULL;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2071,7 +2086,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_binary_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL) order by id;
+WHERE select_id = 101 OR select_id IS NULL);
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2090,7 +2105,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL order by id;
+WHERE select_id = 100 OR select_id IS NULL;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2102,7 +2117,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varchar_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL) order by id;
+WHERE select_id = 100 OR select_id IS NULL);
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2116,7 +2131,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values;
 SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL order by id;
+WHERE select_id = 99 OR select_id IS NULL;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2131,7 +2146,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_char_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL) order by id;
+WHERE select_id = 99 OR select_id IS NULL);
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2148,7 +2163,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL order by id;
+WHERE select_id = 98 OR select_id IS NULL;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2160,7 +2175,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using koi8r) AS `CONVERT(my_varbinary_1000 USING koi8r)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL) order by id;
+WHERE select_id = 98 OR select_id IS NULL);
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2174,7 +2189,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING koi8r), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL order by id;
+WHERE select_id = 97 OR select_id IS NULL;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2186,7 +2201,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL) order by id;
+WHERE select_id = 97 OR select_id IS NULL);
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2200,7 +2215,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING koi8r), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL order by id;
+WHERE select_id = 96 OR select_id IS NULL;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2212,7 +2227,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL) order by id;
+WHERE select_id = 96 OR select_id IS NULL);
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2226,7 +2241,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING koi8r), 
 my_char_30, id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL order by id;
+WHERE select_id = 95 OR select_id IS NULL;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2238,7 +2253,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL) order by id;
+WHERE select_id = 95 OR select_id IS NULL);
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2252,7 +2267,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING utf8), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL order by id;
+WHERE select_id = 94 OR select_id IS NULL;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2264,7 +2279,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using utf8) AS `CONVERT(my_varbinary_1000 USING utf8)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL) order by id;
+WHERE select_id = 94 OR select_id IS NULL);
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2278,7 +2293,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING utf8), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL order by id;
+WHERE select_id = 93 OR select_id IS NULL;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2290,7 +2305,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL) order by id;
+WHERE select_id = 93 OR select_id IS NULL);
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2304,7 +2319,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING utf8), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL order by id;
+WHERE select_id = 92 OR select_id IS NULL;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2316,7 +2331,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using utf8) AS `CONVERT(my_varchar_1000 USING utf8)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL) order by id;
+WHERE select_id = 92 OR select_id IS NULL);
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2330,7 +2345,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL order by id;
+WHERE select_id = 91 OR select_id IS NULL;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2342,7 +2357,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using utf8) AS `CONVERT(my_char_30 USING utf8)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL) order by id;
+WHERE select_id = 91 OR select_id IS NULL);
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2356,7 +2371,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL order by id;
+WHERE select_id = 90 OR select_id IS NULL;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2368,7 +2383,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as unsigned) AS `CAST(my_year AS UNSIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL) order by id;
+WHERE select_id = 90 OR select_id IS NULL);
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2382,7 +2397,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL order by id;
+WHERE select_id = 89 OR select_id IS NULL;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2400,7 +2415,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL) order by id;
+WHERE select_id = 89 OR select_id IS NULL);
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2420,7 +2435,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL order by id;
+WHERE select_id = 88 OR select_id IS NULL;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2438,7 +2453,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL) order by id;
+WHERE select_id = 88 OR select_id IS NULL);
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2458,7 +2473,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL order by id;
+WHERE select_id = 87 OR select_id IS NULL;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2475,7 +2490,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL) order by id;
+WHERE select_id = 87 OR select_id IS NULL);
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2494,7 +2509,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL order by id;
+WHERE select_id = 86 OR select_id IS NULL;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2511,7 +2526,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL) order by id;
+WHERE select_id = 86 OR select_id IS NULL);
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2530,7 +2545,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL order by id;
+WHERE select_id = 85 OR select_id IS NULL;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2546,7 +2561,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL) order by id;
+WHERE select_id = 85 OR select_id IS NULL);
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2564,7 +2579,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL order by id;
+WHERE select_id = 84 OR select_id IS NULL;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2576,7 +2591,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL) order by id;
+WHERE select_id = 84 OR select_id IS NULL);
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2590,7 +2605,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL order by id;
+WHERE select_id = 83 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2607,7 +2622,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL) order by id;
+WHERE select_id = 83 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2626,7 +2641,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL order by id;
+WHERE select_id = 82 OR select_id IS NULL;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2644,7 +2659,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL) order by id;
+WHERE select_id = 82 OR select_id IS NULL);
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2664,7 +2679,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL order by id;
+WHERE select_id = 81 OR select_id IS NULL;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2681,7 +2696,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL) order by id;
+WHERE select_id = 81 OR select_id IS NULL);
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2700,7 +2715,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL order by id;
+WHERE select_id = 80 OR select_id IS NULL;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2717,7 +2732,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL) order by id;
+WHERE select_id = 80 OR select_id IS NULL);
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2736,7 +2751,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL order by id;
+WHERE select_id = 79 OR select_id IS NULL;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2748,7 +2763,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as signed) AS `CAST(my_year AS SIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL) order by id;
+WHERE select_id = 79 OR select_id IS NULL);
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2762,7 +2777,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL order by id;
+WHERE select_id = 78 OR select_id IS NULL;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2779,7 +2794,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL) order by id;
+WHERE select_id = 78 OR select_id IS NULL);
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2798,7 +2813,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL order by id;
+WHERE select_id = 77 OR select_id IS NULL;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2816,7 +2831,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL) order by id;
+WHERE select_id = 77 OR select_id IS NULL);
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2836,7 +2851,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL order by id;
+WHERE select_id = 76 OR select_id IS NULL;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2853,7 +2868,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL) order by id;
+WHERE select_id = 76 OR select_id IS NULL);
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2872,7 +2887,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL order by id;
+WHERE select_id = 75 OR select_id IS NULL;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2889,7 +2904,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL) order by id;
+WHERE select_id = 75 OR select_id IS NULL);
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2904,43 +2919,11 @@ Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_double AS SIGNED INTEGER),
-my_double, id FROM t1_values;
-SELECT CAST(my_double AS SIGNED INTEGER),
-my_double, id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL order by id;
-CAST(my_double AS SIGNED INTEGER)	my_double	id
-NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
-0	0	4
--1	-1	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
-SHOW CREATE VIEW v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
-SELECT v1.* FROM v1
-WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL) order by id;
-CAST(my_double AS SIGNED INTEGER)	my_double	id
-NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
-0	0	4
--1	-1	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
-DROP VIEW v1;
-
-
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL order by id;
+WHERE select_id = 74 OR select_id IS NULL;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2955,7 +2938,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL) order by id;
+WHERE select_id = 74 OR select_id IS NULL);
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2972,7 +2955,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL order by id;
+WHERE select_id = 73 OR select_id IS NULL;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2984,7 +2967,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as signed) AS `CAST(my_bigint AS SIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL) order by id;
+WHERE select_id = 73 OR select_id IS NULL);
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2998,7 +2981,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL order by id;
+WHERE select_id = 72 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3014,7 +2997,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL) order by id;
+WHERE select_id = 72 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3032,7 +3015,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL order by id;
+WHERE select_id = 71 OR select_id IS NULL;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3049,7 +3032,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL) order by id;
+WHERE select_id = 71 OR select_id IS NULL);
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3068,7 +3051,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL order by id;
+WHERE select_id = 70 OR select_id IS NULL;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3084,7 +3067,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL) order by id;
+WHERE select_id = 70 OR select_id IS NULL);
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3102,7 +3085,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL order by id;
+WHERE select_id = 69 OR select_id IS NULL;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3118,7 +3101,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL) order by id;
+WHERE select_id = 69 OR select_id IS NULL);
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3136,25 +3119,25 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL order by id;
+WHERE select_id = 68 OR select_id IS NULL;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901	1901	2
-2155	2155	3
-2000	2000	4
-2005	2005	5
+1901.00	1901	2
+2155.00	2155	3
+2000.00	2000	4
+2005.00	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL) order by id;
+WHERE select_id = 68 OR select_id IS NULL);
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901	1901	2
-2155	2155	3
-2000	2000	4
-2005	2005	5
+1901.00	1901	2
+2155.00	2155	3
+2000.00	2000	4
+2005.00	2005	5
 DROP VIEW v1;
 
 
@@ -3162,25 +3145,25 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL order by id;
+WHERE select_id = 67 OR select_id IS NULL;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959	-838:59:59	2
-8385959	838:59:59	3
-130000	13:00:00	4
-100000	10:00:00	5
+-8385959.00	-838:59:59	2
+8385959.00	838:59:59	3
+130000.00	13:00:00	4
+100000.00	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL) order by id;
+WHERE select_id = 67 OR select_id IS NULL);
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959	-838:59:59	2
-8385959	838:59:59	3
-130000	13:00:00	4
-100000	10:00:00	5
+-8385959.00	-838:59:59	2
+8385959.00	838:59:59	3
+130000.00	13:00:00	4
+100000.00	10:00:00	5
 DROP VIEW v1;
 
 
@@ -3188,35 +3171,25 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL order by id;
+WHERE select_id = 66 OR select_id IS NULL;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0	0000-00-00 00:00:00	1
-9999999999	1970-01-01 03:00:01	2
-9999999999	2038-01-01 02:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+0.00	0000-00-00 00:00:00	1
+19700101030001.00	1970-01-01 03:00:01	2
+20380101025959.00	2038-01-01 02:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL) order by id;
+WHERE select_id = 66 OR select_id IS NULL);
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0	0000-00-00 00:00:00	1
-9999999999	1970-01-01 03:00:01	2
-9999999999	2038-01-01 02:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+0.00	0000-00-00 00:00:00	1
+19700101030001.00	1970-01-01 03:00:01	2
+20380101025959.00	2038-01-01 02:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -3224,25 +3197,25 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL order by id;
+WHERE select_id = 65 OR select_id IS NULL;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101	0001-01-01	2
-99991231	9999-12-31	3
-20040229	2004-02-29	4
-20050628	2005-06-28	5
+10101.00	0001-01-01	2
+99991231.00	9999-12-31	3
+20040229.00	2004-02-29	4
+20050628.00	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL) order by id;
+WHERE select_id = 65 OR select_id IS NULL);
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101	0001-01-01	2
-99991231	9999-12-31	3
-20040229	2004-02-29	4
-20050628	2005-06-28	5
+10101.00	0001-01-01	2
+99991231.00	9999-12-31	3
+20040229.00	2004-02-29	4
+20050628.00	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -3250,73 +3223,25 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL order by id;
+WHERE select_id = 64 OR select_id IS NULL;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-9999999999	0001-01-01 00:00:00	2
-9999999999	9999-12-31 23:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+10101000000.00	0001-01-01 00:00:00	2
+99991231235959.00	9999-12-31 23:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL) order by id;
+WHERE select_id = 64 OR select_id IS NULL);
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-9999999999	0001-01-01 00:00:00	2
-9999999999	9999-12-31 23:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-DROP VIEW v1;
-
-
-CREATE VIEW v1 AS SELECT CAST(my_double AS DECIMAL),
-my_double, id FROM t1_values;
-SELECT CAST(my_double AS DECIMAL),
-my_double, id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL order by id;
-CAST(my_double AS DECIMAL)	my_double	id
-NULL	NULL	1
--9999999999	-1.7976931348623e+308	2
-9999999999	1.7976931348623e+308	3
-0	0	4
--1	-1	5
--3333	-3333.3333	30
-Warnings:
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
-SHOW CREATE VIEW v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as decimal) AS `CAST(my_double AS DECIMAL)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
-SELECT v1.* FROM v1
-WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL) order by id;
-CAST(my_double AS DECIMAL)	my_double	id
-NULL	NULL	1
--9999999999	-1.7976931348623e+308	2
-9999999999	1.7976931348623e+308	3
-0	0	4
--1	-1	5
--3333	-3333.3333	30
-Warnings:
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+10101000000.00	0001-01-01 00:00:00	2
+99991231235959.00	9999-12-31 23:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -3324,31 +3249,25 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL order by id;
+WHERE select_id = 63 OR select_id IS NULL;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
-9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
-0	0.000000000000000000000000000000	4
--1	-1.000000000000000000000000000000	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+-10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
+10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
+0.00	0.000000000000000000000000000000	4
+-1.00	-1.000000000000000000000000000000	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL) order by id;
+WHERE select_id = 63 OR select_id IS NULL);
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
-9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
-0	0.000000000000000000000000000000	4
--1	-1.000000000000000000000000000000	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+-10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
+10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
+0.00	0.000000000000000000000000000000	4
+-1.00	-1.000000000000000000000000000000	5
 DROP VIEW v1;
 
 
@@ -3356,31 +3275,25 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL order by id;
+WHERE select_id = 62 OR select_id IS NULL;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9999999999	-9223372036854775808	2
-9999999999	9223372036854775807	3
-0	0	4
--1	-1	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+-9223372036854775808.00	-9223372036854775808	2
+9223372036854775807.00	9223372036854775807	3
+0.00	0	4
+-1.00	-1	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL) order by id;
+WHERE select_id = 62 OR select_id IS NULL);
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9999999999	-9223372036854775808	2
-9999999999	9223372036854775807	3
-0	0	4
--1	-1	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+-9223372036854775808.00	-9223372036854775808	2
+9223372036854775807.00	9223372036854775807	3
+0.00	0	4
+-1.00	-1	5
 DROP VIEW v1;
 
 
@@ -3388,14 +3301,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL order by id;
+WHERE select_id = 61 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	29
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3405,14 +3318,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL) order by id;
+WHERE select_id = 61 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	29
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3424,14 +3337,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL order by id;
+WHERE select_id = 60 OR select_id IS NULL;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	28
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3446,14 +3359,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL) order by id;
+WHERE select_id = 60 OR select_id IS NULL);
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	28
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3470,14 +3383,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL order by id;
+WHERE select_id = 59 OR select_id IS NULL;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	27
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3487,14 +3400,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL) order by id;
+WHERE select_id = 59 OR select_id IS NULL);
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	27
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3506,14 +3419,14 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL order by id;
+WHERE select_id = 58 OR select_id IS NULL;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$--	4
--1	-1	5
--3333	-3333.3333	26
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$--	4
+-1.00	-1	5
+-3333.33	-3333.3333	25
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3526,14 +3439,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL) order by id;
+WHERE select_id = 58 OR select_id IS NULL);
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$--	4
--1	-1	5
--3333	-3333.3333	26
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$--	4
+-1.00	-1	5
+-3333.33	-3333.3333	25
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3548,7 +3461,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL order by id;
+WHERE select_id = 57 OR select_id IS NULL;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3560,7 +3473,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL) order by id;
+WHERE select_id = 57 OR select_id IS NULL);
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3574,7 +3487,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL order by id;
+WHERE select_id = 56 OR select_id IS NULL;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3586,7 +3499,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as time) AS `CAST(my_time AS TIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL) order by id;
+WHERE select_id = 56 OR select_id IS NULL);
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3600,7 +3513,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL order by id;
+WHERE select_id = 55 OR select_id IS NULL;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3612,7 +3525,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as time) AS `CAST(my_timestamp AS TIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL) order by id;
+WHERE select_id = 55 OR select_id IS NULL);
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3626,7 +3539,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL order by id;
+WHERE select_id = 54 OR select_id IS NULL;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3638,7 +3551,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as time) AS `CAST(my_date AS TIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL) order by id;
+WHERE select_id = 54 OR select_id IS NULL);
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3652,7 +3565,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL order by id;
+WHERE select_id = 53 OR select_id IS NULL;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3664,7 +3577,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as time) AS `CAST(my_datetime AS TIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL) order by id;
+WHERE select_id = 53 OR select_id IS NULL);
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3674,45 +3587,11 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_double AS TIME),
-my_double, id FROM t1_values;
-SELECT CAST(my_double AS TIME),
-my_double, id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL order by id;
-CAST(my_double AS TIME)	my_double	id
-NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
-00:00:00	0	4
--00:00:01	-1	5
-00:17:58	1758	25
-Warnings:
-Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
-SHOW CREATE VIEW v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
-SELECT v1.* FROM v1
-WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL) order by id;
-CAST(my_double AS TIME)	my_double	id
-NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
-00:00:00	0	4
--00:00:01	-1	5
-00:17:58	1758	25
-Warnings:
-Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
-DROP VIEW v1;
-
-
 CREATE VIEW v1 AS SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL order by id;
+WHERE select_id = 52 OR select_id IS NULL;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3728,7 +3607,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL) order by id;
+WHERE select_id = 52 OR select_id IS NULL);
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3746,7 +3625,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL order by id;
+WHERE select_id = 51 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3763,7 +3642,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as time) AS `CAST(my_varbinary_1000 AS TIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL) order by id;
+WHERE select_id = 51 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3782,7 +3661,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL order by id;
+WHERE select_id = 50 OR select_id IS NULL;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3801,7 +3680,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as time) AS `CAST(my_binary_30 AS TIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL) order by id;
+WHERE select_id = 50 OR select_id IS NULL);
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3822,7 +3701,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL order by id;
+WHERE select_id = 49 OR select_id IS NULL;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3839,7 +3718,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as time) AS `CAST(my_varchar_1000 AS TIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL) order by id;
+WHERE select_id = 49 OR select_id IS NULL);
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3858,7 +3737,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL order by id;
+WHERE select_id = 48 OR select_id IS NULL;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3875,7 +3754,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as time) AS `CAST(my_char_30 AS TIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL) order by id;
+WHERE select_id = 48 OR select_id IS NULL);
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3894,7 +3773,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL order by id;
+WHERE select_id = 47 OR select_id IS NULL;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3902,16 +3781,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL) order by id;
+WHERE select_id = 47 OR select_id IS NULL);
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3919,10 +3798,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -3930,31 +3809,35 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL order by id;
+WHERE select_id = 46 OR select_id IS NULL;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 13:00:00	13:00:00	4
-0000-00-00 10:00:00	10:00:00	5
+0000-00-00 00:00:00	13:00:00	4
+0000-00-00 00:00:00	10:00:00	5
 Warnings:
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL) order by id;
+WHERE select_id = 46 OR select_id IS NULL);
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 13:00:00	13:00:00	4
-0000-00-00 10:00:00	10:00:00	5
+0000-00-00 00:00:00	13:00:00	4
+0000-00-00 00:00:00	10:00:00	5
 Warnings:
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
 DROP VIEW v1;
 
 
@@ -3962,7 +3845,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL order by id;
+WHERE select_id = 45 OR select_id IS NULL;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3974,7 +3857,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as datetime) AS `CAST(my_timestamp AS DATETIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL) order by id;
+WHERE select_id = 45 OR select_id IS NULL);
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3988,7 +3871,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL order by id;
+WHERE select_id = 44 OR select_id IS NULL;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -4000,7 +3883,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as datetime) AS `CAST(my_date AS DATETIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL) order by id;
+WHERE select_id = 44 OR select_id IS NULL);
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -4014,7 +3897,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL order by id;
+WHERE select_id = 43 OR select_id IS NULL;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4026,7 +3909,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as datetime) AS `CAST(my_datetime AS DATETIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL) order by id;
+WHERE select_id = 43 OR select_id IS NULL);
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4040,7 +3923,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL order by id;
+WHERE select_id = 42 OR select_id IS NULL;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4049,17 +3932,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL) order by id;
+WHERE select_id = 42 OR select_id IS NULL);
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4068,11 +3951,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4080,7 +3963,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL order by id;
+WHERE select_id = 41 OR select_id IS NULL;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4089,17 +3972,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL) order by id;
+WHERE select_id = 41 OR select_id IS NULL);
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4108,11 +3991,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4120,7 +4003,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL order by id;
+WHERE select_id = 40 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4129,16 +4012,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as datetime) AS `CAST(my_varbinary_1000 AS DATETIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL) order by id;
+WHERE select_id = 40 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4147,10 +4030,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4158,7 +4041,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL order by id;
+WHERE select_id = 39 OR select_id IS NULL;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4167,17 +4050,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as datetime) AS `CAST(my_binary_30 AS DATETIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL) order by id;
+WHERE select_id = 39 OR select_id IS NULL);
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4186,10 +4069,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 DROP VIEW v1;
 
@@ -4198,7 +4081,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL order by id;
+WHERE select_id = 38 OR select_id IS NULL;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4207,16 +4090,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as datetime) AS `CAST(my_varchar_1000 AS DATETIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL) order by id;
+WHERE select_id = 38 OR select_id IS NULL);
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4225,10 +4108,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4236,7 +4119,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL order by id;
+WHERE select_id = 37 OR select_id IS NULL;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4245,16 +4128,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as datetime) AS `CAST(my_char_30 AS DATETIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL) order by id;
+WHERE select_id = 37 OR select_id IS NULL);
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4263,10 +4146,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4274,7 +4157,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL order by id;
+WHERE select_id = 36 OR select_id IS NULL;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4282,16 +4165,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL) order by id;
+WHERE select_id = 36 OR select_id IS NULL);
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4299,10 +4182,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -4310,7 +4193,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL order by id;
+WHERE select_id = 35 OR select_id IS NULL;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4322,7 +4205,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL) order by id;
+WHERE select_id = 35 OR select_id IS NULL);
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4336,7 +4219,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL order by id;
+WHERE select_id = 34 OR select_id IS NULL;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4348,7 +4231,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as date) AS `CAST(my_timestamp AS DATE)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL) order by id;
+WHERE select_id = 34 OR select_id IS NULL);
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4362,7 +4245,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL order by id;
+WHERE select_id = 33 OR select_id IS NULL;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4374,7 +4257,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as date) AS `CAST(my_date AS DATE)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL) order by id;
+WHERE select_id = 33 OR select_id IS NULL);
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4388,7 +4271,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL order by id;
+WHERE select_id = 32 OR select_id IS NULL;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4400,7 +4283,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as date) AS `CAST(my_datetime AS DATE)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL) order by id;
+WHERE select_id = 32 OR select_id IS NULL);
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4414,7 +4297,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL order by id;
+WHERE select_id = 31 OR select_id IS NULL;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4423,16 +4306,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL) order by id;
+WHERE select_id = 31 OR select_id IS NULL);
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4441,10 +4324,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4452,7 +4335,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL order by id;
+WHERE select_id = 30 OR select_id IS NULL;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4461,16 +4344,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL) order by id;
+WHERE select_id = 30 OR select_id IS NULL);
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4479,10 +4362,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4490,7 +4373,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL order by id;
+WHERE select_id = 29 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4499,16 +4382,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as date) AS `CAST(my_varbinary_1000 AS DATE)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL) order by id;
+WHERE select_id = 29 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4517,10 +4400,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4528,7 +4411,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL order by id;
+WHERE select_id = 28 OR select_id IS NULL;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4537,17 +4420,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as date) AS `CAST(my_binary_30 AS DATE)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL) order by id;
+WHERE select_id = 28 OR select_id IS NULL);
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4556,10 +4439,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 DROP VIEW v1;
 
@@ -4568,7 +4451,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL order by id;
+WHERE select_id = 27 OR select_id IS NULL;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4577,16 +4460,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as date) AS `CAST(my_varchar_1000 AS DATE)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL) order by id;
+WHERE select_id = 27 OR select_id IS NULL);
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4595,10 +4478,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4606,7 +4489,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL order by id;
+WHERE select_id = 26 OR select_id IS NULL;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4615,16 +4498,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as date) AS `CAST(my_char_30 AS DATE)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL) order by id;
+WHERE select_id = 26 OR select_id IS NULL);
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4633,10 +4516,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4644,7 +4527,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL order by id;
+WHERE select_id = 25 OR select_id IS NULL;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4656,7 +4539,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset latin1) AS `CAST(my_year AS CHAR)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL) order by id;
+WHERE select_id = 25 OR select_id IS NULL);
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4670,7 +4553,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL order by id;
+WHERE select_id = 24 OR select_id IS NULL;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4682,7 +4565,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset latin1) AS `CAST(my_time AS CHAR)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL) order by id;
+WHERE select_id = 24 OR select_id IS NULL);
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4696,7 +4579,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL order by id;
+WHERE select_id = 23 OR select_id IS NULL;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4708,7 +4591,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset latin1) AS `CAST(my_timestamp AS CHAR)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL) order by id;
+WHERE select_id = 23 OR select_id IS NULL);
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4722,7 +4605,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL order by id;
+WHERE select_id = 22 OR select_id IS NULL;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4734,7 +4617,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset latin1) AS `CAST(my_date AS CHAR)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL) order by id;
+WHERE select_id = 22 OR select_id IS NULL);
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4748,7 +4631,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL order by id;
+WHERE select_id = 21 OR select_id IS NULL;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4760,7 +4643,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset latin1) AS `CAST(my_datetime AS CHAR)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL) order by id;
+WHERE select_id = 21 OR select_id IS NULL);
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4774,7 +4657,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL order by id;
+WHERE select_id = 20 OR select_id IS NULL;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4786,7 +4669,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset latin1) AS `CAST(my_double AS CHAR)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL) order by id;
+WHERE select_id = 20 OR select_id IS NULL);
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4800,7 +4683,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL order by id;
+WHERE select_id = 19 OR select_id IS NULL;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4812,7 +4695,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset latin1) AS `CAST(my_decimal AS CHAR)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL) order by id;
+WHERE select_id = 19 OR select_id IS NULL);
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4826,7 +4709,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL order by id;
+WHERE select_id = 18 OR select_id IS NULL;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4838,7 +4721,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset latin1) AS `CAST(my_bigint AS CHAR)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL) order by id;
+WHERE select_id = 18 OR select_id IS NULL);
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4852,7 +4735,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL order by id;
+WHERE select_id = 17 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4864,7 +4747,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset latin1) AS `CAST(my_varbinary_1000 AS CHAR)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL) order by id;
+WHERE select_id = 17 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4878,7 +4761,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL order by id;
+WHERE select_id = 16 OR select_id IS NULL;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4890,7 +4773,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL) order by id;
+WHERE select_id = 16 OR select_id IS NULL);
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4904,7 +4787,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL order by id;
+WHERE select_id = 15 OR select_id IS NULL;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4916,7 +4799,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset latin1) AS `CAST(my_varchar_1000 AS CHAR)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL) order by id;
+WHERE select_id = 15 OR select_id IS NULL);
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4930,7 +4813,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL order by id;
+WHERE select_id = 14 OR select_id IS NULL;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4942,7 +4825,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset latin1) AS `CAST(my_char_30 AS CHAR)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL) order by id;
+WHERE select_id = 14 OR select_id IS NULL);
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4956,7 +4839,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL order by id;
+WHERE select_id = 13 OR select_id IS NULL;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4968,7 +4851,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset binary) AS `CAST(my_year AS BINARY)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL) order by id;
+WHERE select_id = 13 OR select_id IS NULL);
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4982,7 +4865,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL order by id;
+WHERE select_id = 12 OR select_id IS NULL;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4994,7 +4877,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset binary) AS `CAST(my_time AS BINARY)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL) order by id;
+WHERE select_id = 12 OR select_id IS NULL);
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -5008,7 +4891,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL order by id;
+WHERE select_id = 11 OR select_id IS NULL;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -5020,7 +4903,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset binary) AS `CAST(my_timestamp AS BINARY)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL) order by id;
+WHERE select_id = 11 OR select_id IS NULL);
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -5034,7 +4917,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL order by id;
+WHERE select_id = 10 OR select_id IS NULL;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -5046,7 +4929,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset binary) AS `CAST(my_date AS BINARY)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL) order by id;
+WHERE select_id = 10 OR select_id IS NULL);
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -5060,7 +4943,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL order by id;
+WHERE select_id = 9 OR select_id IS NULL;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -5072,7 +4955,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset binary) AS `CAST(my_datetime AS BINARY)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL) order by id;
+WHERE select_id = 9 OR select_id IS NULL);
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -5086,7 +4969,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL order by id;
+WHERE select_id = 8 OR select_id IS NULL;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -5098,7 +4981,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset binary) AS `CAST(my_double AS BINARY)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL) order by id;
+WHERE select_id = 8 OR select_id IS NULL);
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -5112,7 +4995,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL order by id;
+WHERE select_id = 7 OR select_id IS NULL;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5124,7 +5007,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset binary) AS `CAST(my_decimal AS BINARY)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL) order by id;
+WHERE select_id = 7 OR select_id IS NULL);
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5138,7 +5021,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL order by id;
+WHERE select_id = 6 OR select_id IS NULL;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5150,7 +5033,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset binary) AS `CAST(my_bigint AS BINARY)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL) order by id;
+WHERE select_id = 6 OR select_id IS NULL);
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5164,7 +5047,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL order by id;
+WHERE select_id = 5 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5176,7 +5059,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset binary) AS `CAST(my_varbinary_1000 AS BINARY)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL) order by id;
+WHERE select_id = 5 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5190,7 +5073,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL order by id;
+WHERE select_id = 4 OR select_id IS NULL;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5202,7 +5085,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL) order by id;
+WHERE select_id = 4 OR select_id IS NULL);
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5216,7 +5099,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL order by id;
+WHERE select_id = 3 OR select_id IS NULL;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5228,7 +5111,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset binary) AS `CAST(my_varchar_1000 AS BINARY)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL) order by id;
+WHERE select_id = 3 OR select_id IS NULL);
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5242,7 +5125,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL order by id;
+WHERE select_id = 2 OR select_id IS NULL;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5254,7 +5137,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset binary) AS `CAST(my_char_30 AS BINARY)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL) order by id;
+WHERE select_id = 2 OR select_id IS NULL);
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5266,7 +5149,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT sqrt(my_bigint), my_bigint, id FROM t1_values;
 SELECT sqrt(my_bigint), my_bigint, id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL order by id;
+WHERE select_id = 1 OR select_id IS NULL;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -5280,7 +5163,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sqrt(`t1_values`.`my_bigint`) AS `sqrt(my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL) order by id;
+WHERE select_id = 1 OR select_id IS NULL);
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc.result b/mysql-test/suite/funcs_1/r/memory_storedproc.result
index 402b527241f..94d776c9879 100644
--- a/mysql-test/suite/funcs_1/r/memory_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc.result
@@ -3,16 +3,19 @@
 .                         IMPORTANT NOTICE:
 .                         -----------------
 .
-.  FIXME: The .result files are still NOT CHECKED for correctness!
+.  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
+.         for correctness!
 .
 .  FIXME: Several tests are affected by known problems around DECIMAL
-.  FIXME: and NUMERIC that will be checked again after WL#2984 once
+.  FIXME: and NUMERIC that needs to be checked again after WL#2984
 .  FIXME: has been completed. Some of them are marked in the result.
 .
-. Currently (Dec 06, 2005) this .result file is checked OK for Linux
-. with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
-. Using the available Windows version 5.0.16 there are differences
-. that can be ignored (e.g. WL#2984).
+.  This .result file has been checked OK with Linux 5.0.23-bk,
+.  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
+.
+. This file has been saved although it might contain failures / wrong
+. results to be able to detect _new_ differences in the behaviour.
+. Hopefully the remaining checks can be made soon.
 .
 --------------------------------------------------------------------------------
 	FIXME: There are subtests that are switched off due to known bugs:
@@ -96,21 +99,20 @@ USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
-f1	f2	f3	f4	f5	f6
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
 set @v1 = f1;
 SELECT @v1, @v1;
 END//
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
-@v1	@v1
-abc	abc
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 binary ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -119,12 +121,12 @@ SELECT @v1;
 END//
 CALL sp1( 34 );
 @v1
-34
+3
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 blob ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -137,8 +139,6 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 int )  language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -151,8 +151,6 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
@@ -161,13 +159,19 @@ BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
+ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
+ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(60, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
@@ -175,51 +179,56 @@ SELECT @v1;
 END//
 CALL sp1( 17976931340000 );
 @v1
-17976931340000
+17976931340000.000000000000000000000000000000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 set("value1", "value1") ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
 CALL sp1( "value1, value1" );
 f1
-value1, value1
+value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) language sql SELECT f1;
 CALL sp1( 'abc' );
@@ -269,7 +278,9 @@ SHOW PROCEDURE status like 'sp1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 DROP PROCEDURE sp1;
 
 Testcase 4.1.2:
@@ -333,11 +344,13 @@ CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  lang
   BEGIN
 return f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SELECT fn1( "value1" );
 fn1( "value1" )
-0.000000000000000000000000000000
+1.000000000000000000000000000000
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: 'value1'
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -346,11 +359,14 @@ CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) langua
   BEGIN
 return f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
 SELECT fn1( "value1, value1" );
 fn1( "value1, value1" )
-0.000000000000000000000000000000
+1.000000000000000000000000000000
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: 'value1, value1'
+Note	1291	Column '' has duplicated value 'value1' in SET
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -441,7 +457,7 @@ CREATE PROCEDURE sp1 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE PROCEDURE `sp1`(f1 char(20) )
+sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(f1 char(20) )
 SELECT * from t1 where f2 = f1
 DROP PROCEDURE sp1;
 
@@ -454,7 +470,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50)
 return concat('hello, ', s, '!');
 show CREATE FUNCTION fn1;
 Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(s char(20)) RETURNS char(50)
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50)
 return concat('hello, ', s, '!')
 DROP FUNCTION fn1;
 
@@ -498,7 +514,7 @@ CREATE PROCEDURE sp7b (a char (20), out b char(20))
 SELECT f1 into b from t1 where t1.f2= a;
 CALL sp7b('xyz', @out_param);
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 SELECT @out_param;
 @out_param
 NULL
@@ -511,8 +527,8 @@ END//
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
 Warnings:
-Warning	1329	No data to FETCH
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data - zero rows fetched, selected, or processed
 SELECT @out_param;
 @out_param
 NULL
@@ -2565,12 +2581,12 @@ alter procedure sp1 sql security definer;
 alter function sp1 sql security definer;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE PROCEDURE `sp1`()
+sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
     COMMENT 'this is a procedure'
 set @x= 3
 show CREATE FUNCTION sp1;
 Function	sql_mode	Create Function
-sp1		CREATE FUNCTION `sp1`() RETURNS int(11)
+sp1		CREATE DEFINER=`root`@`localhost` FUNCTION `sp1`() RETURNS int(11)
     COMMENT 'this is a function'
 return 4
 USE db_storedproc;
@@ -4587,6 +4603,9 @@ END begin_label//
 CALL sp1();
 @v1	@v2
 1	2
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.7:
@@ -4621,6 +4640,9 @@ declare y char;
 SELECT f1, f2 into x, y from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.9:
@@ -4703,9 +4725,9 @@ fetch cur1 into e;
 SELECT x, y, z, a, b, c, d, e;
 close cur1;
 END//
+ERROR 42000: Too big scale 255 specified for column ''. Maximum is 30.
 CALL sp6();
-x	y	z	a	b	c	d	e
-a	1	1.1	value1	1200000000000	mediumtext	2005-02-02 12:12:12	a`
+ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -4737,7 +4759,7 @@ BEGIN
 declare x char, integer default '0';
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0';
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -4746,7 +4768,7 @@ BEGIN
 declare x1, x2 char, integer default '0', 1;
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0', 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0', 1;
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -5988,7 +6010,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+000	000	000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -5997,7 +6023,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+001	001	001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6024,7 +6050,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000	00000	00000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6033,7 +6063,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00001	00001	00001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6060,7 +6090,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000000	00000000	00000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6069,7 +6103,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00000001	00000001	00000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6096,7 +6130,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+0000000000	0000000000	0000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6105,7 +6143,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+0000000001	0000000001	0000000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6123,7 +6161,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+18446744073709551615	18446744073709551615	18446744073709551615
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6132,7 +6170,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000000000000000000	00000000000000000000	00000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6141,7 +6183,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00000000000000000001	00000000000000000001	00000000000000000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6150,7 +6192,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
+-9999999999	-9999999999	-9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6161,7 +6207,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6170,7 +6220,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
+0000000000	0000000000	0000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6181,7 +6235,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6192,7 +6250,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6203,7 +6265,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6214,7 +6280,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6225,7 +6295,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6252,7 +6326,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6261,7 +6335,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6270,7 +6344,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+1.17549e-38	1.17549e-38	1.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6279,7 +6353,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+1.17549e-38	1.17549e-38	1.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6288,7 +6362,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+01.17549e-38	01.17549e-38	01.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6297,7 +6371,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+01.17549e-38	01.17549e-38	01.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6333,7 +6407,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-20050202122012	20050202122012	20050202122012
+2005-02-02 12:20:12	2005-02-02 12:20:12	2005-02-02 12:20:12
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -12384,10 +12458,13 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	abaa	3
+NULL	a	3
+Warnings:
+Warning	1265	Data truncated for column 'y' at row 3
+Warning	1265	Data truncated for column 'y' at row 1
 SELECT @v1, @v2;
 @v1	@v2
-4	a`
+4	a
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12454,7 +12531,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1264	Out of range value adjusted for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12481,9 +12558,11 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-temp
+t
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12501,7 +12580,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'asd'
+Warning	1265	Data truncated for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12527,7 +12606,9 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-asd
+0000-00-00 00:00:00
+Warnings:
+Warning	1264	Out of range value adjusted for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12571,7 +12652,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12602,6 +12683,8 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12665,6 +12748,8 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12672,6 +12757,8 @@ declare x tinyint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12679,6 +12766,8 @@ declare x tinyint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12686,6 +12775,8 @@ declare x tinyint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12693,6 +12784,8 @@ declare x tinyint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12700,6 +12793,8 @@ declare x smallint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12707,6 +12802,8 @@ declare x smallint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12714,6 +12811,8 @@ declare x smallint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12721,6 +12820,8 @@ declare x smallint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12728,6 +12829,8 @@ declare x mediumint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12735,6 +12838,8 @@ declare x mediumint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12742,6 +12847,8 @@ declare x mediumint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12749,6 +12856,8 @@ declare x mediumint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12756,6 +12865,8 @@ declare x int;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12763,6 +12874,8 @@ declare x int unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12770,6 +12883,8 @@ declare x int zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12777,6 +12892,8 @@ declare x int unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12784,6 +12901,8 @@ declare x bigint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12791,6 +12910,8 @@ declare x bigint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12798,6 +12919,8 @@ declare x bigint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12805,6 +12928,8 @@ declare x bigint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12813,7 +12938,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12822,7 +12947,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12831,7 +12956,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12840,7 +12965,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12849,7 +12974,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12858,7 +12983,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12867,7 +12992,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12876,7 +13001,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12884,6 +13009,8 @@ declare x real;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12891,6 +13018,8 @@ declare x real unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12898,6 +13027,8 @@ declare x real zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12905,6 +13036,8 @@ declare x real unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12912,6 +13045,8 @@ declare x float;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12919,6 +13054,8 @@ declare x float unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12926,6 +13063,8 @@ declare x float zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12933,6 +13072,8 @@ declare x float unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12940,6 +13081,8 @@ declare x date;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12947,6 +13090,8 @@ declare x time;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12954,6 +13099,8 @@ declare x datetime;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12961,6 +13108,8 @@ declare x timestamp;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12968,6 +13117,8 @@ declare x year;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12975,6 +13126,8 @@ declare x year(3);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12982,6 +13135,8 @@ declare x year(4);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12989,6 +13144,8 @@ declare x enum("1enum", "2enum");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12996,6 +13153,8 @@ declare x set("1set", "2set");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.38:
@@ -13643,7 +13802,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13669,7 +13828,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -14926,7 +15085,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
-0
+-46744073709551616
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -14945,6 +15104,8 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -14972,6 +15133,10 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -14980,7 +15145,9 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -14989,7 +15156,10 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15008,6 +15178,10 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15016,7 +15190,9 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15025,7 +15201,10 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15061,7 +15240,10 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15097,7 +15279,10 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000001
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15106,7 +15291,10 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-1
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15115,7 +15303,10 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000001
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15124,7 +15315,10 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15142,7 +15336,9 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15151,7 +15347,9 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15160,7 +15358,9 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15178,7 +15378,9 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15187,7 +15389,9 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15196,7 +15400,9 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15214,7 +15420,9 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15223,7 +15431,9 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15232,7 +15442,9 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15250,7 +15462,9 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15259,7 +15473,9 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15268,7 +15484,9 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15286,7 +15504,9 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15295,7 +15515,9 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15304,7 +15526,9 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15322,7 +15546,9 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15331,7 +15557,9 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15340,7 +15568,9 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15349,7 +15579,10 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483648
+-2147483638
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15385,7 +15618,9 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15412,7 +15647,11 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-0
+16777215
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15421,7 +15660,9 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15430,7 +15671,9 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15440,6 +15683,9 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15448,7 +15694,9 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15457,7 +15705,10 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15466,7 +15717,9 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15476,6 +15729,9 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15484,7 +15740,9 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15493,7 +15751,10 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15502,7 +15763,12 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999999.999999999999999999999999999999
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15512,6 +15778,10 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15521,6 +15791,10 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15529,7 +15803,10 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15577,7 +15854,9 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15586,7 +15865,9 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15595,7 +15876,10 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15613,7 +15897,9 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15622,7 +15908,9 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15631,7 +15919,9 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15667,7 +15957,11 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-0
+65535
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15703,7 +15997,11 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-0
+255
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
@@ -15759,7 +16057,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-26:00:00
+25:59:59
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -15768,7 +16066,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:01
+1998-01-02 01:01:00
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -15778,6 +16076,8 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -15787,6 +16087,8 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
 CREATE FUNCTION fn96( f1 char binary) returns char binary
 BEGIN
@@ -15796,6 +16098,8 @@ END//
 SELECT fn96( 'h');
 fn96( 'h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -15917,7 +16221,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
--9223372036854775808
+18400000000000000000
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -15926,7 +16230,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-184000000000000000
+00184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -15935,7 +16239,9 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
--9220000000000000
+00000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
@@ -15947,7 +16253,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
@@ -15959,7 +16265,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -15968,7 +16274,11 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -15977,7 +16287,9 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
@@ -15989,7 +16301,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
@@ -16001,7 +16316,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
@@ -16013,7 +16328,11 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
@@ -16025,7 +16344,9 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
@@ -16037,7 +16358,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
@@ -16049,7 +16373,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000
+-1000000000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
@@ -16061,7 +16385,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000
+10000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
@@ -16073,7 +16397,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-10000000000000000.000000000
+000000000000000010000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
@@ -16085,7 +16409,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
--1000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
@@ -16094,7 +16421,7 @@ SELECT f1;
 END//
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000.000000000
+-1000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
@@ -16103,10 +16430,10 @@ SELECT f1;
 END//
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+100000000000000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+1000000000000000000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
@@ -16118,10 +16445,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp20_duz( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+0000000000000000000000000000000000000000000100000000000000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+0000000000000000000000000000000000000001000000000000000000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
@@ -16133,7 +16460,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-1.000000000
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
@@ -16145,7 +16475,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-1.000000000
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
@@ -16157,7 +16490,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-1.000000000
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
@@ -16169,7 +16505,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16187,7 +16526,9 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16196,7 +16537,9 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16205,7 +16548,9 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16223,7 +16568,9 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16232,7 +16579,9 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16241,7 +16590,9 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16259,7 +16610,9 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16268,7 +16621,9 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16277,7 +16632,9 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16295,7 +16652,9 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16304,7 +16663,9 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16313,7 +16674,9 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16331,7 +16694,9 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16340,7 +16705,9 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16349,7 +16716,9 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16367,7 +16736,9 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16376,7 +16747,9 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16385,7 +16758,9 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16394,7 +16769,10 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2150000000
+-2147483638
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16421,7 +16799,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-215000000
+0215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16430,7 +16808,9 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16457,7 +16837,11 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
--8388602
+16777215
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16466,7 +16850,9 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16475,7 +16861,9 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16484,7 +16872,10 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16493,7 +16884,9 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16502,7 +16895,10 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16511,7 +16907,9 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16520,7 +16918,10 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16529,7 +16930,9 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16538,7 +16941,10 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
@@ -16547,7 +16953,12 @@ SELECT f1;
 END//
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
@@ -16556,7 +16967,11 @@ SELECT f1;
 END//
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
@@ -16565,7 +16980,11 @@ SELECT f1;
 END//
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
@@ -16574,7 +16993,10 @@ SELECT f1;
 END//
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
@@ -16583,7 +17005,7 @@ SELECT f1;
 END//
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000.000000000
+-10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
@@ -16592,7 +17014,7 @@ SELECT f1;
 END//
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
@@ -16601,7 +17023,7 @@ SELECT f1;
 END//
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
@@ -16610,7 +17032,7 @@ SELECT f1;
 END//
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -16619,7 +17041,9 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -16628,7 +17052,9 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -16637,7 +17063,10 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
--999999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -16646,7 +17075,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.10000
+1.1
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -16655,7 +17084,9 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-1.10000
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -16664,7 +17095,9 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -16673,7 +17106,9 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -16709,7 +17144,11 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
--32602
+65535
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -16745,7 +17184,11 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
--102
+255
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp89;
 DROP PROCEDURE IF EXISTS sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -16765,7 +17208,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-26:00:00.999997
+25:59:59
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -16774,7 +17217,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:01.000001
+1998-01-02 01:01:00
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -16783,7 +17226,9 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -16792,7 +17237,9 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -16801,7 +17248,9 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -16846,7 +17295,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-61
+2061
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -16901,6 +17350,8 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -16937,9 +17388,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
+2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	2033	2084	2033	2084
+2061	2071	2061	2071	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17010,9 +17461,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
+a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17155,7 +17606,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-9223372036854775807	NULL
+18400000000000000000	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17163,7 +17614,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-9223372036854775807	9223372036854775807	NULL
+18400000000000000000	18400000000000000000	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17171,7 +17622,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
--2	-2	-2
+18353255926290448384	18353255926290448384	18353255926290448384
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17179,7 +17630,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
--2	-2
+18353255926290448384	18353255926290448384
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17237,9 +17688,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17291,9 +17742,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17337,9 +17788,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17372,9 +17823,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17407,9 +17858,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17442,9 +17893,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17477,9 +17928,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17545,9 +17996,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -17579,9 +18030,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -17613,9 +18064,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -17647,9 +18098,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -17681,9 +18132,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -17715,9 +18166,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -17783,9 +18234,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -17817,9 +18268,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -17851,9 +18302,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -17919,9 +18370,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -17953,9 +18404,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -17987,9 +18438,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18021,9 +18472,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18089,9 +18540,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18123,9 +18574,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18191,9 +18642,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18225,9 +18676,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18293,9 +18744,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18327,9 +18778,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18361,9 +18812,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18395,9 +18846,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18429,9 +18880,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18463,9 +18914,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18497,9 +18948,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18531,9 +18982,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -18565,9 +19016,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -18599,9 +19050,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -18633,9 +19084,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -18667,9 +19118,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -18701,9 +19152,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -18735,9 +19186,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -18769,9 +19220,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -18803,9 +19254,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -18837,9 +19288,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -18871,9 +19322,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -18905,9 +19356,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	61	61	71	61	61	71
+2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	61	71	61	71
+2061	2071	2061	2071	2061	2071	2061	2071
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19041,9 +19492,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
+a	a	a	a	a	a	a	a	a	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	aah	ah	aah
+a	a	a	a	a	a	a	a
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19075,9 +19526,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
+a	a	a	a	a	a	a	a	NULL	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	NULL	ah	aah
+a	a	a	a	a	NULL	a	a
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19177,9 +19628,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19211,9 +19662,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19245,9 +19696,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19279,9 +19730,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19313,9 +19764,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19347,9 +19798,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19381,9 +19832,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19415,9 +19866,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19449,9 +19900,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19483,9 +19934,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19517,9 +19968,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -19551,9 +20002,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -19585,9 +20036,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -19619,9 +20070,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -19653,9 +20104,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -19687,9 +20138,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -19721,9 +20172,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -19823,9 +20274,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -19857,9 +20308,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -19925,9 +20376,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -19959,9 +20410,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -19993,9 +20444,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20027,9 +20478,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20061,9 +20512,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20095,9 +20546,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20129,9 +20580,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20163,9 +20614,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20231,9 +20682,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20265,9 +20716,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20299,9 +20750,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20367,9 +20818,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20435,9 +20886,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20463,7 +20914,7 @@ insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
 Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
+sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
@@ -20499,7 +20950,7 @@ SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
 Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
+sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
@@ -20542,7 +20993,7 @@ show warnings;
 END//
 show CREATE PROCEDURE sp4;
 Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -20590,14 +21041,14 @@ set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
 Procedure	sql_mode	Create Procedure
-sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
 END
 show CREATE PROCEDURE sp6b;
 Procedure	sql_mode	Create Procedure
-sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
@@ -20605,7 +21056,7 @@ set @y=@x;
 END
 show CREATE PROCEDURE sp6c;
 Procedure	sql_mode	Create Procedure
-sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
@@ -20791,7 +21242,7 @@ END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
 Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
@@ -20823,7 +21274,7 @@ END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
 Procedure	sql_mode	Create Procedure
-sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
+sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
old mode 100644
new mode 100755
index 903f2b3d01f..731d5c4a8cf
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
@@ -166,7 +166,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
+SELECT f1, f2 into @x, @y from t2 limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -209,7 +209,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
+SELECT f4, f3 into @x, @y from t2 limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -544,9 +544,6 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
-Warnings:
-Note	1051	Unknown table 'tqq'
-Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()
@@ -1087,8 +1084,7 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
-where f4 >=-5000 order by f4 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1171,7 +1167,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2 order by f4;
+SELECT f1, f2, f4, f5 from t2;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1191,21 +1187,21 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
 open cur1;
 open cur2;
 BEGIN
-declare continue handler for sqlstate '02000' set count=1;
+declare continue handler for sqlstate '02000' set count = 1;
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-1-', count, newf1, newf2, newf4, newf5;
 insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-set count= 4;
+set count = 4;
 BEGIN
-while count> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-2-', count, newf1, newf2, newf4, newf5;
-set count = count- 1;
+set count = count - 1;
 END while;
 SELECT '-3-', count, newf1, newf2, newf4, newf4;
 END;
@@ -1274,10 +1270,8 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
-where f4>=-5000 order by f4 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
-where f4>=-5000 order by f4 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1308,10 +1302,8 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
-WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
-WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_03.result b/mysql-test/suite/funcs_1/r/memory_storedproc_03.result
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_07.result b/mysql-test/suite/funcs_1/r/memory_storedproc_07.result
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_08.result b/mysql-test/suite/funcs_1/r/memory_storedproc_08.result
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_10.result b/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
old mode 100644
new mode 100755
index e924cf0731a..89c2fb736eb
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
@@ -80,7 +80,7 @@ connect(localhost,user_1,,db_storedproc,MYSQL_PORT,MYSQL_SOCK);
 user_1@localhost	db_storedproc
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
+SELECT * FROM db_storedproc.t1 LIMIT 1;
 END//
 CREATE FUNCTION fn31105(n INT) RETURNS INT
 BEGIN
@@ -209,7 +209,7 @@ CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -226,7 +226,7 @@ CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -246,7 +246,7 @@ CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -279,7 +279,7 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0102.result b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
index 1319fc3e361..0a640201d76 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
@@ -195,9 +195,6 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
-ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
-CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
-BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 insert into t1 (f2) values ('insert 3.5.1.7');
 select * from t1;
 f1	f2	f3
@@ -206,14 +203,12 @@ update t1 set f2='update 3.5.1.7';
 select * from t1;
 f1	f2	f3
 NULL	update 3.5.1.7	42
-select trigger_name from information_schema.triggers order by trigger_name;
+select trigger_name from information_schema.triggers;
 trigger_name
 trg5_1
 trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
 drop trigger trg5_1;
 drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
-ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
-drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 drop table t1;
 
 Testcase 3.5.1.8:
@@ -315,7 +310,7 @@ insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 select @test_var1, @test_var2, @test_var3;
 @test_var1	@test_var2	@test_var3
 trig1	trig2	trig3
-select * from t1 order by f2;
+select * from t1;
 f1	f2
 trig1	1
 trig1	2
@@ -325,7 +320,7 @@ trig2	3
 select * from trig_db3.t1;
 f1	f2
 trig3	4
-select * from t1 order by f2;
+select * from t1;
 f1	f2
 trig1	1
 trig1	2
@@ -350,10 +345,10 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1 
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers;
 trigger_schema	trigger_name	event_object_table
-trig_db1	trig1_a	t1
 trig_db1	trig1_b	t1
+trig_db1	trig1_a	t1
 trig_db2	trig2	t1
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03.result b/mysql-test/suite/funcs_1/r/memory_trig_03.result
index ae7b83f820d..7309e403cff 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03.result
@@ -78,16 +78,16 @@ Testcase 3.5.3.2/6:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 grant ALL  on *.* to test_noprivs@localhost;
-revoke TRIGGER on *.* from test_noprivs@localhost;
+revoke SUPER  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -100,10 +100,10 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-Got one of the listed errors
+ERROR 42000: Access denied; you need the SUPER privilege for this operation
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 select current_user;
@@ -118,12 +118,15 @@ root@localhost
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
 ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1'
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
+
+note: once 15166 is fixed a similar case for SELECT needs to be added
+---------------------------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -132,10 +135,10 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-Got one of the listed errors
+ERROR 42000: Access denied; you need the SUPER privilege for this operation
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -144,12 +147,12 @@ use priv_db;
 drop trigger trg1_2;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-no');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 drop trigger trg1_2;
 
 Testcase 3.5.3.7a:
@@ -159,12 +162,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke UPDATE  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
+grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -173,24 +176,24 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-select f1 from t1 order by f1;
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
 use priv_db;
 select current_user;
@@ -198,220 +201,236 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 drop trigger trg4a_2;
 
 Testcase 3.5.3.7b:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs;
+grant SUPER on *.* to test_noprivs;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1b
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
+insert 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2b';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT on priv_db.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.7-2a
+update 3.5.3.7-1b
 insert 3.5.3.7-2b
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
 -----------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2c';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2c');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
-trig 3.5.3.7-2c
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
+trig 3.5.3.7-2c
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
-trig 3.5.3.7-2c
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
+trig 3.5.3.7-2c
+insert 3.5.3.7-1d
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2d';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2d');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
-trig 3.5.3.7-2c
-trig 3.5.3.7-2d
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
+trig 3.5.3.7-2c
+insert 3.5.3.7-1d
+trig 3.5.3.7-2d
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -421,12 +440,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke SELECT  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
+grant SUPER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -435,7 +454,7 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 
 Trigger create disabled - should fail - Bug 8887
 ------------------------------------------------
@@ -454,13 +473,17 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-2a
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2a');
 select @test_var;
 @test_var
@@ -470,26 +493,26 @@ drop trigger trg5a_2;
 Testcase: 3.5.3.8b
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke SELECT  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -506,7 +529,7 @@ before trig 3.5.3.8-1b
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -516,6 +539,10 @@ insert into t1 (f1) values ('insert 3.5.3.8-2b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-2b
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE on priv_db.* to test_yesprivs@localhost;
 update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 select @test_var;
 @test_var
@@ -525,26 +552,26 @@ drop trigger trg5b_2;
 Testcase 3.5.3.8c:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -557,12 +584,16 @@ before trig 3.5.3.8-1c
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2c';
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2c');
 select @test_var;
 @test_var
@@ -572,24 +603,24 @@ drop trigger trg5c_2;
 Testcase: 3.5.3.8d:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
@@ -603,12 +634,16 @@ before trig 3.5.3.8-1d
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2d';
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2d');
 select @test_var;
 @test_var
@@ -623,12 +658,12 @@ drop table if exists t2;
 create table t1 (f1 int) engine= memory;
 create table t2 (f2 int) engine= memory;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t2` TO 'test_yesprivs'@'localhost'
 GRANT SELECT, UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -644,10 +679,10 @@ ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 4
-select f2 from t2 order by f2;
+select f2 from t2;
 f2
 4
 use priv_db;
@@ -660,11 +695,11 @@ ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
-2
 4
-select f2 from t2 order by f2;
+2
+select f2 from t2;
 f2
 1
 use priv_db;
@@ -677,12 +712,12 @@ ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
-1
-2
 4
-select f2 from t2 order by f2;
+2
+1
+select f2 from t2;
 f2
 1
 select @aaa;
@@ -698,13 +733,13 @@ ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
-1
-1
-2
 4
-select f2 from t2 order by f2;
+2
+1
+1
+select f2 from t2;
 f2
 drop database if exists priv_db;
 drop user test_yesprivs@localhost;
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0407.result b/mysql-test/suite/funcs_1/r/memory_trig_0407.result
index 005fd43fb5b..588039983e2 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0407.result
@@ -89,18 +89,18 @@ Create trigger trg1 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.1';
 Use db_drop;
 Insert into t1 values ('Insert error 3.5.4.1');
-Select * from t1 order by f1;
+Select * from t1;
 f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers;
 trigger_schema	trigger_name	event_object_table
 Insert into t1 values ('Insert no trigger 3.5.4.1');
-Select * from t1 order by f1;
+Select * from t1;
 f1
-Insert no trigger 3.5.4.1
 Trigger 3.5.4.1
+Insert no trigger 3.5.4.1
 drop trigger trg1;
 drop database if exists db_drop;
 revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -254,7 +254,7 @@ use dbtest_one;
 Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Select * from dbtest_two.t2 order by f1;
+Select * from dbtest_two.t2;
 f1
 1st Insert 3.5.
 2nd Insert 3.5.
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_08.result b/mysql-test/suite/funcs_1/r/memory_trig_08.result
index ddc990d1919..9a14845d0eb 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result
@@ -135,10 +135,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
+select * from db_test.t1_i;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u order by u120;
+select * from db_test.t1_u;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -146,7 +146,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d order by d120;
+select * from db_test.t1_d;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -158,22 +158,14 @@ select @test_var;
 3.5.8.4 - single SQL - insert
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
-BEGIN
 insert into db_test.t1_i 
 values (new.f120, new.f136, new.f144, new.f163);
-END//
-Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-f120	f122	f136	f144	f163
-1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
-i120	i136	i144	i163
-1	00222	0000023456	1.050000000000000000000000000000
 update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 I	Test 3.5.8.4-Single Insert	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
+select * from db_test.t1_i;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
 I	00222	0000023456	1.050000000000000000000000000000
@@ -190,14 +182,14 @@ update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 U	Test 3.5.8.4-Single Update	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u order by u120;
+select * from db_test.t1_u;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 
 3.5.8.3/4 - single SQL - delete
 -------------------------------
@@ -210,7 +202,7 @@ f122='Test 3.5.8.4-Single Delete'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 D	Test 3.5.8.4-Single Delete	00444	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_d order by d120;
+select * from db_test.t1_d;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -257,29 +249,29 @@ END//
 set @test_var='Empty', @test_var2=0;
 Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	one	2nd else
 Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	two	2nd else
 D	Test 3.5.8.5-if	00102	two	2nd else
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
-d	Test 3.5.8.5-if	00010	three	2nd if
 D	Test 3.5.8.5-if	00101	three	2nd if
 D	Test 3.5.8.5-if	00102	three	2nd if
+d	Test 3.5.8.5-if	00010	three	2nd if
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
-d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00101	three	2nd else
 D	Test 3.5.8.5-if	00102	three	2nd else
+d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00103	three	2nd else
 create trigger trg3 before update on tb3 for each row
 BEGIN
@@ -339,20 +331,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -362,34 +354,34 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
-1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
 B	Test 3.5.8.5-case	00191	0000000016	1*0000099999
 C	Test 3.5.8.5-case	00200	0000000001	1*0000099999
+1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 Insert into tb3 (f120, f122, f136, f144) 
 values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 create trigger trg3a before update on tb3 for each row
 BEGIN
 CASE
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_09.result b/mysql-test/suite/funcs_1/r/memory_trig_09.result
index 0a25dbfc1ca..c1b9ec6d33f 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result
@@ -116,7 +116,7 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
 Insert into tb3 (f122, f136, f163) 
 values ('Test 3.5.9.3', 7, 123.17);
 Update tb3 Set f136=8 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -132,7 +132,7 @@ a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
 f118	f121	f122	f136	f163
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 @tr_var_b4_136, @tr_var_b4_163;
@@ -172,7 +172,7 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
 Insert into tb3 (f122, f136, f151, f163) 
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%' order by f163;
+where f122 like 'Test 3.5.9.4%';
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -190,9 +190,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1048	Column 'f136' cannot be null
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig' order by f163;
+where f122 like 'Test 3.5.9.4-trig';
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
index 451041575af..b93c67e894b 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
@@ -83,7 +83,7 @@ Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1);
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+from tb3 where f122 like 'Test 3.5.10.1/2/3%';
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -97,7 +97,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+where f122 like 'Test 3.5.10.1/2/3%';
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -111,7 +111,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+where f122 like 'Test 3.5.10.1/2/3%';
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -142,7 +142,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
-Select * from tb_load order by f1 limit 10;
+Select * from tb_load limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -237,7 +237,7 @@ insert into t3 (f1) values (new.f1+1000);
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3 order by f1;
+select * from t3;
 f1
 12
 102
@@ -272,17 +272,17 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1 order by f1;
+select * from t1;
 f1
 0
 1
-select * from t2 order by f2;
+select * from t2;
 f2
 2
-select * from t3 order by f3;
+select * from t3;
 f3
 3
-select * from t4 order by f4;
+select * from t4;
 f4
 4
 drop trigger tr1;
@@ -369,7 +369,7 @@ create table t4 (f4 tinyint) engine = memory;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL
+  `f1` int(11) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values (1);
 create trigger tr1 after insert on t1
@@ -381,16 +381,16 @@ for each row insert into t4 (f4) values (new.f3+1000);
 set autocommit=0;
 start transaction;
 insert into t1 values (1);
-ERROR 22003: Out of range value for column 'f4' at row 1
+ERROR 22003: Out of range value adjusted for column 'f4' at row 1
 commit;
-select * from t1 order by f1;
+select * from t1;
 f1
 1
 1
-select * from t2 order by f2;
+select * from t2;
 f2
 2
-select * from t3 order by f3;
+select * from t3;
 f3
 3
 drop trigger tr1;
diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
index 9267cc5a98b..516eef24439 100644
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -1930,7 +1930,7 @@ f1	f2
 2	two
 4	four
 INSERT INTO v1 VALUES(2,'two');
-ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '2' for key 1
 INSERT INTO v1 VALUES(3,'three');
 affected rows: 1
 INSERT INTO v1 VALUES(6,'six');
@@ -1949,7 +1949,7 @@ f1	f2
 3	three
 4	four
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
-ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '2' for key 1
 UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
@@ -1997,12 +1997,12 @@ DROP VIEW  IF EXISTS test.v1;
 CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
 ENGINE = memory;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1 order by f1, f2;
+SELECT * FROM t1;
 f1	f2
 A	1
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 f1	f2
 A	1
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -2010,7 +2010,7 @@ affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 INSERT INTO v1 VALUES('B',2);
 affected rows: 1
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 f1	f2
 A	2
 B	2
@@ -2018,7 +2018,7 @@ UPDATE v1 SET f2 = 4;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 INSERT INTO v1 VALUES('B',3);
 ERROR HY000: CHECK OPTION failed 'test.v1'
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 f1	f2
 A	2
 B	2
@@ -10585,7 +10585,7 @@ f1	f2	f3	f4
 DELETE FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '0' for key 1
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10654,7 +10654,7 @@ DROP VIEW v1;
 CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '0' for key 1
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10989,11 +10989,11 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(5)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11013,12 +11013,12 @@ f4x	char(5)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4x	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(10);
@@ -11036,14 +11036,14 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(10)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
 2	NULL	<-- 10 -->	t1 2
 2	NULL	<-- 10 -->	v1 2
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11072,7 +11072,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(8)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11081,7 +11081,7 @@ f1	f2	f4	report
 2	NULL	<-- 10 -	v1 2
 3	NULL	<-- 10 -	t1 3
 3	NULL	<-- 10 -	v1 3
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11105,7 +11105,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11116,7 +11116,7 @@ f1	f2	f4	report
 3	NULL	<-- 10 -	v1 3
 4	NULL	<------ 20 -------->	t1 4
 4	NULL	<------ 20 -------->	v1 4
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11144,7 +11144,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11157,7 +11157,7 @@ f1	f2	f4	report
 4	NULL	<------ 20 -------->	v1 4
 <------------- 30 ----------->	NULL	<------ 20 -------->	t1 5
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11181,7 +11181,7 @@ f4	varchar(20)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report
 -1	ABC	t1 0
 -1	ABC	v1 0
@@ -11195,7 +11195,7 @@ f1	f4	report
 <------------- 30 ----------->	<------ 20 -------->	t1 5
 <------------- 30 ----------->	<------ 20 -------->	v1 5
 ABC	<------ 20 -------->	t1 6
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
 INSERT INTO t1 SET f1 = 'ABC', f2 = '1500-12-04',
@@ -11214,7 +11214,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11230,7 +11230,7 @@ f1	f4	report	f2
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	1500-12-04
 ABC	<------ 20 -------->	v1 7	1500-12-04
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11264,7 +11264,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11279,10 +11279,10 @@ f1	f4	report	f2
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	NULL
-ABC	<------ 20 -------->	t1 8	-0.00033
 ABC	<------ 20 -------->	v1 7	NULL
+ABC	<------ 20 -------->	t1 8	-0.00033
 ABC	<------ 20 -------->	v1 8	-0.00033
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11297,8 +11297,8 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	-0.00033	<------ 20 -------->	t1 8
 ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	t1 8
 ABC	-0.00033	<------ 20 -------->	v1 8
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
 INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
@@ -11321,7 +11321,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report	f2	f3
 -1	ABC	t1 0	NULL	NULL
 -1	ABC	v1 0	NULL	NULL
@@ -11336,12 +11336,12 @@ f1	f4	report	f2	f3
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL	NULL
 ABC	<------ 20 -------->	t1 6	NULL	NULL
 ABC	<------ 20 -------->	t1 7	NULL	NULL
-ABC	<------ 20 -------->	t1 8	-0.00033	NULL
-ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
 ABC	<------ 20 -------->	v1 7	NULL	NULL
+ABC	<------ 20 -------->	t1 8	-0.00033	NULL
 ABC	<------ 20 -------->	v1 8	-0.00033	NULL
+ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
 ABC	<------ 20 -------->	v1 9a	-0.00033	NULL
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11356,10 +11356,10 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	-0.00033	<------ 20 -------->	t1 8
-ABC	-0.00033	<------ 20 -------->	t1 9
 ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	t1 8
 ABC	-0.00033	<------ 20 -------->	v1 8
+ABC	-0.00033	<------ 20 -------->	t1 9
 ABC	-0.00033	<------ 20 -------->	v1 9a
 DROP TABLE t1;
 DROP VIEW  v1;
@@ -11374,10 +11374,10 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1 order by f1, f2;
+SELECT * FROM t1;
 f1	f2
 ABC	3
-SELECT * FROM v1 order by 2;
+SELECT * FROM v1;
 f1	my_sqrt
 ABC	1.7320508075689
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
@@ -11390,21 +11390,21 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1 order by f1, f2;
+SELECT * FROM t1;
 f1	f2
 ABC	3
 ABC	DEF
-SELECT * FROM v1 order by 2;
+SELECT * FROM v1;
 f1	my_sqrt
-ABC	0
 ABC	1.7320508075689
+ABC	0
 SELECT SQRT('DEF');
 SQRT('DEF')
 0
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2 order by 1;
+SELECT * FROM v2;
 SQRT('DEF')
 0
 Warnings:
@@ -11414,27 +11414,27 @@ DESCRIBE v2;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM v2 order by 2;
+SELECT * FROM v2;
 f1	my_sqrt
-ABC	0
 ABC	1.7320508075689
-CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
-SELECT * FROM t2 order by 2;
-f1	my_sqrt
 ABC	0
+CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
+SELECT * FROM t2;
+f1	my_sqrt
 ABC	1.73205080756888
+ABC	0
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
-SELECT * FROM t2 order by 2;
+SELECT * FROM t2;
 f1	my_sqrt
-ABC	0
 ABC	1.73205080756888
+ABC	0
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
-SELECT * FROM t2 order by 2;
+SELECT * FROM t2;
 f1	my_sqrt
-ABC	0
 ABC	1.73205080756888
+ABC	0
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/myisam__datadict.result b/mysql-test/suite/funcs_1/r/myisam__datadict.result
index 36662ad9259..e9082e7aee7 100644
--- a/mysql-test/suite/funcs_1/r/myisam__datadict.result
+++ b/mysql-test/suite/funcs_1/r/myisam__datadict.result
@@ -463,21 +463,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -500,7 +489,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -521,7 +510,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -542,7 +531,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -563,7 +552,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -584,7 +573,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -602,199 +591,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	ENGINES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	EVENTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	FILES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PARTITIONS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PLUGINS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PROCESSLIST
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	REFERENTIAL_CONSTRAINTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -815,7 +615,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -836,7 +636,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -857,7 +657,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -875,52 +675,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -941,7 +699,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -962,7 +720,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -983,7 +741,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -1004,7 +762,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -1025,7 +783,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -1046,7 +804,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -1171,27 +929,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	event
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Events
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1213,27 +950,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	general_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	General log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1339,48 +1055,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	ndb_binlog_index
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	latin1_swedish_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	plugin
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_bin
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL plugins
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1423,48 +1097,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	servers
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL Foreign Servers table
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	slow_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Slow log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1930,12 +1562,6 @@ t.table_type, t.engine
 from schemata s inner join tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
-NULL	db_datadict	latin1	BASE TABLE	CSV
-NULL	db_datadict	latin1	BASE TABLE	CSV
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
@@ -1980,17 +1606,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1998,12 +1613,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
-NULL	information_schema	utf8	BASE TABLE	CSV
-NULL	information_schema	utf8	BASE TABLE	CSV
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
@@ -2048,17 +1657,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -2066,12 +1664,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
-NULL	mysql	latin1	BASE TABLE	CSV
-NULL	mysql	latin1	BASE TABLE	CSV
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
@@ -2116,17 +1708,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -2134,12 +1715,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
-NULL	test	latin1	BASE TABLE	CSV
-NULL	test	latin1	BASE TABLE	CSV
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
@@ -2184,17 +1759,6 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -2202,12 +1766,6 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
-NULL	test1	latin1	BASE TABLE	CSV
-NULL	test1	latin1	BASE TABLE	CSV
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
@@ -2252,17 +1810,6 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -2270,12 +1817,6 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
-NULL	test4	latin1	BASE TABLE	CSV
-NULL	test4	latin1	BASE TABLE	CSV
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
@@ -2320,17 +1861,6 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -2356,14 +1886,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -2378,75 +1908,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2459,60 +1920,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2543,10 +1950,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2567,20 +1970,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -2631,20 +2034,20 @@ NULL	db_datadict	v1	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_genera
 NULL	db_datadict	v1	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
 NULL	db_datadict	v1	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references	
-NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
-NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select,insert,update,references	
 NULL	db_datadict	vu	u	1		NO	varchar	81	243	NULL	NULL	utf8	utf8_general_ci	varchar(81)			select,insert,update,references	
@@ -2678,36 +2081,10 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
-NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
-NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
-NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
-NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
-NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
-NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
-NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
-NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
-NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -2741,16 +2118,6 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
-NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -2775,33 +2142,13 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
-NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
-NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -2846,16 +2193,14 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -3247,7 +2592,7 @@ cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
 eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
 select sum(id) from collations;
 sum(id)
-10840
+10741
 select collation_name, character_set_name into @x,@y
 from collation_character_set_applicability limit 1;
 select @x, @y;
@@ -3272,8 +2617,6 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -3285,8 +2628,6 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
-NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
-NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	1	NULL	NULL		BTREE	
@@ -3296,7 +2637,6 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -3327,7 +2667,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -3343,7 +2682,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -3354,7 +2692,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -3370,7 +2707,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -3381,7 +2717,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -3397,7 +2732,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -3415,8 +2749,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
-''@'%'	NULL	test	EVENT	NO
-''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -3431,8 +2763,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
-''@'%'	NULL	test\_%	EVENT	NO
-''@'%'	NULL	test\_%	TRIGGER	NO
 select * from table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 select * from column_privileges;
@@ -3441,7 +2771,6 @@ select * from table_constraints;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
@@ -3451,11 +2780,8 @@ NULL	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 NULL	mysql	name	mysql	help_topic	UNIQUE
 NULL	mysql	PRIMARY	mysql	host	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	ndb_binlog_index	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	proc	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	servers	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone_leap_second	PRIMARY KEY
@@ -3473,8 +2799,6 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_category	name	1	NULL	NULL	NULL	NULL
@@ -3486,8 +2810,6 @@ NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_topic	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -3496,7 +2818,6 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -3512,7 +2833,7 @@ NULL	mysql	PRIMARY	NULL	mysql	user	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	user	User	2	NULL	NULL	NULL	NULL
 select count(*) as max_recs from key_column_usage;
 max_recs
-45
+40
 select max(cardinality) from statistics;
 max(cardinality)
 393
@@ -3533,21 +2854,10 @@ Table or view 'COLLATIONS' is associated with the database 'information_schema'.
 Table or view 'COLLATION_CHARACTER_SET_APPLICABILITY' is associated with the database 'information_schema'.
 Table or view 'COLUMNS' is associated with the database 'information_schema'.
 Table or view 'COLUMN_PRIVILEGES' is associated with the database 'information_schema'.
-Table or view 'ENGINES' is associated with the database 'information_schema'.
-Table or view 'EVENTS' is associated with the database 'information_schema'.
-Table or view 'FILES' is associated with the database 'information_schema'.
-Table or view 'GLOBAL_STATUS' is associated with the database 'information_schema'.
-Table or view 'GLOBAL_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_schema'.
-Table or view 'PARTITIONS' is associated with the database 'information_schema'.
-Table or view 'PLUGINS' is associated with the database 'information_schema'.
-Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
-Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
 Table or view 'SCHEMA_PRIVILEGES' is associated with the database 'information_schema'.
-Table or view 'SESSION_STATUS' is associated with the database 'information_schema'.
-Table or view 'SESSION_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'STATISTICS' is associated with the database 'information_schema'.
 Table or view 'TABLES' is associated with the database 'information_schema'.
 Table or view 'TABLE_CONSTRAINTS' is associated with the database 'information_schema'.
@@ -3560,20 +2870,14 @@ Table or view 'vu' is associated with the database 'db_datadict'.
 Table or view 'vu1' is associated with the database 'db_datadict'.
 Table or view 'columns_priv' is associated with the database 'mysql'.
 Table or view 'db' is associated with the database 'mysql'.
-Table or view 'event' is associated with the database 'mysql'.
 Table or view 'func' is associated with the database 'mysql'.
-Table or view 'general_log' is associated with the database 'mysql'.
 Table or view 'help_category' is associated with the database 'mysql'.
 Table or view 'help_keyword' is associated with the database 'mysql'.
 Table or view 'help_relation' is associated with the database 'mysql'.
 Table or view 'help_topic' is associated with the database 'mysql'.
 Table or view 'host' is associated with the database 'mysql'.
-Table or view 'ndb_binlog_index' is associated with the database 'mysql'.
-Table or view 'plugin' is associated with the database 'mysql'.
 Table or view 'proc' is associated with the database 'mysql'.
 Table or view 'procs_priv' is associated with the database 'mysql'.
-Table or view 'servers' is associated with the database 'mysql'.
-Table or view 'slow_log' is associated with the database 'mysql'.
 Table or view 'tables_priv' is associated with the database 'mysql'.
 Table or view 'time_zone' is associated with the database 'mysql'.
 Table or view 'time_zone_leap_second' is associated with the database 'mysql'.
@@ -3620,12 +2924,12 @@ select * from table_constraints limit 0,5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
+NULL	mysql	name	mysql	help_category	UNIQUE
 select count(*) as max_recs from key_column_usage limit 0,5;
 max_recs
-45
+40
 select information_schema.tables.table_name as "table name",
 count(distinct(column_name)) as "no of columns in the table"
   from information_schema.tables left outer join information_schema.columns on
@@ -3638,36 +2942,19 @@ COLLATION_CHARACTER_SET_APPLICABILITY	2
 COLUMNS	19
 columns_priv	7
 COLUMN_PRIVILEGES	7
-db	22
-ENGINES	6
-event	18
-EVENTS	21
-FILES	38
+db	20
 func	4
-general_log	6
-GLOBAL_STATUS	2
-GLOBAL_VARIABLES	2
 help_category	4
 help_keyword	2
 help_relation	2
 help_topic	6
-host	20
+host	19
 KEY_COLUMN_USAGE	12
-ndb_binlog_index	7
-PARTITIONS	25
-plugin	2
-PLUGINS	10
 proc	16
-PROCESSLIST	8
 procs_priv	8
-REFERENTIAL_CONSTRAINTS	11
 ROUTINES	20
 SCHEMATA	5
 SCHEMA_PRIVILEGES	5
-servers	9
-SESSION_STATUS	2
-SESSION_VARIABLES	2
-slow_log	11
 STATISTICS	15
 t1	6
 t10	6
@@ -3693,7 +2980,7 @@ time_zone_name	2
 time_zone_transition	3
 time_zone_transition_type	5
 TRIGGERS	19
-user	39
+user	37
 USER_PRIVILEGES	4
 v1	21
 VIEWS	8
@@ -3707,7 +2994,7 @@ CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_P
 NULL	information_schema	utf8	utf8_general_ci	NULL
 SELECT * FROM tables                                LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
 SELECT * FROM columns                               LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3752,7 +3039,7 @@ TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATA
 SELECT * FROM parameters LIMIT 1;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT * FROM referential_constraints LIMIT 1;
-CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	UNIQUE_CONSTRAINT_CATALOG	UNIQUE_CONSTRAINT_SCHEMA	UNIQUE_CONSTRAINT_NAME	MATCH_OPTION	UPDATE_RULE	DELETE_RULE	TABLE_NAME	REFERENCED_TABLE_NAME
+ERROR 42S02: Unknown table 'referential_constraints' in information_schema
 use db_datadict;
 select * from schemata;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
@@ -3842,7 +3129,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3863,7 +3150,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3884,7 +3171,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3905,7 +3192,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3926,7 +3213,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3944,199 +3231,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	ENGINES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	EVENTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	FILES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	GLOBAL_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PARTITIONS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PLUGINS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	PROCESSLIST
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	REFERENTIAL_CONSTRAINTS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4157,7 +3255,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4178,7 +3276,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4199,7 +3297,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4217,52 +3315,10 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_STATUS
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
-TABLE_NAME	SESSION_VARIABLES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	NULL
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4283,7 +3339,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4304,7 +3360,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4325,7 +3381,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4346,7 +3402,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4367,7 +3423,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	10
+VERSION	0
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4388,7 +3444,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	10
+VERSION	0
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -4513,27 +3569,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	event
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Events
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4555,27 +3590,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	general_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	General log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4681,48 +3695,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	ndb_binlog_index
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	latin1_swedish_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	plugin
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_bin
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL plugins
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4765,48 +3737,6 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
-TABLE_NAME	servers
-TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	0
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	MySQL Foreign Servers table
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
-TABLE_NAME	slow_log
-TABLE_TYPE	BASE TABLE
-ENGINE	CSV
-VERSION	10
-ROW_FORMAT	Dynamic
-TABLE_ROWS	2
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	YYYY-MM-DD hh:mm:ss
-UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	YYYY-MM-DD hh:mm:ss
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	
-TABLE_COMMENT	Slow log
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -5272,12 +4202,6 @@ t.table_type, t.engine
 from information_schema.schemata s inner join information_schema.tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
-NULL	db_datadict	latin1	BASE TABLE	CSV
-NULL	db_datadict	latin1	BASE TABLE	CSV
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
-NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
@@ -5322,17 +4246,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
-NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -5340,12 +4253,6 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
-NULL	information_schema	utf8	BASE TABLE	CSV
-NULL	information_schema	utf8	BASE TABLE	CSV
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
-NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
@@ -5390,17 +4297,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
-NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -5408,12 +4304,6 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
-NULL	mysql	latin1	BASE TABLE	CSV
-NULL	mysql	latin1	BASE TABLE	CSV
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
-NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
@@ -5458,17 +4348,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MEMORY
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
-NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -5476,12 +4355,6 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
-NULL	test	latin1	BASE TABLE	CSV
-NULL	test	latin1	BASE TABLE	CSV
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
-NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
@@ -5526,17 +4399,6 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MEMORY
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
-NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -5544,12 +4406,6 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
-NULL	test1	latin1	BASE TABLE	CSV
-NULL	test1	latin1	BASE TABLE	CSV
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
-NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
@@ -5594,17 +4450,6 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MEMORY
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
-NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -5612,12 +4457,6 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
-NULL	test4	latin1	BASE TABLE	CSV
-NULL	test4	latin1	BASE TABLE	CSV
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
-NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
@@ -5662,17 +4501,6 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MEMORY
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
-NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -5747,9 +4575,9 @@ select * from information_schema.table_constraints limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
-NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
+NULL	mysql	name	mysql	help_category	UNIQUE
 select * from information_schema.key_column_usage limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Host	1	NULL	NULL	NULL	NULL
@@ -5759,7 +4587,7 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Table_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 select count(*) as max_recs from information_schema.key_column_usage limit 0, 5;
 max_recs
-45
+40
 
 root: check with db name
 ------------------------
@@ -5768,34 +4596,34 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-68
+51
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-867
+682
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
 SELECT COUNT(*) FROM information_schema. collations                            ;
 COUNT(*)
-127
+126
 SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ;
 COUNT(*)
-128
+126
 SELECT COUNT(*) FROM information_schema. routines                              ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM information_schema. statistics                            ;
 COUNT(*)
-48
+43
 SELECT COUNT(*) FROM information_schema. views                                 ;
 COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-81
+75
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
-32
+28
 SELECT COUNT(*) FROM information_schema. table_privileges                      ;
 COUNT(*)
 0
@@ -5804,18 +4632,17 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. table_constraints                     ;
 COUNT(*)
-24
+20
 SELECT COUNT(*) FROM information_schema. key_column_usage                      ;
 COUNT(*)
-45
+40
 SELECT COUNT(*) FROM information_schema. triggers                              ;
 COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. parameters ;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT COUNT(*) FROM information_schema. referential_constraints ;
-COUNT(*)
-0
+ERROR 42S02: Unknown table 'referential_constraints' in information_schema
 USE db_datadict;
 DROP VIEW v1, vu1, vu;
 DROP PROCEDURE db_datadict.sp_1;
@@ -5833,10 +4660,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-65
+48
 select count(*) as the_cols from columns;
 the_cols
-842
+657
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -5874,21 +4701,10 @@ information_schema, COLLATIONS
 information_schema, COLLATION_CHARACTER_SET_APPLICABILITY
 information_schema, COLUMNS
 information_schema, COLUMN_PRIVILEGES
-information_schema, ENGINES
-information_schema, EVENTS
-information_schema, FILES
-information_schema, GLOBAL_STATUS
-information_schema, GLOBAL_VARIABLES
 information_schema, KEY_COLUMN_USAGE
-information_schema, PARTITIONS
-information_schema, PLUGINS
-information_schema, PROCESSLIST
-information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
 information_schema, SCHEMA_PRIVILEGES
-information_schema, SESSION_STATUS
-information_schema, SESSION_VARIABLES
 information_schema, STATISTICS
 information_schema, TABLES
 information_schema, TABLE_CONSTRAINTS
@@ -5898,20 +4714,14 @@ information_schema, USER_PRIVILEGES
 information_schema, VIEWS
 mysql, columns_priv
 mysql, db
-mysql, event
 mysql, func
-mysql, general_log
 mysql, help_category
 mysql, help_keyword
 mysql, help_relation
 mysql, help_topic
 mysql, host
-mysql, ndb_binlog_index
-mysql, plugin
 mysql, proc
 mysql, procs_priv
-mysql, servers
-mysql, slow_log
 mysql, tables_priv
 mysql, time_zone
 mysql, time_zone_leap_second
@@ -5957,7 +4767,7 @@ NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
 select sum(ordinal_position) from key_column_usage;
 sum(ordinal_position)
-83
+77
 select * from schemata limit 0,5;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
 NULL	information_schema	utf8	utf8_general_ci	NULL
@@ -6004,8 +4814,6 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
-'root'@'127.0.0.1'
-'root'@'127.0.0.1'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -6031,10 +4839,6 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
-'root'@'<SERVER_NAME>'
-'root'@'<SERVER_NAME>'
-'root'@'localhost'
-'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
@@ -7543,7 +6347,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7559,7 +6362,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7570,7 +6372,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7586,7 +6387,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7597,7 +6397,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7613,7 +6412,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7694,7 +6492,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7710,7 +6507,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7721,7 +6517,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7737,7 +6532,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7748,7 +6542,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7764,7 +6557,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
@@ -7831,7 +6623,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7847,7 +6638,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7858,7 +6648,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7874,7 +6663,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7885,7 +6673,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7901,7 +6688,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7980,7 +6766,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7996,7 +6781,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -8007,7 +6791,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -8023,7 +6806,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -8034,7 +6816,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -8050,7 +6831,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -8125,7 +6905,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -8141,7 +6920,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -8152,7 +6930,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -8168,7 +6945,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -8179,7 +6955,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -8195,7 +6970,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -8283,7 +7057,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -8299,7 +7072,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -8310,7 +7082,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -8326,7 +7097,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -8337,7 +7107,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -8353,7 +7122,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
@@ -8419,7 +7187,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -8435,7 +7202,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -8446,7 +7212,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -8462,7 +7227,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -8473,7 +7237,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -8489,7 +7252,6 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -8531,21 +7293,10 @@ information_schema	COLLATIONS	MEMORY
 information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	MEMORY
 information_schema	COLUMNS	MyISAM
 information_schema	COLUMN_PRIVILEGES	MEMORY
-information_schema	ENGINES	MEMORY
-information_schema	EVENTS	MyISAM
-information_schema	FILES	MEMORY
-information_schema	GLOBAL_STATUS	MEMORY
-information_schema	GLOBAL_VARIABLES	MyISAM
 information_schema	KEY_COLUMN_USAGE	MEMORY
-information_schema	PARTITIONS	MyISAM
-information_schema	PLUGINS	MyISAM
-information_schema	PROCESSLIST	MyISAM
-information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
 information_schema	SCHEMA_PRIVILEGES	MEMORY
-information_schema	SESSION_STATUS	MEMORY
-information_schema	SESSION_VARIABLES	MyISAM
 information_schema	STATISTICS	MEMORY
 information_schema	TABLES	MEMORY
 information_schema	TABLE_CONSTRAINTS	MEMORY
@@ -8574,21 +7325,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -8615,21 +7355,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -8693,7 +7422,6 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
-filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -8708,7 +7436,6 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
-cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -8799,21 +7526,10 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
-ENGINES
-EVENTS
-FILES
-GLOBAL_STATUS
-GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
-PARTITIONS
-PLUGINS
-PROCESSLIST
-REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -8852,14 +7568,14 @@ COLUMNS	TABLE_CATALOG	varchar(4096)
 COLUMNS	TABLE_SCHEMA	varchar(64)
 COLUMNS	TABLE_NAME	varchar(64)
 COLUMNS	COLUMN_NAME	varchar(64)
-COLUMNS	ORDINAL_POSITION	bigint(21) unsigned
+COLUMNS	ORDINAL_POSITION	bigint(21)
 COLUMNS	COLUMN_DEFAULT	longtext
 COLUMNS	IS_NULLABLE	varchar(3)
 COLUMNS	DATA_TYPE	varchar(64)
-COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned
-COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21) unsigned
-COLUMNS	NUMERIC_PRECISION	bigint(21) unsigned
-COLUMNS	NUMERIC_SCALE	bigint(21) unsigned
+COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21)
+COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21)
+COLUMNS	NUMERIC_PRECISION	bigint(21)
+COLUMNS	NUMERIC_SCALE	bigint(21)
 COLUMNS	CHARACTER_SET_NAME	varchar(64)
 COLUMNS	COLLATION_NAME	varchar(64)
 COLUMNS	COLUMN_TYPE	longtext
@@ -8874,75 +7590,6 @@ COLUMN_PRIVILEGES	TABLE_NAME	varchar(64)
 COLUMN_PRIVILEGES	COLUMN_NAME	varchar(64)
 COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 COLUMN_PRIVILEGES	IS_GRANTABLE	varchar(3)
-ENGINES	ENGINE	varchar(64)
-ENGINES	SUPPORT	varchar(8)
-ENGINES	COMMENT	varchar(80)
-ENGINES	TRANSACTIONS	varchar(3)
-ENGINES	XA	varchar(3)
-ENGINES	SAVEPOINTS	varchar(3)
-EVENTS	EVENT_CATALOG	varchar(64)
-EVENTS	EVENT_SCHEMA	varchar(64)
-EVENTS	EVENT_NAME	varchar(64)
-EVENTS	DEFINER	varchar(77)
-EVENTS	TIME_ZONE	varchar(64)
-EVENTS	EVENT_BODY	varchar(8)
-EVENTS	EVENT_DEFINITION	longtext
-EVENTS	EVENT_TYPE	varchar(9)
-EVENTS	EXECUTE_AT	datetime
-EVENTS	INTERVAL_VALUE	varchar(256)
-EVENTS	INTERVAL_FIELD	varchar(18)
-EVENTS	SQL_MODE	longtext
-EVENTS	STARTS	datetime
-EVENTS	ENDS	datetime
-EVENTS	STATUS	varchar(18)
-EVENTS	ON_COMPLETION	varchar(12)
-EVENTS	CREATED	datetime
-EVENTS	LAST_ALTERED	datetime
-EVENTS	LAST_EXECUTED	datetime
-EVENTS	EVENT_COMMENT	varchar(64)
-EVENTS	ORIGINATOR	bigint(10)
-FILES	FILE_ID	bigint(4)
-FILES	FILE_NAME	varchar(64)
-FILES	FILE_TYPE	varchar(20)
-FILES	TABLESPACE_NAME	varchar(64)
-FILES	TABLE_CATALOG	varchar(64)
-FILES	TABLE_SCHEMA	varchar(64)
-FILES	TABLE_NAME	varchar(64)
-FILES	LOGFILE_GROUP_NAME	varchar(64)
-FILES	LOGFILE_GROUP_NUMBER	bigint(4)
-FILES	ENGINE	varchar(64)
-FILES	FULLTEXT_KEYS	varchar(64)
-FILES	DELETED_ROWS	bigint(4)
-FILES	UPDATE_COUNT	bigint(4)
-FILES	FREE_EXTENTS	bigint(4)
-FILES	TOTAL_EXTENTS	bigint(4)
-FILES	EXTENT_SIZE	bigint(4)
-FILES	INITIAL_SIZE	bigint(21) unsigned
-FILES	MAXIMUM_SIZE	bigint(21) unsigned
-FILES	AUTOEXTEND_SIZE	bigint(21) unsigned
-FILES	CREATION_TIME	datetime
-FILES	LAST_UPDATE_TIME	datetime
-FILES	LAST_ACCESS_TIME	datetime
-FILES	RECOVER_TIME	bigint(4)
-FILES	TRANSACTION_COUNTER	bigint(4)
-FILES	VERSION	bigint(21) unsigned
-FILES	ROW_FORMAT	varchar(10)
-FILES	TABLE_ROWS	bigint(21) unsigned
-FILES	AVG_ROW_LENGTH	bigint(21) unsigned
-FILES	DATA_LENGTH	bigint(21) unsigned
-FILES	MAX_DATA_LENGTH	bigint(21) unsigned
-FILES	INDEX_LENGTH	bigint(21) unsigned
-FILES	DATA_FREE	bigint(21) unsigned
-FILES	CREATE_TIME	datetime
-FILES	UPDATE_TIME	datetime
-FILES	CHECK_TIME	datetime
-FILES	CHECKSUM	bigint(21) unsigned
-FILES	STATUS	varchar(20)
-FILES	EXTRA	varchar(255)
-GLOBAL_STATUS	VARIABLE_NAME	varchar(64)
-GLOBAL_STATUS	VARIABLE_VALUE	decimal(22,7)
-GLOBAL_VARIABLES	VARIABLE_NAME	varchar(64)
-GLOBAL_VARIABLES	VARIABLE_VALUE	longtext
 KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar(4096)
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar(64)
@@ -8955,60 +7602,6 @@ KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar(64)
-PARTITIONS	TABLE_CATALOG	varchar(4096)
-PARTITIONS	TABLE_SCHEMA	varchar(64)
-PARTITIONS	TABLE_NAME	varchar(64)
-PARTITIONS	PARTITION_NAME	varchar(64)
-PARTITIONS	SUBPARTITION_NAME	varchar(64)
-PARTITIONS	PARTITION_ORDINAL_POSITION	bigint(21) unsigned
-PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint(21) unsigned
-PARTITIONS	PARTITION_METHOD	varchar(12)
-PARTITIONS	SUBPARTITION_METHOD	varchar(12)
-PARTITIONS	PARTITION_EXPRESSION	longtext
-PARTITIONS	SUBPARTITION_EXPRESSION	longtext
-PARTITIONS	PARTITION_DESCRIPTION	longtext
-PARTITIONS	TABLE_ROWS	bigint(21) unsigned
-PARTITIONS	AVG_ROW_LENGTH	bigint(21) unsigned
-PARTITIONS	DATA_LENGTH	bigint(21) unsigned
-PARTITIONS	MAX_DATA_LENGTH	bigint(21) unsigned
-PARTITIONS	INDEX_LENGTH	bigint(21) unsigned
-PARTITIONS	DATA_FREE	bigint(21) unsigned
-PARTITIONS	CREATE_TIME	datetime
-PARTITIONS	UPDATE_TIME	datetime
-PARTITIONS	CHECK_TIME	datetime
-PARTITIONS	CHECKSUM	bigint(21) unsigned
-PARTITIONS	PARTITION_COMMENT	varchar(80)
-PARTITIONS	NODEGROUP	varchar(12)
-PARTITIONS	TABLESPACE_NAME	varchar(64)
-PLUGINS	PLUGIN_NAME	varchar(64)
-PLUGINS	PLUGIN_VERSION	varchar(20)
-PLUGINS	PLUGIN_STATUS	varchar(10)
-PLUGINS	PLUGIN_TYPE	varchar(80)
-PLUGINS	PLUGIN_TYPE_VERSION	varchar(20)
-PLUGINS	PLUGIN_LIBRARY	varchar(64)
-PLUGINS	PLUGIN_LIBRARY_VERSION	varchar(20)
-PLUGINS	PLUGIN_AUTHOR	varchar(64)
-PLUGINS	PLUGIN_DESCRIPTION	longtext
-PLUGINS	PLUGIN_LICENSE	varchar(80)
-PROCESSLIST	ID	bigint(4)
-PROCESSLIST	USER	varchar(16)
-PROCESSLIST	HOST	varchar(64)
-PROCESSLIST	DB	varchar(64)
-PROCESSLIST	COMMAND	varchar(16)
-PROCESSLIST	TIME	bigint(7)
-PROCESSLIST	STATE	varchar(64)
-PROCESSLIST	INFO	longtext
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar(4096)
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar(64)
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar(64)
-REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar(64)
-REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar(64)
-REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar(64)
-REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar(64)
-REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar(64)
 ROUTINES	SPECIFIC_NAME	varchar(64)
 ROUTINES	ROUTINE_CATALOG	varchar(4096)
 ROUTINES	ROUTINE_SCHEMA	varchar(64)
@@ -9039,10 +7632,6 @@ SCHEMA_PRIVILEGES	TABLE_CATALOG	varchar(4096)
 SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar(64)
 SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar(3)
-SESSION_STATUS	VARIABLE_NAME	varchar(64)
-SESSION_STATUS	VARIABLE_VALUE	decimal(22,7)
-SESSION_VARIABLES	VARIABLE_NAME	varchar(64)
-SESSION_VARIABLES	VARIABLE_VALUE	longtext
 STATISTICS	TABLE_CATALOG	varchar(4096)
 STATISTICS	TABLE_SCHEMA	varchar(64)
 STATISTICS	TABLE_NAME	varchar(64)
@@ -9063,20 +7652,20 @@ TABLES	TABLE_SCHEMA	varchar(64)
 TABLES	TABLE_NAME	varchar(64)
 TABLES	TABLE_TYPE	varchar(64)
 TABLES	ENGINE	varchar(64)
-TABLES	VERSION	bigint(21) unsigned
+TABLES	VERSION	bigint(21)
 TABLES	ROW_FORMAT	varchar(10)
-TABLES	TABLE_ROWS	bigint(21) unsigned
-TABLES	AVG_ROW_LENGTH	bigint(21) unsigned
-TABLES	DATA_LENGTH	bigint(21) unsigned
-TABLES	MAX_DATA_LENGTH	bigint(21) unsigned
-TABLES	INDEX_LENGTH	bigint(21) unsigned
-TABLES	DATA_FREE	bigint(21) unsigned
-TABLES	AUTO_INCREMENT	bigint(21) unsigned
+TABLES	TABLE_ROWS	bigint(21)
+TABLES	AVG_ROW_LENGTH	bigint(21)
+TABLES	DATA_LENGTH	bigint(21)
+TABLES	MAX_DATA_LENGTH	bigint(21)
+TABLES	INDEX_LENGTH	bigint(21)
+TABLES	DATA_FREE	bigint(21)
+TABLES	AUTO_INCREMENT	bigint(21)
 TABLES	CREATE_TIME	datetime
 TABLES	UPDATE_TIME	datetime
 TABLES	CHECK_TIME	datetime
 TABLES	TABLE_COLLATION	varchar(64)
-TABLES	CHECKSUM	bigint(21) unsigned
+TABLES	CHECKSUM	bigint(21)
 TABLES	CREATE_OPTIONS	varchar(255)
 TABLES	TABLE_COMMENT	varchar(80)
 TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
@@ -9495,7 +8084,6 @@ cp1250_general_ci
 cp1250_czech_cs
 cp1250_croatian_ci
 cp1250_bin
-cp1250_polish_ci
 gbk_chinese_ci
 gbk_bin
 latin5_turkish_ci
@@ -9703,10 +8291,10 @@ MAXLEN	bigint(3)	NO		0
 SHOW CREATE TABLE character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
-  `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
+  `DESCRIPTION` varchar(60) NOT NULL default '',
+  `MAXLEN` bigint(3) NOT NULL default '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -9784,12 +8372,12 @@ SORTLEN	bigint(3)	NO		0
 SHOW CREATE TABLE collations;
 Table	Create Table
 COLLATIONS	CREATE TEMPORARY TABLE `COLLATIONS` (
-  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ID` bigint(11) NOT NULL DEFAULT '0',
-  `IS_DEFAULT` varchar(3) NOT NULL DEFAULT '',
-  `IS_COMPILED` varchar(3) NOT NULL DEFAULT '',
-  `SORTLEN` bigint(3) NOT NULL DEFAULT '0'
+  `COLLATION_NAME` varchar(64) NOT NULL default '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `ID` bigint(11) NOT NULL default '0',
+  `IS_DEFAULT` varchar(3) NOT NULL default '',
+  `IS_COMPILED` varchar(3) NOT NULL default '',
+  `SORTLEN` bigint(3) NOT NULL default '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -9860,7 +8448,6 @@ cp1250_general_ci	cp1250	26	Yes	Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_bin	cp1250	66		Yes	1
-cp1250_polish_ci	cp1250	99		Yes	1
 gbk_chinese_ci	gbk	28	Yes	Yes	1
 gbk_bin	gbk	87		Yes	1
 latin5_turkish_ci	latin5	30	Yes		0
@@ -9954,8 +8541,8 @@ CHARACTER_SET_NAME	varchar(64)	NO
 SHOW CREATE TABLE collation_character_set_applicability;
 Table	Create Table
 COLLATION_CHARACTER_SET_APPLICABILITY	CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
-  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT ''
+  `COLLATION_NAME` varchar(64) NOT NULL default '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -10008,7 +8595,6 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
-filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -10023,7 +8609,6 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
-cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -10122,13 +8707,13 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE column_privileges;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -10234,8 +8819,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_3'@'localhost'	NULL	db_datadict	SHOW VIEW	NO
 'user_3'@'localhost'	NULL	db_datadict	CREATE ROUTINE	NO
 'user_3'@'localhost'	NULL	db_datadict	ALTER ROUTINE	NO
-'user_3'@'localhost'	NULL	db_datadict	EVENT	NO
-'user_3'@'localhost'	NULL	db_datadict	TRIGGER	NO
 SELECT * FROM information_schema.column_privileges
 WHERE grantee LIKE "'user%"
  ORDER BY grantee, table_name, column_name, privilege_type;
@@ -10276,14 +8859,14 @@ TABLE_CATALOG	varchar(4096)	YES		NULL
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
 COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(21) unsigned	NO		0	
+ORDINAL_POSITION	bigint(21)	NO		0	
 COLUMN_DEFAULT	longtext	YES		NULL	
 IS_NULLABLE	varchar(3)	NO			
 DATA_TYPE	varchar(64)	NO			
-CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL	
-CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
-NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
-NUMERIC_SCALE	bigint(21) unsigned	YES		NULL	
+CHARACTER_MAXIMUM_LENGTH	bigint(21)	YES		NULL	
+CHARACTER_OCTET_LENGTH	bigint(21)	YES		NULL	
+NUMERIC_PRECISION	bigint(21)	YES		NULL	
+NUMERIC_SCALE	bigint(21)	YES		NULL	
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 COLUMN_TYPE	longtext	NO			
@@ -10294,25 +8877,25 @@ COLUMN_COMMENT	varchar(255)	NO
 SHOW CREATE TABLE columns;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ORDINAL_POSITION` bigint(21) unsigned NOT NULL DEFAULT '0',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `ORDINAL_POSITION` bigint(21) NOT NULL default '0',
   `COLUMN_DEFAULT` longtext,
-  `IS_NULLABLE` varchar(3) NOT NULL DEFAULT '',
-  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
-  `NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
-  `COLLATION_NAME` varchar(64) DEFAULT NULL,
+  `IS_NULLABLE` varchar(3) NOT NULL default '',
+  `DATA_TYPE` varchar(64) NOT NULL default '',
+  `CHARACTER_MAXIMUM_LENGTH` bigint(21) default NULL,
+  `CHARACTER_OCTET_LENGTH` bigint(21) default NULL,
+  `NUMERIC_PRECISION` bigint(21) default NULL,
+  `NUMERIC_SCALE` bigint(21) default NULL,
+  `CHARACTER_SET_NAME` varchar(64) default NULL,
+  `COLLATION_NAME` varchar(64) default NULL,
   `COLUMN_TYPE` longtext NOT NULL,
-  `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
-  `EXTRA` varchar(20) NOT NULL DEFAULT '',
-  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
-  `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
+  `COLUMN_KEY` varchar(3) NOT NULL default '',
+  `EXTRA` varchar(20) NOT NULL default '',
+  `PRIVILEGES` varchar(80) NOT NULL default '',
+  `COLUMN_COMMENT` varchar(255) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -10329,14 +8912,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -10384,14 +8967,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -10406,75 +8989,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10487,60 +9001,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10571,10 +9031,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10595,20 +9051,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10681,36 +9137,10 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
-NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
-NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
-NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
-NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
-NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
-NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
-NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
-NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
-NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -10744,16 +9174,6 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
-NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -10778,33 +9198,13 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
-NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
-NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
-NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
-NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -10849,16 +9249,14 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -11232,14 +9630,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -11254,75 +9652,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11335,60 +9664,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11419,10 +9694,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11443,20 +9714,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -11810,14 +10081,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -11832,75 +10103,6 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
-NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
-NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
-NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
-NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
-NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11913,60 +10115,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
-NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
-NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
-NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
-NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
-NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
-NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11997,10 +10145,6 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -12021,20 +10165,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -12394,9 +10538,7 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	set	latin1	latin1_swedish_ci
 1.0000	text	latin1	latin1_swedish_ci
 1.0000	tinytext	latin1	latin1_swedish_ci
-1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	longtext	utf8	utf8_general_ci
-1.0000	mediumtext	utf8	utf8_general_ci
 1.0000	text	utf8	utf8_general_ci
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
@@ -12484,14 +10626,14 @@ NULL	information_schema	COLLATIONS	SORTLEN	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	COLUMNS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21)
 1.0000	information_schema	COLUMNS	COLUMN_DEFAULT	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	COLUMNS	IS_NULLABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	COLUMNS	DATA_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	COLUMNS	CHARACTER_SET_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLLATION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	COLUMNS	COLUMN_TYPE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
@@ -12506,75 +10648,6 @@ NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(
 3.0000	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	ENGINES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	ENGINES	SUPPORT	varchar	8	24	utf8	utf8_general_ci	varchar(8)
-3.0000	information_schema	ENGINES	COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-3.0000	information_schema	ENGINES	TRANSACTIONS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	ENGINES	XA	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	ENGINES	SAVEPOINTS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	EVENTS	EVENT_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	EVENT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	EVENT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)
-3.0000	information_schema	EVENTS	TIME_ZONE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	EVENTS	EVENT_BODY	varchar	8	24	utf8	utf8_general_ci	varchar(8)
-1.0000	information_schema	EVENTS	EVENT_DEFINITION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-3.0000	information_schema	EVENTS	EVENT_TYPE	varchar	9	27	utf8	utf8_general_ci	varchar(9)
-NULL	information_schema	EVENTS	EXECUTE_AT	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	information_schema	EVENTS	INTERVAL_VALUE	varchar	256	768	utf8	utf8_general_ci	varchar(256)
-3.0000	information_schema	EVENTS	INTERVAL_FIELD	varchar	18	54	utf8	utf8_general_ci	varchar(18)
-1.0000	information_schema	EVENTS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-NULL	information_schema	EVENTS	STARTS	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	EVENTS	ENDS	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	information_schema	EVENTS	STATUS	varchar	18	54	utf8	utf8_general_ci	varchar(18)
-3.0000	information_schema	EVENTS	ON_COMPLETION	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-NULL	information_schema	EVENTS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	EVENTS	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	EVENTS	LAST_EXECUTED	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	information_schema	EVENTS	EVENT_COMMENT	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	EVENTS	ORIGINATOR	bigint	NULL	NULL	NULL	NULL	bigint(10)
-NULL	information_schema	FILES	FILE_ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	FILES	FILE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	FILE_TYPE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	FILES	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	TABLE_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	LOGFILE_GROUP_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	FILES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	FILES	FULLTEXT_KEYS	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	FILES	DELETED_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	UPDATE_COUNT	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	FREE_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	TOTAL_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	EXTENT_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	INITIAL_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	MAXIMUM_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	AUTOEXTEND_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	CREATION_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	LAST_UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	LAST_ACCESS_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	RECOVER_TIME	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	TRANSACTION_COUNTER	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	FILES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	FILES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-NULL	information_schema	FILES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	FILES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	FILES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	FILES	STATUS	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	FILES	EXTRA	varchar	255	765	utf8	utf8_general_ci	varchar(255)
-3.0000	information_schema	GLOBAL_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
-3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -12587,60 +10660,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint	NU
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-3.0000	information_schema	PARTITIONS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	PARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PARTITIONS	SUBPARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	PARTITIONS	PARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-3.0000	information_schema	PARTITIONS	SUBPARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-1.0000	information_schema	PARTITIONS	PARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-1.0000	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-1.0000	information_schema	PARTITIONS	PARTITION_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-NULL	information_schema	PARTITIONS	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	PARTITIONS	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	PARTITIONS	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	PARTITIONS	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	information_schema	PARTITIONS	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-3.0000	information_schema	PARTITIONS	PARTITION_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-3.0000	information_schema	PARTITIONS	NODEGROUP	varchar	12	36	utf8	utf8_general_ci	varchar(12)
-3.0000	information_schema	PARTITIONS	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PLUGINS	PLUGIN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PLUGINS	PLUGIN_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	PLUGINS	PLUGIN_STATUS	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-3.0000	information_schema	PLUGINS	PLUGIN_TYPE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-3.0000	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
-3.0000	information_schema	PLUGINS	PLUGIN_AUTHOR	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	PLUGINS	PLUGIN_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-3.0000	information_schema	PLUGINS	PLUGIN_LICENSE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
-NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	PROCESSLIST	USER	varchar	16	48	utf8	utf8_general_ci	varchar(16)
-3.0000	information_schema	PROCESSLIST	HOST	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PROCESSLIST	DB	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	PROCESSLIST	COMMAND	varchar	16	48	utf8	utf8_general_ci	varchar(16)
-NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
-3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	SPECIFIC_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	ROUTINE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -12671,10 +10690,6 @@ NULL	information_schema	ROUTINES	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datet
 3.0000	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	SESSION_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
-3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -12695,20 +10710,20 @@ NULL	information_schema	STATISTICS	SUB_PART	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	TABLES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	TABLE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	TABLES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
-NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
 NULL	information_schema	TABLES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 3.0000	information_schema	TABLES	TABLE_COLLATION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	TABLES	CREATE_OPTIONS	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 3.0000	information_schema	TABLES	TABLE_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
 3.0000	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
@@ -12781,36 +10796,10 @@ NULL	mysql	columns_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	db	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	db	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	db	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	event	db	char	64	192	utf8	utf8_bin	char(64)
-3.0000	mysql	event	name	char	64	192	utf8	utf8_general_ci	char(64)
-1.0000	mysql	event	body	longblob	4294967295	4294967295	NULL	NULL	longblob
-3.0000	mysql	event	definer	char	77	231	utf8	utf8_bin	char(77)
-NULL	mysql	event	execute_at	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	event	interval_value	int	NULL	NULL	NULL	NULL	int(11)
-3.0000	mysql	event	interval_field	enum	18	54	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')
-NULL	mysql	event	created	timestamp	NULL	NULL	NULL	NULL	timestamp
-NULL	mysql	event	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
-NULL	mysql	event	last_executed	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	event	starts	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	event	ends	datetime	NULL	NULL	NULL	NULL	datetime
-3.0000	mysql	event	status	enum	18	54	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')
-3.0000	mysql	event	on_completion	enum	8	24	utf8	utf8_general_ci	enum('DROP','PRESERVE')
-3.0000	mysql	event	sql_mode	set	431	1293	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')
-3.0000	mysql	event	comment	char	64	192	utf8	utf8_bin	char(64)
-NULL	mysql	event	originator	int	NULL	NULL	NULL	NULL	int(10)
-1.0000	mysql	event	time_zone	char	64	64	latin1	latin1_swedish_ci	char(64)
 3.0000	mysql	func	name	char	64	192	utf8	utf8_bin	char(64)
 NULL	mysql	func	ret	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 3.0000	mysql	func	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	func	type	enum	9	27	utf8	utf8_general_ci	enum('function','aggregate')
-NULL	mysql	general_log	event_time	timestamp	NULL	NULL	NULL	NULL	timestamp
-1.0000	mysql	general_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
-NULL	mysql	general_log	thread_id	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	general_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
-3.0000	mysql	general_log	command_type	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-1.0000	mysql	general_log	argument	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_category	parent_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
@@ -12844,16 +10833,6 @@ NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5)
 3.0000	mysql	host	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	host	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-NULL	mysql	ndb_binlog_index	Position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-1.0000	mysql	ndb_binlog_index	File	varchar	255	255	latin1	latin1_swedish_ci	varchar(255)
-NULL	mysql	ndb_binlog_index	epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	inserts	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	updates	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	deletes	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	schemaops	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-3.0000	mysql	plugin	name	char	64	192	utf8	utf8_bin	char(64)
-3.0000	mysql	plugin	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	proc	db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	proc	name	char	64	192	utf8	utf8_general_ci	char(64)
 3.0000	mysql	proc	type	enum	9	27	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')
@@ -12878,33 +10857,13 @@ NULL	mysql	proc	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	procs_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 3.0000	mysql	procs_priv	Proc_priv	set	27	81	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')
 NULL	mysql	procs_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	servers	Server_name	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Host	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Db	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Username	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Password	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	servers	Port	int	NULL	NULL	NULL	NULL	int(4)
-3.0000	mysql	servers	Socket	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Wrapper	char	64	192	utf8	utf8_general_ci	char(64)
-3.0000	mysql	servers	Owner	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	slow_log	start_time	timestamp	NULL	NULL	NULL	NULL	timestamp
-1.0000	mysql	slow_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
-NULL	mysql	slow_log	query_time	time	NULL	NULL	NULL	NULL	time
-NULL	mysql	slow_log	lock_time	time	NULL	NULL	NULL	NULL	time
-NULL	mysql	slow_log	rows_sent	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	slow_log	rows_examined	int	NULL	NULL	NULL	NULL	int(11)
-3.0000	mysql	slow_log	db	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
-NULL	mysql	slow_log	last_insert_id	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	slow_log	insert_id	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	slow_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
-1.0000	mysql	slow_log	sql_text	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 3.0000	mysql	tables_priv	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	tables_priv	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	User	char	16	48	utf8	utf8_bin	char(16)
 3.0000	mysql	tables_priv	Table_name	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 NULL	mysql	tables_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	tables_priv	Table_priv	set	98	294	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')
+3.0000	mysql	tables_priv	Table_priv	set	90	270	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')
 3.0000	mysql	tables_priv	Column_priv	set	31	93	utf8	utf8_general_ci	set('Select','Insert','Update','References')
 NULL	mysql	time_zone	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	time_zone	Use_leap_seconds	enum	1	3	utf8	utf8_general_ci	enum('Y','N')
@@ -12949,8 +10908,6 @@ NULL	mysql	time_zone_transition_type	Is_DST	tinyint	NULL	NULL	NULL	NULL	tinyint(
 3.0000	mysql	user	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Create_user_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	user	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
-3.0000	mysql	user	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	ssl_type	enum	9	27	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')
 1.0000	mysql	user	ssl_cipher	blob	65535	65535	NULL	NULL	blob
 1.0000	mysql	user	x509_issuer	blob	65535	65535	NULL	NULL	blob
@@ -13336,18 +11293,18 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE key_column_usage;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT '0',
-  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL,
-  `REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL,
-  `REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL,
-  `REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL
+  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `ORDINAL_POSITION` bigint(10) NOT NULL default '0',
+  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) default NULL,
+  `REFERENCED_TABLE_SCHEMA` varchar(64) default NULL,
+  `REFERENCED_TABLE_NAME` varchar(64) default NULL,
+  `REFERENCED_COLUMN_NAME` varchar(64) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13408,8 +11365,6 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_keyword	help_keyword_id	1	NULL	NULL	NULL	NULL
@@ -13418,8 +11373,6 @@ NULL	mysql	PRIMARY	NULL	mysql	help_relation	help_topic_id	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -13428,7 +11381,6 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
-NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -13490,26 +11442,26 @@ DEFINER	varchar(77)	NO
 SHOW CREATE TABLE routines;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_CATALOG` varchar(4096) DEFAULT NULL,
-  `ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT '',
-  `DTD_IDENTIFIER` varchar(64) DEFAULT NULL,
-  `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
+  `SPECIFIC_NAME` varchar(64) NOT NULL default '',
+  `ROUTINE_CATALOG` varchar(4096) default NULL,
+  `ROUTINE_SCHEMA` varchar(64) NOT NULL default '',
+  `ROUTINE_NAME` varchar(64) NOT NULL default '',
+  `ROUTINE_TYPE` varchar(9) NOT NULL default '',
+  `DTD_IDENTIFIER` varchar(64) default NULL,
+  `ROUTINE_BODY` varchar(8) NOT NULL default '',
   `ROUTINE_DEFINITION` longtext,
-  `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
-  `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
-  `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
-  `IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
-  `SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(64) DEFAULT NULL,
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
-  `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `EXTERNAL_NAME` varchar(64) default NULL,
+  `EXTERNAL_LANGUAGE` varchar(64) default NULL,
+  `PARAMETER_STYLE` varchar(8) NOT NULL default '',
+  `IS_DETERMINISTIC` varchar(3) NOT NULL default '',
+  `SQL_DATA_ACCESS` varchar(64) NOT NULL default '',
+  `SQL_PATH` varchar(64) default NULL,
+  `SECURITY_TYPE` varchar(7) NOT NULL default '',
+  `CREATED` datetime NOT NULL default '0000-00-00 00:00:00',
+  `LAST_ALTERED` datetime NOT NULL default '0000-00-00 00:00:00',
   `SQL_MODE` longtext NOT NULL,
-  `ROUTINE_COMMENT` varchar(64) NOT NULL DEFAULT '',
-  `DEFINER` varchar(77) NOT NULL DEFAULT ''
+  `ROUTINE_COMMENT` varchar(64) NOT NULL default '',
+  `DEFINER` varchar(77) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13834,11 +11786,11 @@ SQL_PATH	varchar(4096)	YES		NULL
 SHOW CREATE TABLE schemata;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(4096) DEFAULT NULL,
-  `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(4096) DEFAULT NULL
+  `CATALOG_NAME` varchar(4096) default NULL,
+  `SCHEMA_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL default '',
+  `SQL_PATH` varchar(4096) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13917,12 +11869,12 @@ CONSTRAINT_TYPE	varchar(64)	NO
 SHOW CREATE TABLE table_constraints;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_TYPE` varchar(64) NOT NULL DEFAULT ''
+  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `CONSTRAINT_TYPE` varchar(64) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -13997,12 +11949,12 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE table_privileges;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14056,7 +12008,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
-'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = USER();
@@ -14066,7 +12017,7 @@ SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = "'user_2'@'localhost'";
 USER()	COUNT(*)
-user_2@localhost	12
+user_2@localhost	11
 connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -14086,7 +12037,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
-'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'user_1'@'localhost'	NULL	db_datadict	tb1	SELECT	NO
 'user_3'@'localhost'	NULL	db_datadict	tb3	SELECT	NO
 	
@@ -14109,46 +12059,46 @@ TABLE_SCHEMA	varchar(64)	NO
 TABLE_NAME	varchar(64)	NO			
 TABLE_TYPE	varchar(64)	NO			
 ENGINE	varchar(64)	YES		NULL	
-VERSION	bigint(21) unsigned	YES		NULL	
+VERSION	bigint(21)	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
-TABLE_ROWS	bigint(21) unsigned	YES		NULL	
-AVG_ROW_LENGTH	bigint(21) unsigned	YES		NULL	
-DATA_LENGTH	bigint(21) unsigned	YES		NULL	
-MAX_DATA_LENGTH	bigint(21) unsigned	YES		NULL	
-INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
-DATA_FREE	bigint(21) unsigned	YES		NULL	
-AUTO_INCREMENT	bigint(21) unsigned	YES		NULL	
+TABLE_ROWS	bigint(21)	YES		NULL	
+AVG_ROW_LENGTH	bigint(21)	YES		NULL	
+DATA_LENGTH	bigint(21)	YES		NULL	
+MAX_DATA_LENGTH	bigint(21)	YES		NULL	
+INDEX_LENGTH	bigint(21)	YES		NULL	
+DATA_FREE	bigint(21)	YES		NULL	
+AUTO_INCREMENT	bigint(21)	YES		NULL	
 CREATE_TIME	datetime	YES		NULL	
 UPDATE_TIME	datetime	YES		NULL	
 CHECK_TIME	datetime	YES		NULL	
 TABLE_COLLATION	varchar(64)	YES		NULL	
-CHECKSUM	bigint(21) unsigned	YES		NULL	
+CHECKSUM	bigint(21)	YES		NULL	
 CREATE_OPTIONS	varchar(255)	YES		NULL	
 TABLE_COMMENT	varchar(80)	NO			
 SHOW CREATE TABLE tables;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `ENGINE` varchar(64) DEFAULT NULL,
-  `VERSION` bigint(21) unsigned DEFAULT NULL,
-  `ROW_FORMAT` varchar(10) DEFAULT NULL,
-  `TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
-  `AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
-  `DATA_FREE` bigint(21) unsigned DEFAULT NULL,
-  `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL,
-  `UPDATE_TIME` datetime DEFAULT NULL,
-  `CHECK_TIME` datetime DEFAULT NULL,
-  `TABLE_COLLATION` varchar(64) DEFAULT NULL,
-  `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
-  `CREATE_OPTIONS` varchar(255) DEFAULT NULL,
-  `TABLE_COMMENT` varchar(80) NOT NULL DEFAULT ''
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `TABLE_TYPE` varchar(64) NOT NULL default '',
+  `ENGINE` varchar(64) default NULL,
+  `VERSION` bigint(21) default NULL,
+  `ROW_FORMAT` varchar(10) default NULL,
+  `TABLE_ROWS` bigint(21) default NULL,
+  `AVG_ROW_LENGTH` bigint(21) default NULL,
+  `DATA_LENGTH` bigint(21) default NULL,
+  `MAX_DATA_LENGTH` bigint(21) default NULL,
+  `INDEX_LENGTH` bigint(21) default NULL,
+  `DATA_FREE` bigint(21) default NULL,
+  `AUTO_INCREMENT` bigint(21) default NULL,
+  `CREATE_TIME` datetime default NULL,
+  `UPDATE_TIME` datetime default NULL,
+  `CHECK_TIME` datetime default NULL,
+  `TABLE_COLLATION` varchar(64) default NULL,
+  `CHECKSUM` bigint(21) default NULL,
+  `CREATE_OPTIONS` varchar(255) default NULL,
+  `TABLE_COMMENT` varchar(80) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14166,20 +12116,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 
@@ -14207,33 +12157,22 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14258,33 +12197,22 @@ connect(localhost,user_2,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14307,33 +12235,22 @@ connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14357,33 +12274,22 @@ root@localhost	db_datadict
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -14393,20 +12299,14 @@ NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	N
 NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
 NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Column privileges
 NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Database privileges
-NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Events
 NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		User defined functions
-NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		General log
 NULL	mysql	help_category	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help categories
 NULL	mysql	help_keyword	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help keywords
 NULL	mysql	help_relation	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		keyword-topic relation
 NULL	mysql	help_topic	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help topics
 NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Host privileges;  Merged with database privileges
-NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		MySQL plugins
 NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Stored Procedures
 NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Procedure privileges
-NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		MySQL Foreign Servers table
-NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Slow log
 NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Table privileges
 NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zones
 NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Leap seconds information for time zones
@@ -14454,14 +12354,14 @@ SECURITY_TYPE	varchar(7)	NO
 SHOW CREATE TABLE views;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
   `VIEW_DEFINITION` longtext NOT NULL,
-  `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
-  `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
-  `DEFINER` varchar(77) NOT NULL DEFAULT '',
-  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT ''
+  `CHECK_OPTION` varchar(8) NOT NULL default '',
+  `IS_UPDATABLE` varchar(3) NOT NULL default '',
+  `DEFINER` varchar(77) NOT NULL default '',
+  `SECURITY_TYPE` varchar(7) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14549,21 +12449,21 @@ COMMENT	varchar(16)	YES		NULL
 SHOW CREATE TABLE statistics;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `NON_UNIQUE` bigint(1) NOT NULL DEFAULT '0',
-  `INDEX_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `INDEX_NAME` varchar(64) NOT NULL DEFAULT '',
-  `SEQ_IN_INDEX` bigint(2) NOT NULL DEFAULT '0',
-  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
-  `COLLATION` varchar(1) DEFAULT NULL,
-  `CARDINALITY` bigint(21) DEFAULT NULL,
-  `SUB_PART` bigint(3) DEFAULT NULL,
-  `PACKED` varchar(10) DEFAULT NULL,
-  `NULLABLE` varchar(3) NOT NULL DEFAULT '',
-  `INDEX_TYPE` varchar(16) NOT NULL DEFAULT '',
-  `COMMENT` varchar(16) DEFAULT NULL
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `NON_UNIQUE` bigint(1) NOT NULL default '0',
+  `INDEX_SCHEMA` varchar(64) NOT NULL default '',
+  `INDEX_NAME` varchar(64) NOT NULL default '',
+  `SEQ_IN_INDEX` bigint(2) NOT NULL default '0',
+  `COLUMN_NAME` varchar(64) NOT NULL default '',
+  `COLLATION` varchar(1) default NULL,
+  `CARDINALITY` bigint(21) default NULL,
+  `SUB_PART` bigint(3) default NULL,
+  `PACKED` varchar(10) default NULL,
+  `NULLABLE` varchar(3) NOT NULL default '',
+  `INDEX_TYPE` varchar(16) NOT NULL default '',
+  `COMMENT` varchar(16) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14641,8 +12541,6 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -14654,8 +12552,6 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
-NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
-NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	0	NULL	NULL		BTREE	
@@ -14665,7 +12561,6 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -14715,11 +12610,11 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE schema_privileges;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14766,8 +12661,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
-''@'%'	NULL	test	EVENT	NO
-''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -14782,8 +12675,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
-''@'%'	NULL	test\_%	EVENT	NO
-''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401502,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -14831,8 +12722,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
-''@'%'	NULL	test	EVENT	NO
-''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -14847,8 +12736,6 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
-''@'%'	NULL	test\_%	EVENT	NO
-''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401503_1,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -14885,10 +12772,10 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE user_privileges;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
-  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
-  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
+  `GRANTEE` varchar(81) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) default NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
+  `IS_GRANTABLE` varchar(3) NOT NULL default ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -14930,10 +12817,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14953,10 +12840,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -14968,10 +12855,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -14995,10 +12882,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -15015,10 +12902,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -15032,10 +12919,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -15047,10 +12934,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT SELECT ON *.* TO 'user_1'@'localhost' WITH GRANT OPTION
@@ -15094,10 +12981,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -15147,10 +13034,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -15162,10 +13049,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -15182,10 +13069,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -15208,10 +13095,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -15268,23 +13155,23 @@ DEFINER	longtext	NO
 SHOW CREATE TABLE triggers;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(4096) DEFAULT NULL,
-  `TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_CATALOG` varchar(4096) DEFAULT NULL,
-  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '',
-  `ACTION_ORDER` bigint(4) NOT NULL DEFAULT '0',
+  `TRIGGER_CATALOG` varchar(4096) default NULL,
+  `TRIGGER_SCHEMA` varchar(64) NOT NULL default '',
+  `TRIGGER_NAME` varchar(64) NOT NULL default '',
+  `EVENT_MANIPULATION` varchar(6) NOT NULL default '',
+  `EVENT_OBJECT_CATALOG` varchar(4096) default NULL,
+  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL default '',
+  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL default '',
+  `ACTION_ORDER` bigint(4) NOT NULL default '0',
   `ACTION_CONDITION` longtext,
   `ACTION_STATEMENT` longtext NOT NULL,
-  `ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '',
-  `ACTION_TIMING` varchar(6) NOT NULL DEFAULT '',
-  `ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL,
-  `ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL,
-  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '',
-  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '',
-  `CREATED` datetime DEFAULT NULL,
+  `ACTION_ORIENTATION` varchar(9) NOT NULL default '',
+  `ACTION_TIMING` varchar(6) NOT NULL default '',
+  `ACTION_REFERENCE_OLD_TABLE` varchar(64) default NULL,
+  `ACTION_REFERENCE_NEW_TABLE` varchar(64) default NULL,
+  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL default '',
+  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL default '',
+  `CREATED` datetime default NULL,
   `SQL_MODE` longtext NOT NULL,
   `DEFINER` longtext NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -15332,70 +13219,11 @@ ERROR 42S02: Unknown table 'parameters' in information_schema
 
 Testcase 3.2.20.1:
 --------------------------------------------------------------------------------
+
+checking a table that will be implemented later
+-----------------------------------------------
 DESC referential_constraints;
-Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-UNIQUE_CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
-UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
-UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
-MATCH_OPTION	varchar(64)	NO			
-UPDATE_RULE	varchar(64)	NO			
-DELETE_RULE	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-REFERENCED_TABLE_NAME	varchar(64)	NO			
-USE information_schema;
-DESC referential_constraints;
-Field	Type	Null	Key	Default	Extra
-CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
-CONSTRAINT_SCHEMA	varchar(64)	NO			
-CONSTRAINT_NAME	varchar(64)	NO			
-UNIQUE_CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
-UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
-UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
-MATCH_OPTION	varchar(64)	NO			
-UPDATE_RULE	varchar(64)	NO			
-DELETE_RULE	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-REFERENCED_TABLE_NAME	varchar(64)	NO			
-SHOW CREATE TABLE referential_constraints;
-Table	Create Table
-REFERENTIAL_CONSTRAINTS	CREATE TEMPORARY TABLE `REFERENTIAL_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `UNIQUE_CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
-  `UNIQUE_CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
-  `UNIQUE_CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
-  `MATCH_OPTION` varchar(64) NOT NULL DEFAULT '',
-  `UPDATE_RULE` varchar(64) NOT NULL DEFAULT '',
-  `DELETE_RULE` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `REFERENCED_TABLE_NAME` varchar(64) NOT NULL DEFAULT ''
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
-SELECT COUNT(*) FROM information_schema.columns
-WHERE table_schema = 'information_schema'
-  AND table_name   = 'referential_constraints'
-ORDER BY ordinal_position;
-COUNT(*)
-11
-SELECT * FROM information_schema.columns
-WHERE table_schema = 'information_schema'
-  AND table_name   = 'referential_constraints'
-ORDER BY ordinal_position;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ERROR 42S02: Unknown table 'referential_constraints' in information_schema
 
 *** End of Data Dictionary Tests ***
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result
index ab4508fb302..13fffecd365 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -9,7 +9,7 @@ CREATE TABLE t1_values
 id BIGINT AUTO_INCREMENT,
 select_id BIGINT,
 PRIMARY KEY(id)
-) ENGINE = <engine_to_be_tested>;
+) ENGINE = 'MYISAM' ;
 ALTER TABLE t1_values ADD my_char_30        CHAR(30);
 ALTER TABLE t1_values ADD my_varchar_1000   VARCHAR(1000);
 ALTER TABLE t1_values ADD my_binary_30      BINARY(30);
@@ -123,8 +123,10 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = 1758;
-INSERT INTO t1_values SET select_id = @select_id,
-my_double = +1.758E+3;
+
+some statements disabled because of
+Bug#12440: CAST(data type DOUBLE AS TIME) strange results
+--------------------------------------------------------------------------------
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -133,20 +135,29 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_binary_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '-3333.3333';
-INSERT INTO t1_values SET select_id = @select_id,
-my_double = -0.33333333E+4;
 
-"Attention: CAST --> SIGNED INTEGER
-            Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Status: To be fixed later"
+some statements disabled because of
+Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian
 --------------------------------------------------------------------------------
 
-"Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5913"
+"Attention: CAST --> SIGNED INTEGER
+            The file with expected results suffers from
+            Bug#5083 Big integer values are inserted as negative into 
+                     decimal/string columns
+            Bug#5913 Traditional mode: BIGINT range not correctly delimited
+            Both have the status: To be fixed later"
 --------------------------------------------------------------------------------
 
 some statements disabled because of
-Bug#5913 Traditional mode: BIGINT range not correctly delimited
+Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result
+--------------------------------------------------------------------------------
+
+"Attention: CAST --> UNSIGNED INTEGER
+            The file with expected results suffers from Bug 5083 5913 9809"
+--------------------------------------------------------------------------------
+
+some statements disabled because of
+Bugs#8663: cant use bgint unsigned as input to cast
 --------------------------------------------------------------------------------
 SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values';
@@ -164,6 +175,11 @@ SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values';
+
+"Attention: IF(my_year IS NULL, ...
+            The file with expected results suffers from 
+            Bug#11689. successful CREATE VIEW but SELECT on view fails."
+--------------------------------------------------------------------------------
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_varchar_1000),
@@ -186,7 +202,7 @@ SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
 
 "Attention: LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', <numeric column>)
-            The file with expected results suffers from Bug 10963"
+            The file with expected results suffers from Bug 10963 11728"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
 because there are 32/64 Bit differences
 --------------------------------------------------------------------------------
@@ -200,9 +216,8 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select = 
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -284,19 +299,19 @@ SET sql_mode = '';
 --------------------------------------------------------------------------------
 CREATE VIEW v1 AS SELECT my_char_30, id FROM t1_values;
 SELECT my_char_30, id FROM t1_values
-WHERE select_id = 190 OR select_id IS NULL order by id;
+WHERE select_id = 187 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 190 OR select_id IS NULL) order by id;
+WHERE select_id = 187 OR select_id IS NULL);
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values;
 SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values
-WHERE select_id = 189 OR select_id IS NULL order by id;
+WHERE select_id = 186 OR select_id IS NULL;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -308,7 +323,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select concat(_latin1'A',`t1_values`.`my_char_30`) AS `CONCAT('A',my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 189 OR select_id IS NULL) order by id;
+WHERE select_id = 186 OR select_id IS NULL);
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -322,13 +337,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 188 OR select_id IS NULL order by id;
+WHERE select_id = 185 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varbinary_1000`) AS `LTRIM(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 188 OR select_id IS NULL) order by id;
+WHERE select_id = 185 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -336,13 +351,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL order by id;
+WHERE select_id = 184 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_binary_30`) AS `LTRIM(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL) order by id;
+WHERE select_id = 184 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -350,13 +365,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL order by id;
+WHERE select_id = 183 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varchar_1000`) AS `LTRIM(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL) order by id;
+WHERE select_id = 183 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -364,13 +379,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL order by id;
+WHERE select_id = 182 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_char_30`) AS `LTRIM(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL) order by id;
+WHERE select_id = 182 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -378,13 +393,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL order by id;
+WHERE select_id = 181 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varbinary_1000`) AS `LOWER(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL) order by id;
+WHERE select_id = 181 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -392,13 +407,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL order by id;
+WHERE select_id = 180 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_binary_30`) AS `LOWER(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL) order by id;
+WHERE select_id = 180 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -406,13 +421,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL order by id;
+WHERE select_id = 179 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LOWER(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL) order by id;
+WHERE select_id = 179 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -420,13 +435,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL order by id;
+WHERE select_id = 178 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_char_30`) AS `LOWER(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL) order by id;
+WHERE select_id = 178 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -434,13 +449,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL order by id;
+WHERE select_id = 177 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_decimal`) AS `LOCATE('-', ' - -ABC', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL) order by id;
+WHERE select_id = 177 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -448,13 +463,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL order by id;
+WHERE select_id = 176 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_double`) AS `LOCATE('-', ' - -ABC', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL) order by id;
+WHERE select_id = 176 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -462,13 +477,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL order by id;
+WHERE select_id = 175 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_bigint`) AS `LOCATE('-', ' - -ABC', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL) order by id;
+WHERE select_id = 175 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -476,13 +491,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL order by id;
+WHERE select_id = 174 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varbinary_1000`,3) AS `LOCATE('-', my_varbinary_1000, 3)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL) order by id;
+WHERE select_id = 174 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -490,13 +505,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL order by id;
+WHERE select_id = 173 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_binary_30`,3) AS `LOCATE('-', my_binary_30, 3)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL) order by id;
+WHERE select_id = 173 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -504,13 +519,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL order by id;
+WHERE select_id = 172 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varchar_1000`,3) AS `LOCATE('-', my_varchar_1000, 3)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL) order by id;
+WHERE select_id = 172 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -518,13 +533,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL order by id;
+WHERE select_id = 171 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_char_30`,3) AS `LOCATE('-', my_char_30, 3)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL) order by id;
+WHERE select_id = 171 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -532,13 +547,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL order by id;
+WHERE select_id = 170 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varbinary_1000, my_binary_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL) order by id;
+WHERE select_id = 170 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -546,13 +561,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL order by id;
+WHERE select_id = 169 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varbinary_1000, my_varchar_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL) order by id;
+WHERE select_id = 169 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -560,13 +575,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL order by id;
+WHERE select_id = 168 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varbinary_1000, my_char_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL) order by id;
+WHERE select_id = 168 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -574,13 +589,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL order by id;
+WHERE select_id = 167 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varbinary_1000, my_varbinary_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL) order by id;
+WHERE select_id = 167 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -588,13 +603,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL order by id;
+WHERE select_id = 166 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_binary_30, my_varbinary_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL) order by id;
+WHERE select_id = 166 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -602,13 +617,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL order by id;
+WHERE select_id = 165 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_binary_30, my_varchar_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL) order by id;
+WHERE select_id = 165 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -616,13 +631,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL order by id;
+WHERE select_id = 164 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_binary_30, my_char_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL) order by id;
+WHERE select_id = 164 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -630,13 +645,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL order by id;
+WHERE select_id = 163 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_binary_30, my_binary_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL) order by id;
+WHERE select_id = 163 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -644,13 +659,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL order by id;
+WHERE select_id = 162 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varchar_1000, my_varbinary_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL) order by id;
+WHERE select_id = 162 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -658,13 +673,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL order by id;
+WHERE select_id = 161 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varchar_1000, my_binary_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL) order by id;
+WHERE select_id = 161 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -672,13 +687,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL order by id;
+WHERE select_id = 160 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varchar_1000, my_char_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL) order by id;
+WHERE select_id = 160 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -686,13 +701,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL order by id;
+WHERE select_id = 159 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varchar_1000, my_varchar_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL) order by id;
+WHERE select_id = 159 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -700,13 +715,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL order by id;
+WHERE select_id = 158 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_char_30, my_varbinary_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL) order by id;
+WHERE select_id = 158 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -714,13 +729,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL order by id;
+WHERE select_id = 157 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_char_30, my_binary_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL) order by id;
+WHERE select_id = 157 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -728,13 +743,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL order by id;
+WHERE select_id = 156 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_char_30, my_varchar_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL) order by id;
+WHERE select_id = 156 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -742,13 +757,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values;
 SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL order by id;
+WHERE select_id = 155 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_char_30, my_char_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL) order by id;
+WHERE select_id = 155 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -756,13 +771,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL order by id;
+WHERE select_id = 154 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varbinary_1000`) AS `LOCATE('char', my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL) order by id;
+WHERE select_id = 154 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -770,13 +785,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL order by id;
+WHERE select_id = 153 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_binary_30`) AS `LOCATE('char', my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL) order by id;
+WHERE select_id = 153 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -784,13 +799,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL order by id;
+WHERE select_id = 152 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varchar_1000`) AS `LOCATE('char', my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL) order by id;
+WHERE select_id = 152 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -798,46 +813,46 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL order by id;
+WHERE select_id = 151 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `LOCATE('char', my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL) order by id;
+WHERE select_id = 151 OR select_id IS NULL);
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+CREATE VIEW v1 AS SELECT LOAD_FILE('../log/current_test'), id FROM t1_values;
+SELECT LOAD_FILE('../log/current_test'), id FROM t1_values
+WHERE select_id = 150 OR select_id IS NULL;
+LOAD_FILE('../log/current_test')	id
+CURRENT_TEST: myisam_func_view
 	1
-äÄ@
+CURRENT_TEST: myisam_func_view
 	2
-äÄ@
+CURRENT_TEST: myisam_func_view
 	3
-äÄ@
+CURRENT_TEST: myisam_func_view
 	4
-äÄ@
+CURRENT_TEST: myisam_func_view
 	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../log/current_test') AS `LOAD_FILE('../log/current_test')`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+WHERE select_id = 150 OR select_id IS NULL);
+LOAD_FILE('../log/current_test')	id
+CURRENT_TEST: myisam_func_view
 	1
-äÄ@
+CURRENT_TEST: myisam_func_view
 	2
-äÄ@
+CURRENT_TEST: myisam_func_view
 	3
-äÄ@
+CURRENT_TEST: myisam_func_view
 	4
-äÄ@
+CURRENT_TEST: myisam_func_view
 	5
 DROP VIEW v1;
 
@@ -846,13 +861,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL order by id;
+WHERE select_id = 149 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varbinary_1000`) AS `LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL) order by id;
+WHERE select_id = 149 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -860,13 +875,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL order by id;
+WHERE select_id = 148 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_binary_30`) AS `LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL) order by id;
+WHERE select_id = 148 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -874,13 +889,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL order by id;
+WHERE select_id = 147 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varchar_1000`) AS `LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL) order by id;
+WHERE select_id = 147 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -888,19 +903,19 @@ CREATE VIEW v1 AS SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL order by id;
+WHERE select_id = 146 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_char_30`) AS `LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL) order by id;
+WHERE select_id = 146 OR select_id IS NULL);
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values;
 SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL order by id;
+WHERE select_id = 145 OR select_id IS NULL;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -915,7 +930,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL) order by id;
+WHERE select_id = 145 OR select_id IS NULL);
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -930,7 +945,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values;
 SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL order by id;
+WHERE select_id = 144 OR select_id IS NULL;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -942,7 +957,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varbinary_1000`,2) AS `LEFT(my_varbinary_1000, 2)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL) order by id;
+WHERE select_id = 144 OR select_id IS NULL);
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -954,7 +969,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values;
 SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL order by id;
+WHERE select_id = 143 OR select_id IS NULL;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -966,7 +981,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL) order by id;
+WHERE select_id = 143 OR select_id IS NULL);
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -978,7 +993,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values;
 SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL order by id;
+WHERE select_id = 142 OR select_id IS NULL;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -990,7 +1005,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varchar_1000`,2) AS `LEFT(my_varchar_1000, 2)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL) order by id;
+WHERE select_id = 142 OR select_id IS NULL);
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1002,7 +1017,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values;
 SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL order by id;
+WHERE select_id = 141 OR select_id IS NULL;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1014,7 +1029,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_char_30`,2) AS `LEFT(my_char_30, 2)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL) order by id;
+WHERE select_id = 141 OR select_id IS NULL);
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1028,13 +1043,13 @@ CREATE VIEW v1 AS SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL order by id;
+WHERE select_id = 140 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LCASE(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL) order by id;
+WHERE select_id = 140 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -1042,13 +1057,13 @@ CREATE VIEW v1 AS SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values;
 SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL order by id;
+WHERE select_id = 139 OR select_id IS NULL;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `INSTR(my_char_30, 'char')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL) order by id;
+WHERE select_id = 139 OR select_id IS NULL);
 DROP VIEW v1;
 
 
@@ -1056,7 +1071,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL order by id;
+WHERE select_id = 138 OR select_id IS NULL;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1068,7 +1083,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varbinary_1000`) AS `BIT_LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL) order by id;
+WHERE select_id = 138 OR select_id IS NULL);
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1082,7 +1097,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL order by id;
+WHERE select_id = 137 OR select_id IS NULL;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1094,7 +1109,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL) order by id;
+WHERE select_id = 137 OR select_id IS NULL);
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1108,7 +1123,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL order by id;
+WHERE select_id = 136 OR select_id IS NULL;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1120,7 +1135,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varchar_1000`) AS `BIT_LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL) order by id;
+WHERE select_id = 136 OR select_id IS NULL);
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1134,7 +1149,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL order by id;
+WHERE select_id = 135 OR select_id IS NULL;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1146,7 +1161,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_char_30`) AS `BIT_LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL) order by id;
+WHERE select_id = 135 OR select_id IS NULL);
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1160,7 +1175,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values;
 SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL order by id;
+WHERE select_id = 134 OR select_id IS NULL;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1172,7 +1187,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_year`,_latin1'IS_NULL') AS `IFNULL(my_year,'IS_NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL) order by id;
+WHERE select_id = 134 OR select_id IS NULL);
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1186,7 +1201,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values;
 SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL order by id;
+WHERE select_id = 133 OR select_id IS NULL;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1198,7 +1213,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_time`,_latin1'IS_NULL') AS `IFNULL(my_time,'IS_NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL) order by id;
+WHERE select_id = 133 OR select_id IS NULL);
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1212,7 +1227,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values;
 SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL order by id;
+WHERE select_id = 132 OR select_id IS NULL;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1224,7 +1239,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_timestamp`,_latin1'IS_NULL') AS `IFNULL(my_timestamp,'IS_NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL) order by id;
+WHERE select_id = 132 OR select_id IS NULL);
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1238,7 +1253,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values;
 SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL order by id;
+WHERE select_id = 131 OR select_id IS NULL;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1250,7 +1265,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_date`,_latin1'IS_NULL') AS `IFNULL(my_date,'IS_NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL) order by id;
+WHERE select_id = 131 OR select_id IS NULL);
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1264,7 +1279,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values;
 SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL order by id;
+WHERE select_id = 130 OR select_id IS NULL;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1276,7 +1291,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_datetime`,_latin1'IS_NULL') AS `IFNULL(my_datetime,'IS_NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL) order by id;
+WHERE select_id = 130 OR select_id IS NULL);
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1290,7 +1305,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values;
 SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL order by id;
+WHERE select_id = 129 OR select_id IS NULL;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1302,7 +1317,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_double`,_latin1'IS_NULL') AS `IFNULL(my_double,'IS_NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL) order by id;
+WHERE select_id = 129 OR select_id IS NULL);
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1316,7 +1331,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values;
 SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL order by id;
+WHERE select_id = 128 OR select_id IS NULL;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1328,7 +1343,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_decimal`,_latin1'IS_NULL') AS `IFNULL(my_decimal,'IS_NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL) order by id;
+WHERE select_id = 128 OR select_id IS NULL);
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1342,7 +1357,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values;
 SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL order by id;
+WHERE select_id = 127 OR select_id IS NULL;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1354,7 +1369,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_bigint`,_latin1'IS_NULL') AS `IFNULL(my_bigint,'IS_NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL) order by id;
+WHERE select_id = 127 OR select_id IS NULL);
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1368,7 +1383,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL order by id;
+WHERE select_id = 126 OR select_id IS NULL;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1380,7 +1395,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varbinary_1000`,_latin1'IS_NULL') AS `IFNULL(my_varbinary_1000,'IS_NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL) order by id;
+WHERE select_id = 126 OR select_id IS NULL);
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1394,7 +1409,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values;
 SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL order by id;
+WHERE select_id = 125 OR select_id IS NULL;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1406,7 +1421,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,_latin1'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL) order by id;
+WHERE select_id = 125 OR select_id IS NULL);
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1420,7 +1435,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values;
 SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL order by id;
+WHERE select_id = 124 OR select_id IS NULL;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1432,7 +1447,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varchar_1000`,_latin1'IS_NULL') AS `IFNULL(my_varchar_1000,'IS_NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL) order by id;
+WHERE select_id = 124 OR select_id IS NULL);
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1446,7 +1461,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values;
 SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL order by id;
+WHERE select_id = 123 OR select_id IS NULL;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1458,7 +1473,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_char_30`,_latin1'IS_NULL') AS `IFNULL(my_char_30,'IS_NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL) order by id;
+WHERE select_id = 123 OR select_id IS NULL);
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1472,7 +1487,7 @@ CREATE VIEW v1 AS SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values;
 SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL order by id;
+WHERE select_id = 122 OR select_id IS NULL;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1486,7 +1501,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL) order by id;
+WHERE select_id = 122 OR select_id IS NULL);
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1501,7 +1516,7 @@ CREATE VIEW v1 AS SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values;
 SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL order by id;
+WHERE select_id = 121 OR select_id IS NULL;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1515,7 +1530,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL) order by id;
+WHERE select_id = 121 OR select_id IS NULL);
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1530,7 +1545,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL order by id;
+WHERE select_id = 120 OR select_id IS NULL;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1544,7 +1559,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL) order by id;
+WHERE select_id = 120 OR select_id IS NULL);
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1559,7 +1574,7 @@ CREATE VIEW v1 AS SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values;
 SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL order by id;
+WHERE select_id = 119 OR select_id IS NULL;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1573,7 +1588,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL) order by id;
+WHERE select_id = 119 OR select_id IS NULL);
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1588,7 +1603,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values;
 SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL order by id;
+WHERE select_id = 118 OR select_id IS NULL;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1602,7 +1617,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL) order by id;
+WHERE select_id = 118 OR select_id IS NULL);
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1617,7 +1632,7 @@ CREATE VIEW v1 AS SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values;
 SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL order by id;
+WHERE select_id = 117 OR select_id IS NULL;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1631,7 +1646,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL) order by id;
+WHERE select_id = 117 OR select_id IS NULL);
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1646,7 +1661,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values;
 SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL order by id;
+WHERE select_id = 116 OR select_id IS NULL;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1660,7 +1675,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL) order by id;
+WHERE select_id = 116 OR select_id IS NULL);
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1675,7 +1690,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values;
 SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL order by id;
+WHERE select_id = 115 OR select_id IS NULL;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1689,7 +1704,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL) order by id;
+WHERE select_id = 115 OR select_id IS NULL);
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1704,7 +1719,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL order by id;
+WHERE select_id = 114 OR select_id IS NULL;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1718,7 +1733,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL) order by id;
+WHERE select_id = 114 OR select_id IS NULL);
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1733,7 +1748,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL order by id;
+WHERE select_id = 113 OR select_id IS NULL;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1747,7 +1762,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL) order by id;
+WHERE select_id = 113 OR select_id IS NULL);
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1762,7 +1777,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL order by id;
+WHERE select_id = 112 OR select_id IS NULL;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1776,7 +1791,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL) order by id;
+WHERE select_id = 112 OR select_id IS NULL);
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1791,7 +1806,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values;
 SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL order by id;
+WHERE select_id = 111 OR select_id IS NULL;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1805,7 +1820,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL) order by id;
+WHERE select_id = 111 OR select_id IS NULL);
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1820,7 +1835,7 @@ CREATE VIEW v1 AS SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values;
 SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL order by id;
+WHERE select_id = 110 OR select_id IS NULL;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1832,7 +1847,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_year`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_year, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL) order by id;
+WHERE select_id = 110 OR select_id IS NULL);
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1846,7 +1861,7 @@ CREATE VIEW v1 AS SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values;
 SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL order by id;
+WHERE select_id = 109 OR select_id IS NULL;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1858,7 +1873,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_time`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_time, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL) order by id;
+WHERE select_id = 109 OR select_id IS NULL);
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1872,7 +1887,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL order by id;
+WHERE select_id = 108 OR select_id IS NULL;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1884,7 +1899,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_timestamp`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL) order by id;
+WHERE select_id = 108 OR select_id IS NULL);
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1898,7 +1913,7 @@ CREATE VIEW v1 AS SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values;
 SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL order by id;
+WHERE select_id = 107 OR select_id IS NULL;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1910,7 +1925,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_date`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_date, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL) order by id;
+WHERE select_id = 107 OR select_id IS NULL);
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1924,7 +1939,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values;
 SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL order by id;
+WHERE select_id = 106 OR select_id IS NULL;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1936,7 +1951,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_datetime`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL) order by id;
+WHERE select_id = 106 OR select_id IS NULL);
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1950,7 +1965,7 @@ CREATE VIEW v1 AS SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values;
 SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL order by id;
+WHERE select_id = 105 OR select_id IS NULL;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1962,7 +1977,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_double`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_double, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL) order by id;
+WHERE select_id = 105 OR select_id IS NULL);
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1976,7 +1991,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values;
 SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL order by id;
+WHERE select_id = 104 OR select_id IS NULL;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1988,7 +2003,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_decimal`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL) order by id;
+WHERE select_id = 104 OR select_id IS NULL);
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2002,7 +2017,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values;
 SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL order by id;
+WHERE select_id = 103 OR select_id IS NULL;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2014,7 +2029,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_bigint`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL) order by id;
+WHERE select_id = 103 OR select_id IS NULL);
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2028,7 +2043,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL order by id;
+WHERE select_id = 102 OR select_id IS NULL;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2040,7 +2055,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varbinary_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL) order by id;
+WHERE select_id = 102 OR select_id IS NULL);
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2054,7 +2069,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL order by id;
+WHERE select_id = 101 OR select_id IS NULL;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2071,7 +2086,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_binary_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL) order by id;
+WHERE select_id = 101 OR select_id IS NULL);
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2090,7 +2105,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL order by id;
+WHERE select_id = 100 OR select_id IS NULL;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2102,7 +2117,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varchar_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL) order by id;
+WHERE select_id = 100 OR select_id IS NULL);
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2116,7 +2131,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values;
 SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL order by id;
+WHERE select_id = 99 OR select_id IS NULL;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2131,7 +2146,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_char_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL) order by id;
+WHERE select_id = 99 OR select_id IS NULL);
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2148,7 +2163,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL order by id;
+WHERE select_id = 98 OR select_id IS NULL;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2160,7 +2175,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using koi8r) AS `CONVERT(my_varbinary_1000 USING koi8r)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL) order by id;
+WHERE select_id = 98 OR select_id IS NULL);
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2174,7 +2189,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING koi8r), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL order by id;
+WHERE select_id = 97 OR select_id IS NULL;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2186,7 +2201,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL) order by id;
+WHERE select_id = 97 OR select_id IS NULL);
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2200,7 +2215,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING koi8r), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL order by id;
+WHERE select_id = 96 OR select_id IS NULL;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2212,7 +2227,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL) order by id;
+WHERE select_id = 96 OR select_id IS NULL);
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2226,7 +2241,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING koi8r), 
 my_char_30, id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL order by id;
+WHERE select_id = 95 OR select_id IS NULL;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2238,7 +2253,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL) order by id;
+WHERE select_id = 95 OR select_id IS NULL);
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2252,7 +2267,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING utf8), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL order by id;
+WHERE select_id = 94 OR select_id IS NULL;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2264,7 +2279,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using utf8) AS `CONVERT(my_varbinary_1000 USING utf8)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL) order by id;
+WHERE select_id = 94 OR select_id IS NULL);
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2278,7 +2293,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING utf8), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL order by id;
+WHERE select_id = 93 OR select_id IS NULL;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2290,7 +2305,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL) order by id;
+WHERE select_id = 93 OR select_id IS NULL);
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2304,7 +2319,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING utf8), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL order by id;
+WHERE select_id = 92 OR select_id IS NULL;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2316,7 +2331,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using utf8) AS `CONVERT(my_varchar_1000 USING utf8)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL) order by id;
+WHERE select_id = 92 OR select_id IS NULL);
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2330,7 +2345,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL order by id;
+WHERE select_id = 91 OR select_id IS NULL;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2342,7 +2357,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using utf8) AS `CONVERT(my_char_30 USING utf8)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL) order by id;
+WHERE select_id = 91 OR select_id IS NULL);
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2356,7 +2371,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL order by id;
+WHERE select_id = 90 OR select_id IS NULL;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2368,7 +2383,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as unsigned) AS `CAST(my_year AS UNSIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL) order by id;
+WHERE select_id = 90 OR select_id IS NULL);
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2382,7 +2397,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL order by id;
+WHERE select_id = 89 OR select_id IS NULL;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2400,7 +2415,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL) order by id;
+WHERE select_id = 89 OR select_id IS NULL);
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2420,7 +2435,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL order by id;
+WHERE select_id = 88 OR select_id IS NULL;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2438,7 +2453,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL) order by id;
+WHERE select_id = 88 OR select_id IS NULL);
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2458,7 +2473,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL order by id;
+WHERE select_id = 87 OR select_id IS NULL;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2475,7 +2490,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL) order by id;
+WHERE select_id = 87 OR select_id IS NULL);
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2494,7 +2509,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL order by id;
+WHERE select_id = 86 OR select_id IS NULL;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2511,7 +2526,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL) order by id;
+WHERE select_id = 86 OR select_id IS NULL);
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2530,7 +2545,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL order by id;
+WHERE select_id = 85 OR select_id IS NULL;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2546,7 +2561,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL) order by id;
+WHERE select_id = 85 OR select_id IS NULL);
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2564,7 +2579,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL order by id;
+WHERE select_id = 84 OR select_id IS NULL;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2576,7 +2591,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL) order by id;
+WHERE select_id = 84 OR select_id IS NULL);
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2590,7 +2605,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL order by id;
+WHERE select_id = 83 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2607,7 +2622,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL) order by id;
+WHERE select_id = 83 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2626,7 +2641,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL order by id;
+WHERE select_id = 82 OR select_id IS NULL;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2644,7 +2659,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL) order by id;
+WHERE select_id = 82 OR select_id IS NULL);
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2664,7 +2679,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL order by id;
+WHERE select_id = 81 OR select_id IS NULL;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2681,7 +2696,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL) order by id;
+WHERE select_id = 81 OR select_id IS NULL);
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2700,7 +2715,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL order by id;
+WHERE select_id = 80 OR select_id IS NULL;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2717,7 +2732,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL) order by id;
+WHERE select_id = 80 OR select_id IS NULL);
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2736,7 +2751,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL order by id;
+WHERE select_id = 79 OR select_id IS NULL;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2748,7 +2763,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as signed) AS `CAST(my_year AS SIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL) order by id;
+WHERE select_id = 79 OR select_id IS NULL);
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2762,7 +2777,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL order by id;
+WHERE select_id = 78 OR select_id IS NULL;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2779,7 +2794,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL) order by id;
+WHERE select_id = 78 OR select_id IS NULL);
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2798,7 +2813,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL order by id;
+WHERE select_id = 77 OR select_id IS NULL;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2816,7 +2831,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL) order by id;
+WHERE select_id = 77 OR select_id IS NULL);
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2836,7 +2851,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL order by id;
+WHERE select_id = 76 OR select_id IS NULL;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2853,7 +2868,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL) order by id;
+WHERE select_id = 76 OR select_id IS NULL);
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2872,7 +2887,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL order by id;
+WHERE select_id = 75 OR select_id IS NULL;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2889,7 +2904,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL) order by id;
+WHERE select_id = 75 OR select_id IS NULL);
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2904,43 +2919,11 @@ Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_double AS SIGNED INTEGER),
-my_double, id FROM t1_values;
-SELECT CAST(my_double AS SIGNED INTEGER),
-my_double, id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL order by id;
-CAST(my_double AS SIGNED INTEGER)	my_double	id
-NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
-0	0	4
--1	-1	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
-SHOW CREATE VIEW v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
-SELECT v1.* FROM v1
-WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL) order by id;
-CAST(my_double AS SIGNED INTEGER)	my_double	id
-NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
-0	0	4
--1	-1	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
-DROP VIEW v1;
-
-
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL order by id;
+WHERE select_id = 74 OR select_id IS NULL;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2955,7 +2938,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL) order by id;
+WHERE select_id = 74 OR select_id IS NULL);
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2972,7 +2955,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL order by id;
+WHERE select_id = 73 OR select_id IS NULL;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2984,7 +2967,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as signed) AS `CAST(my_bigint AS SIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL) order by id;
+WHERE select_id = 73 OR select_id IS NULL);
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2998,7 +2981,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL order by id;
+WHERE select_id = 72 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3014,7 +2997,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL) order by id;
+WHERE select_id = 72 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3032,7 +3015,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL order by id;
+WHERE select_id = 71 OR select_id IS NULL;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3049,7 +3032,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL) order by id;
+WHERE select_id = 71 OR select_id IS NULL);
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3068,7 +3051,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL order by id;
+WHERE select_id = 70 OR select_id IS NULL;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3084,7 +3067,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL) order by id;
+WHERE select_id = 70 OR select_id IS NULL);
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3102,7 +3085,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL order by id;
+WHERE select_id = 69 OR select_id IS NULL;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3118,7 +3101,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL) order by id;
+WHERE select_id = 69 OR select_id IS NULL);
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3136,25 +3119,25 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL order by id;
+WHERE select_id = 68 OR select_id IS NULL;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901	1901	2
-2155	2155	3
-2000	2000	4
-2005	2005	5
+1901.00	1901	2
+2155.00	2155	3
+2000.00	2000	4
+2005.00	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL) order by id;
+WHERE select_id = 68 OR select_id IS NULL);
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901	1901	2
-2155	2155	3
-2000	2000	4
-2005	2005	5
+1901.00	1901	2
+2155.00	2155	3
+2000.00	2000	4
+2005.00	2005	5
 DROP VIEW v1;
 
 
@@ -3162,25 +3145,25 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL order by id;
+WHERE select_id = 67 OR select_id IS NULL;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959	-838:59:59	2
-8385959	838:59:59	3
-130000	13:00:00	4
-100000	10:00:00	5
+-8385959.00	-838:59:59	2
+8385959.00	838:59:59	3
+130000.00	13:00:00	4
+100000.00	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL) order by id;
+WHERE select_id = 67 OR select_id IS NULL);
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959	-838:59:59	2
-8385959	838:59:59	3
-130000	13:00:00	4
-100000	10:00:00	5
+-8385959.00	-838:59:59	2
+8385959.00	838:59:59	3
+130000.00	13:00:00	4
+100000.00	10:00:00	5
 DROP VIEW v1;
 
 
@@ -3188,35 +3171,25 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL order by id;
+WHERE select_id = 66 OR select_id IS NULL;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0	0000-00-00 00:00:00	1
-9999999999	1970-01-01 03:00:01	2
-9999999999	2038-01-01 02:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+0.00	0000-00-00 00:00:00	1
+19700101030001.00	1970-01-01 03:00:01	2
+20380101025959.00	2038-01-01 02:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL) order by id;
+WHERE select_id = 66 OR select_id IS NULL);
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0	0000-00-00 00:00:00	1
-9999999999	1970-01-01 03:00:01	2
-9999999999	2038-01-01 02:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+0.00	0000-00-00 00:00:00	1
+19700101030001.00	1970-01-01 03:00:01	2
+20380101025959.00	2038-01-01 02:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -3224,25 +3197,25 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL order by id;
+WHERE select_id = 65 OR select_id IS NULL;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101	0001-01-01	2
-99991231	9999-12-31	3
-20040229	2004-02-29	4
-20050628	2005-06-28	5
+10101.00	0001-01-01	2
+99991231.00	9999-12-31	3
+20040229.00	2004-02-29	4
+20050628.00	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL) order by id;
+WHERE select_id = 65 OR select_id IS NULL);
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101	0001-01-01	2
-99991231	9999-12-31	3
-20040229	2004-02-29	4
-20050628	2005-06-28	5
+10101.00	0001-01-01	2
+99991231.00	9999-12-31	3
+20040229.00	2004-02-29	4
+20050628.00	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -3250,73 +3223,25 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL order by id;
+WHERE select_id = 64 OR select_id IS NULL;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-9999999999	0001-01-01 00:00:00	2
-9999999999	9999-12-31 23:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+10101000000.00	0001-01-01 00:00:00	2
+99991231235959.00	9999-12-31 23:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL) order by id;
+WHERE select_id = 64 OR select_id IS NULL);
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-9999999999	0001-01-01 00:00:00	2
-9999999999	9999-12-31 23:59:59	3
-9999999999	2004-02-29 23:59:59	4
-9999999999	2005-06-28 10:00:00	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
-DROP VIEW v1;
-
-
-CREATE VIEW v1 AS SELECT CAST(my_double AS DECIMAL),
-my_double, id FROM t1_values;
-SELECT CAST(my_double AS DECIMAL),
-my_double, id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL order by id;
-CAST(my_double AS DECIMAL)	my_double	id
-NULL	NULL	1
--9999999999	-1.7976931348623e+308	2
-9999999999	1.7976931348623e+308	3
-0	0	4
--1	-1	5
--3333	-3333.3333	30
-Warnings:
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
-SHOW CREATE VIEW v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as decimal) AS `CAST(my_double AS DECIMAL)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
-SELECT v1.* FROM v1
-WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL) order by id;
-CAST(my_double AS DECIMAL)	my_double	id
-NULL	NULL	1
--9999999999	-1.7976931348623e+308	2
-9999999999	1.7976931348623e+308	3
-0	0	4
--1	-1	5
--3333	-3333.3333	30
-Warnings:
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+10101000000.00	0001-01-01 00:00:00	2
+99991231235959.00	9999-12-31 23:59:59	3
+20040229235959.00	2004-02-29 23:59:59	4
+20050628100000.00	2005-06-28 10:00:00	5
 DROP VIEW v1;
 
 
@@ -3324,31 +3249,25 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL order by id;
+WHERE select_id = 63 OR select_id IS NULL;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
-9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
-0	0.000000000000000000000000000000	4
--1	-1.000000000000000000000000000000	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+-10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
+10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
+0.00	0.000000000000000000000000000000	4
+-1.00	-1.000000000000000000000000000000	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL) order by id;
+WHERE select_id = 63 OR select_id IS NULL);
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
-9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
-0	0.000000000000000000000000000000	4
--1	-1.000000000000000000000000000000	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+-10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
+10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
+0.00	0.000000000000000000000000000000	4
+-1.00	-1.000000000000000000000000000000	5
 DROP VIEW v1;
 
 
@@ -3356,31 +3275,25 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL order by id;
+WHERE select_id = 62 OR select_id IS NULL;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9999999999	-9223372036854775808	2
-9999999999	9223372036854775807	3
-0	0	4
--1	-1	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+-9223372036854775808.00	-9223372036854775808	2
+9223372036854775807.00	9223372036854775807	3
+0.00	0	4
+-1.00	-1	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL) order by id;
+WHERE select_id = 62 OR select_id IS NULL);
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9999999999	-9223372036854775808	2
-9999999999	9223372036854775807	3
-0	0	4
--1	-1	5
-Warnings:
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
-Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+-9223372036854775808.00	-9223372036854775808	2
+9223372036854775807.00	9223372036854775807	3
+0.00	0	4
+-1.00	-1	5
 DROP VIEW v1;
 
 
@@ -3388,14 +3301,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL order by id;
+WHERE select_id = 61 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	29
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3405,14 +3318,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL) order by id;
+WHERE select_id = 61 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	29
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3424,14 +3337,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL order by id;
+WHERE select_id = 60 OR select_id IS NULL;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	28
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3446,14 +3359,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL) order by id;
+WHERE select_id = 60 OR select_id IS NULL);
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	28
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3470,14 +3383,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL order by id;
+WHERE select_id = 59 OR select_id IS NULL;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	27
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3487,14 +3400,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL) order by id;
+WHERE select_id = 59 OR select_id IS NULL);
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0		2
-0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0	 ---äÖüß@µ*$-- 	4
--1	-1	5
--3333	-3333.3333	27
+0.00		2
+0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3506,14 +3419,14 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL order by id;
+WHERE select_id = 58 OR select_id IS NULL;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$--	4
--1	-1	5
--3333	-3333.3333	26
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$--	4
+-1.00	-1	5
+-3333.33	-3333.3333	25
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3526,14 +3439,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL) order by id;
+WHERE select_id = 58 OR select_id IS NULL);
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0		2
-0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$--	4
--1	-1	5
--3333	-3333.3333	26
+0.00		2
+0.00	<--------30 characters------->	3
+0.00	 ---äÖüß@µ*$--	4
+-1.00	-1	5
+-3333.33	-3333.3333	25
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3548,7 +3461,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL order by id;
+WHERE select_id = 57 OR select_id IS NULL;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3560,7 +3473,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL) order by id;
+WHERE select_id = 57 OR select_id IS NULL);
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3574,7 +3487,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL order by id;
+WHERE select_id = 56 OR select_id IS NULL;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3586,7 +3499,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as time) AS `CAST(my_time AS TIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL) order by id;
+WHERE select_id = 56 OR select_id IS NULL);
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3600,7 +3513,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL order by id;
+WHERE select_id = 55 OR select_id IS NULL;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3612,7 +3525,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as time) AS `CAST(my_timestamp AS TIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL) order by id;
+WHERE select_id = 55 OR select_id IS NULL);
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3626,7 +3539,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL order by id;
+WHERE select_id = 54 OR select_id IS NULL;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3638,7 +3551,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as time) AS `CAST(my_date AS TIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL) order by id;
+WHERE select_id = 54 OR select_id IS NULL);
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3652,7 +3565,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL order by id;
+WHERE select_id = 53 OR select_id IS NULL;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3664,7 +3577,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as time) AS `CAST(my_datetime AS TIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL) order by id;
+WHERE select_id = 53 OR select_id IS NULL);
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3674,45 +3587,11 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CAST(my_double AS TIME),
-my_double, id FROM t1_values;
-SELECT CAST(my_double AS TIME),
-my_double, id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL order by id;
-CAST(my_double AS TIME)	my_double	id
-NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
-00:00:00	0	4
--00:00:01	-1	5
-00:17:58	1758	25
-Warnings:
-Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
-SHOW CREATE VIEW v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
-SELECT v1.* FROM v1
-WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL) order by id;
-CAST(my_double AS TIME)	my_double	id
-NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
-00:00:00	0	4
--00:00:01	-1	5
-00:17:58	1758	25
-Warnings:
-Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
-DROP VIEW v1;
-
-
 CREATE VIEW v1 AS SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL order by id;
+WHERE select_id = 52 OR select_id IS NULL;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3728,7 +3607,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL) order by id;
+WHERE select_id = 52 OR select_id IS NULL);
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3746,7 +3625,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL order by id;
+WHERE select_id = 51 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3763,7 +3642,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as time) AS `CAST(my_varbinary_1000 AS TIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL) order by id;
+WHERE select_id = 51 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3782,7 +3661,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL order by id;
+WHERE select_id = 50 OR select_id IS NULL;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3801,7 +3680,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as time) AS `CAST(my_binary_30 AS TIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL) order by id;
+WHERE select_id = 50 OR select_id IS NULL);
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3822,7 +3701,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL order by id;
+WHERE select_id = 49 OR select_id IS NULL;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3839,7 +3718,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as time) AS `CAST(my_varchar_1000 AS TIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL) order by id;
+WHERE select_id = 49 OR select_id IS NULL);
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3858,7 +3737,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL order by id;
+WHERE select_id = 48 OR select_id IS NULL;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3875,7 +3754,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as time) AS `CAST(my_char_30 AS TIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL) order by id;
+WHERE select_id = 48 OR select_id IS NULL);
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3894,7 +3773,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL order by id;
+WHERE select_id = 47 OR select_id IS NULL;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3902,16 +3781,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL) order by id;
+WHERE select_id = 47 OR select_id IS NULL);
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3919,10 +3798,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -3930,31 +3809,35 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL order by id;
+WHERE select_id = 46 OR select_id IS NULL;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 13:00:00	13:00:00	4
-0000-00-00 10:00:00	10:00:00	5
+0000-00-00 00:00:00	13:00:00	4
+0000-00-00 00:00:00	10:00:00	5
 Warnings:
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL) order by id;
+WHERE select_id = 46 OR select_id IS NULL);
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 13:00:00	13:00:00	4
-0000-00-00 10:00:00	10:00:00	5
+0000-00-00 00:00:00	13:00:00	4
+0000-00-00 00:00:00	10:00:00	5
 Warnings:
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
 DROP VIEW v1;
 
 
@@ -3962,7 +3845,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL order by id;
+WHERE select_id = 45 OR select_id IS NULL;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3974,7 +3857,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as datetime) AS `CAST(my_timestamp AS DATETIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL) order by id;
+WHERE select_id = 45 OR select_id IS NULL);
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3988,7 +3871,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL order by id;
+WHERE select_id = 44 OR select_id IS NULL;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -4000,7 +3883,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as datetime) AS `CAST(my_date AS DATETIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL) order by id;
+WHERE select_id = 44 OR select_id IS NULL);
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -4014,7 +3897,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL order by id;
+WHERE select_id = 43 OR select_id IS NULL;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4026,7 +3909,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as datetime) AS `CAST(my_datetime AS DATETIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL) order by id;
+WHERE select_id = 43 OR select_id IS NULL);
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4040,7 +3923,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL order by id;
+WHERE select_id = 42 OR select_id IS NULL;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4049,17 +3932,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL) order by id;
+WHERE select_id = 42 OR select_id IS NULL);
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4068,11 +3951,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4080,7 +3963,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL order by id;
+WHERE select_id = 41 OR select_id IS NULL;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4089,17 +3972,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL) order by id;
+WHERE select_id = 41 OR select_id IS NULL);
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4108,11 +3991,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4120,7 +4003,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL order by id;
+WHERE select_id = 40 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4129,16 +4012,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as datetime) AS `CAST(my_varbinary_1000 AS DATETIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL) order by id;
+WHERE select_id = 40 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4147,10 +4030,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4158,7 +4041,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL order by id;
+WHERE select_id = 39 OR select_id IS NULL;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4167,17 +4050,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as datetime) AS `CAST(my_binary_30 AS DATETIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL) order by id;
+WHERE select_id = 39 OR select_id IS NULL);
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4186,10 +4069,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 DROP VIEW v1;
 
@@ -4198,7 +4081,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL order by id;
+WHERE select_id = 38 OR select_id IS NULL;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4207,16 +4090,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as datetime) AS `CAST(my_varchar_1000 AS DATETIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL) order by id;
+WHERE select_id = 38 OR select_id IS NULL);
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4225,10 +4108,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4236,7 +4119,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL order by id;
+WHERE select_id = 37 OR select_id IS NULL;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4245,16 +4128,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as datetime) AS `CAST(my_char_30 AS DATETIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL) order by id;
+WHERE select_id = 37 OR select_id IS NULL);
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4263,10 +4146,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4274,7 +4157,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL order by id;
+WHERE select_id = 36 OR select_id IS NULL;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4282,16 +4165,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL) order by id;
+WHERE select_id = 36 OR select_id IS NULL);
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4299,10 +4182,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+Warning	1292	Truncated incorrect datetime value: '1901'
+Warning	1292	Truncated incorrect datetime value: '2155'
+Warning	1292	Truncated incorrect datetime value: '2000'
+Warning	1292	Truncated incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -4310,7 +4193,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL order by id;
+WHERE select_id = 35 OR select_id IS NULL;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4322,7 +4205,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL) order by id;
+WHERE select_id = 35 OR select_id IS NULL);
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4336,7 +4219,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL order by id;
+WHERE select_id = 34 OR select_id IS NULL;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4348,7 +4231,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as date) AS `CAST(my_timestamp AS DATE)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL) order by id;
+WHERE select_id = 34 OR select_id IS NULL);
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4362,7 +4245,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL order by id;
+WHERE select_id = 33 OR select_id IS NULL;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4374,7 +4257,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as date) AS `CAST(my_date AS DATE)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL) order by id;
+WHERE select_id = 33 OR select_id IS NULL);
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4388,7 +4271,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL order by id;
+WHERE select_id = 32 OR select_id IS NULL;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4400,7 +4283,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as date) AS `CAST(my_datetime AS DATE)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL) order by id;
+WHERE select_id = 32 OR select_id IS NULL);
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4414,7 +4297,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL order by id;
+WHERE select_id = 31 OR select_id IS NULL;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4423,16 +4306,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL) order by id;
+WHERE select_id = 31 OR select_id IS NULL);
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4441,10 +4324,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4452,7 +4335,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL order by id;
+WHERE select_id = 30 OR select_id IS NULL;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4461,16 +4344,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL) order by id;
+WHERE select_id = 30 OR select_id IS NULL);
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4479,10 +4362,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808'
-Warning	1292	Incorrect datetime value: '9223372036854775807'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
+Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
+Warning	1292	Truncated incorrect datetime value: '0'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4490,7 +4373,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL order by id;
+WHERE select_id = 29 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4499,16 +4382,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as date) AS `CAST(my_varbinary_1000 AS DATE)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL) order by id;
+WHERE select_id = 29 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4517,10 +4400,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4528,7 +4411,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL order by id;
+WHERE select_id = 28 OR select_id IS NULL;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4537,17 +4420,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as date) AS `CAST(my_binary_30 AS DATE)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL) order by id;
+WHERE select_id = 28 OR select_id IS NULL);
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4556,10 +4439,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 DROP VIEW v1;
 
@@ -4568,7 +4451,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL order by id;
+WHERE select_id = 27 OR select_id IS NULL;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4577,16 +4460,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as date) AS `CAST(my_varchar_1000 AS DATE)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL) order by id;
+WHERE select_id = 27 OR select_id IS NULL);
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4595,10 +4478,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4606,7 +4489,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL order by id;
+WHERE select_id = 26 OR select_id IS NULL;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4615,16 +4498,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as date) AS `CAST(my_char_30 AS DATE)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL) order by id;
+WHERE select_id = 26 OR select_id IS NULL);
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4633,10 +4516,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Truncated incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4644,7 +4527,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL order by id;
+WHERE select_id = 25 OR select_id IS NULL;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4656,7 +4539,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset latin1) AS `CAST(my_year AS CHAR)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL) order by id;
+WHERE select_id = 25 OR select_id IS NULL);
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4670,7 +4553,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL order by id;
+WHERE select_id = 24 OR select_id IS NULL;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4682,7 +4565,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset latin1) AS `CAST(my_time AS CHAR)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL) order by id;
+WHERE select_id = 24 OR select_id IS NULL);
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4696,7 +4579,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL order by id;
+WHERE select_id = 23 OR select_id IS NULL;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4708,7 +4591,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset latin1) AS `CAST(my_timestamp AS CHAR)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL) order by id;
+WHERE select_id = 23 OR select_id IS NULL);
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4722,7 +4605,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL order by id;
+WHERE select_id = 22 OR select_id IS NULL;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4734,7 +4617,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset latin1) AS `CAST(my_date AS CHAR)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL) order by id;
+WHERE select_id = 22 OR select_id IS NULL);
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4748,7 +4631,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL order by id;
+WHERE select_id = 21 OR select_id IS NULL;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4760,7 +4643,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset latin1) AS `CAST(my_datetime AS CHAR)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL) order by id;
+WHERE select_id = 21 OR select_id IS NULL);
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4774,7 +4657,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL order by id;
+WHERE select_id = 20 OR select_id IS NULL;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4786,7 +4669,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset latin1) AS `CAST(my_double AS CHAR)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL) order by id;
+WHERE select_id = 20 OR select_id IS NULL);
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4800,7 +4683,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL order by id;
+WHERE select_id = 19 OR select_id IS NULL;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4812,7 +4695,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset latin1) AS `CAST(my_decimal AS CHAR)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL) order by id;
+WHERE select_id = 19 OR select_id IS NULL);
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4826,7 +4709,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL order by id;
+WHERE select_id = 18 OR select_id IS NULL;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4838,7 +4721,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset latin1) AS `CAST(my_bigint AS CHAR)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL) order by id;
+WHERE select_id = 18 OR select_id IS NULL);
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4852,7 +4735,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL order by id;
+WHERE select_id = 17 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4864,7 +4747,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset latin1) AS `CAST(my_varbinary_1000 AS CHAR)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL) order by id;
+WHERE select_id = 17 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4878,7 +4761,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL order by id;
+WHERE select_id = 16 OR select_id IS NULL;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4890,7 +4773,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL) order by id;
+WHERE select_id = 16 OR select_id IS NULL);
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4904,7 +4787,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL order by id;
+WHERE select_id = 15 OR select_id IS NULL;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4916,7 +4799,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset latin1) AS `CAST(my_varchar_1000 AS CHAR)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL) order by id;
+WHERE select_id = 15 OR select_id IS NULL);
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4930,7 +4813,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL order by id;
+WHERE select_id = 14 OR select_id IS NULL;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4942,7 +4825,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset latin1) AS `CAST(my_char_30 AS CHAR)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL) order by id;
+WHERE select_id = 14 OR select_id IS NULL);
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4956,7 +4839,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL order by id;
+WHERE select_id = 13 OR select_id IS NULL;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4968,7 +4851,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset binary) AS `CAST(my_year AS BINARY)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL) order by id;
+WHERE select_id = 13 OR select_id IS NULL);
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4982,7 +4865,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL order by id;
+WHERE select_id = 12 OR select_id IS NULL;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4994,7 +4877,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset binary) AS `CAST(my_time AS BINARY)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL) order by id;
+WHERE select_id = 12 OR select_id IS NULL);
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -5008,7 +4891,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL order by id;
+WHERE select_id = 11 OR select_id IS NULL;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -5020,7 +4903,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset binary) AS `CAST(my_timestamp AS BINARY)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL) order by id;
+WHERE select_id = 11 OR select_id IS NULL);
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -5034,7 +4917,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL order by id;
+WHERE select_id = 10 OR select_id IS NULL;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -5046,7 +4929,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset binary) AS `CAST(my_date AS BINARY)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL) order by id;
+WHERE select_id = 10 OR select_id IS NULL);
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -5060,7 +4943,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL order by id;
+WHERE select_id = 9 OR select_id IS NULL;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -5072,7 +4955,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset binary) AS `CAST(my_datetime AS BINARY)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL) order by id;
+WHERE select_id = 9 OR select_id IS NULL);
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -5086,7 +4969,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL order by id;
+WHERE select_id = 8 OR select_id IS NULL;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -5098,7 +4981,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset binary) AS `CAST(my_double AS BINARY)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL) order by id;
+WHERE select_id = 8 OR select_id IS NULL);
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -5112,7 +4995,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL order by id;
+WHERE select_id = 7 OR select_id IS NULL;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5124,7 +5007,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset binary) AS `CAST(my_decimal AS BINARY)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL) order by id;
+WHERE select_id = 7 OR select_id IS NULL);
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5138,7 +5021,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL order by id;
+WHERE select_id = 6 OR select_id IS NULL;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5150,7 +5033,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset binary) AS `CAST(my_bigint AS BINARY)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL) order by id;
+WHERE select_id = 6 OR select_id IS NULL);
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5164,7 +5047,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL order by id;
+WHERE select_id = 5 OR select_id IS NULL;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5176,7 +5059,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset binary) AS `CAST(my_varbinary_1000 AS BINARY)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL) order by id;
+WHERE select_id = 5 OR select_id IS NULL);
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5190,7 +5073,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL order by id;
+WHERE select_id = 4 OR select_id IS NULL;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5202,7 +5085,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL) order by id;
+WHERE select_id = 4 OR select_id IS NULL);
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5216,7 +5099,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL order by id;
+WHERE select_id = 3 OR select_id IS NULL;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5228,7 +5111,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset binary) AS `CAST(my_varchar_1000 AS BINARY)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL) order by id;
+WHERE select_id = 3 OR select_id IS NULL);
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5242,7 +5125,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL order by id;
+WHERE select_id = 2 OR select_id IS NULL;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5254,7 +5137,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset binary) AS `CAST(my_char_30 AS BINARY)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL) order by id;
+WHERE select_id = 2 OR select_id IS NULL);
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5266,7 +5149,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT sqrt(my_bigint), my_bigint, id FROM t1_values;
 SELECT sqrt(my_bigint), my_bigint, id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL order by id;
+WHERE select_id = 1 OR select_id IS NULL;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -5280,7 +5163,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sqrt(`t1_values`.`my_bigint`) AS `sqrt(my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL) order by id;
+WHERE select_id = 1 OR select_id IS NULL);
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc.result b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
index b52f0dbbbf0..a1e08c94ab9 100644
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
@@ -3,16 +3,19 @@
 .                         IMPORTANT NOTICE:
 .                         -----------------
 .
-.  FIXME: The .result files are still NOT CHECKED for correctness!
+.  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
+.         for correctness!
 .
 .  FIXME: Several tests are affected by known problems around DECIMAL
-.  FIXME: and NUMERIC that will be checked again after WL#2984 once
+.  FIXME: and NUMERIC that needs to be checked again after WL#2984
 .  FIXME: has been completed. Some of them are marked in the result.
 .
-. Currently (Dec 06, 2005) this .result file is checked OK for Linux
-. with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
-. Using the available Windows version 5.0.16 there are differences
-. that can be ignored (e.g. WL#2984).
+.  This .result file has been checked OK with Linux 5.0.23-bk,
+.  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
+.
+. This file has been saved although it might contain failures / wrong
+. results to be able to detect _new_ differences in the behaviour.
+. Hopefully the remaining checks can be made soon.
 .
 --------------------------------------------------------------------------------
 	FIXME: There are subtests that are switched off due to known bugs:
@@ -96,21 +99,20 @@ USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
-f1	f2	f3	f4	f5	f6
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
 set @v1 = f1;
 SELECT @v1, @v1;
 END//
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
-@v1	@v1
-abc	abc
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 binary ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -119,12 +121,12 @@ SELECT @v1;
 END//
 CALL sp1( 34 );
 @v1
-34
+3
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 blob ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -137,8 +139,6 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 int )  language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -151,8 +151,6 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
@@ -161,13 +159,19 @@ BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
+ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
+ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(60, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
@@ -175,51 +179,56 @@ SELECT @v1;
 END//
 CALL sp1( 17976931340000 );
 @v1
-17976931340000
+17976931340000.000000000000000000000000000000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 set("value1", "value1") ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
 CALL sp1( "value1, value1" );
 f1
-value1, value1
+value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) language sql SELECT f1;
 CALL sp1( 'abc' );
@@ -269,7 +278,9 @@ SHOW PROCEDURE status like 'sp1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
+ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 DROP PROCEDURE sp1;
 
 Testcase 4.1.2:
@@ -333,11 +344,13 @@ CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  lang
   BEGIN
 return f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SELECT fn1( "value1" );
 fn1( "value1" )
-0.000000000000000000000000000000
+1.000000000000000000000000000000
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: 'value1'
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -346,11 +359,14 @@ CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) langua
   BEGIN
 return f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
 SELECT fn1( "value1, value1" );
 fn1( "value1, value1" )
-0.000000000000000000000000000000
+1.000000000000000000000000000000
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: 'value1, value1'
+Note	1291	Column '' has duplicated value 'value1' in SET
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -441,7 +457,7 @@ CREATE PROCEDURE sp1 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE PROCEDURE `sp1`(f1 char(20) )
+sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(f1 char(20) )
 SELECT * from t1 where f2 = f1
 DROP PROCEDURE sp1;
 
@@ -454,7 +470,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50)
 return concat('hello, ', s, '!');
 show CREATE FUNCTION fn1;
 Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(s char(20)) RETURNS char(50)
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50)
 return concat('hello, ', s, '!')
 DROP FUNCTION fn1;
 
@@ -498,7 +514,7 @@ CREATE PROCEDURE sp7b (a char (20), out b char(20))
 SELECT f1 into b from t1 where t1.f2= a;
 CALL sp7b('xyz', @out_param);
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 SELECT @out_param;
 @out_param
 NULL
@@ -511,8 +527,8 @@ END//
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
 Warnings:
-Warning	1329	No data to FETCH
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data - zero rows fetched, selected, or processed
 SELECT @out_param;
 @out_param
 NULL
@@ -2565,12 +2581,12 @@ alter procedure sp1 sql security definer;
 alter function sp1 sql security definer;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE PROCEDURE `sp1`()
+sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
     COMMENT 'this is a procedure'
 set @x= 3
 show CREATE FUNCTION sp1;
 Function	sql_mode	Create Function
-sp1		CREATE FUNCTION `sp1`() RETURNS int(11)
+sp1		CREATE DEFINER=`root`@`localhost` FUNCTION `sp1`() RETURNS int(11)
     COMMENT 'this is a function'
 return 4
 USE db_storedproc;
@@ -4587,6 +4603,9 @@ END begin_label//
 CALL sp1();
 @v1	@v2
 1	2
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.7:
@@ -4621,6 +4640,9 @@ declare y char;
 SELECT f1, f2 into x, y from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.9:
@@ -4703,9 +4725,9 @@ fetch cur1 into e;
 SELECT x, y, z, a, b, c, d, e;
 close cur1;
 END//
+ERROR 42000: Too big scale 255 specified for column ''. Maximum is 30.
 CALL sp6();
-x	y	z	a	b	c	d	e
-a	1	1.1	value1	1200000000000	mediumtext	2005-02-02 12:12:12	a`
+ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -4737,7 +4759,7 @@ BEGIN
 declare x char, integer default '0';
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0';
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -4746,7 +4768,7 @@ BEGIN
 declare x1, x2 char, integer default '0', 1;
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0', 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0', 1;
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -5988,7 +6010,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+000	000	000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -5997,7 +6023,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+001	001	001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6024,7 +6050,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000	00000	00000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6033,7 +6063,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00001	00001	00001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6060,7 +6090,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000000	00000000	00000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6069,7 +6103,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00000001	00000001	00000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6096,7 +6130,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+0000000000	0000000000	0000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6105,7 +6143,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+0000000001	0000000001	0000000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6123,7 +6161,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+18446744073709551615	18446744073709551615	18446744073709551615
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6132,7 +6170,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000000000000000000	00000000000000000000	00000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6141,7 +6183,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00000000000000000001	00000000000000000001	00000000000000000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6150,7 +6192,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
+-9999999999	-9999999999	-9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6161,7 +6207,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6170,7 +6220,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
+0000000000	0000000000	0000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
+Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value adjusted for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6181,7 +6235,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6192,7 +6250,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6203,7 +6265,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6214,7 +6280,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6225,7 +6295,11 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6252,7 +6326,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6261,7 +6335,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6270,7 +6344,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+1.17549e-38	1.17549e-38	1.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6279,7 +6353,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+1.17549e-38	1.17549e-38	1.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6288,7 +6362,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+01.17549e-38	01.17549e-38	01.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6297,7 +6371,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+01.17549e-38	01.17549e-38	01.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6333,7 +6407,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-20050202122012	20050202122012	20050202122012
+2005-02-02 12:20:12	2005-02-02 12:20:12	2005-02-02 12:20:12
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -12384,10 +12458,13 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	abaa	3
+NULL	a	3
+Warnings:
+Warning	1265	Data truncated for column 'y' at row 3
+Warning	1265	Data truncated for column 'y' at row 1
 SELECT @v1, @v2;
 @v1	@v2
-4	a`
+4	a
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12454,7 +12531,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1264	Out of range value adjusted for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12481,9 +12558,11 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-temp
+t
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12501,7 +12580,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'asd'
+Warning	1265	Data truncated for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12527,7 +12606,9 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-asd
+0000-00-00 00:00:00
+Warnings:
+Warning	1264	Out of range value adjusted for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12571,7 +12652,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12602,6 +12683,8 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12665,6 +12748,8 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12672,6 +12757,8 @@ declare x tinyint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12679,6 +12766,8 @@ declare x tinyint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12686,6 +12775,8 @@ declare x tinyint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12693,6 +12784,8 @@ declare x tinyint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12700,6 +12793,8 @@ declare x smallint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12707,6 +12802,8 @@ declare x smallint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12714,6 +12811,8 @@ declare x smallint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12721,6 +12820,8 @@ declare x smallint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12728,6 +12829,8 @@ declare x mediumint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12735,6 +12838,8 @@ declare x mediumint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12742,6 +12847,8 @@ declare x mediumint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12749,6 +12856,8 @@ declare x mediumint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12756,6 +12865,8 @@ declare x int;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12763,6 +12874,8 @@ declare x int unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12770,6 +12883,8 @@ declare x int zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12777,6 +12892,8 @@ declare x int unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12784,6 +12901,8 @@ declare x bigint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12791,6 +12910,8 @@ declare x bigint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12798,6 +12919,8 @@ declare x bigint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12805,6 +12928,8 @@ declare x bigint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12813,7 +12938,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12822,7 +12947,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12831,7 +12956,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12840,7 +12965,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12849,7 +12974,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12858,7 +12983,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12867,7 +12992,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12876,7 +13001,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
+Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12884,6 +13009,8 @@ declare x real;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12891,6 +13018,8 @@ declare x real unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12898,6 +13027,8 @@ declare x real zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12905,6 +13036,8 @@ declare x real unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12912,6 +13045,8 @@ declare x float;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12919,6 +13054,8 @@ declare x float unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12926,6 +13063,8 @@ declare x float zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12933,6 +13072,8 @@ declare x float unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12940,6 +13081,8 @@ declare x date;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12947,6 +13090,8 @@ declare x time;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12954,6 +13099,8 @@ declare x datetime;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12961,6 +13108,8 @@ declare x timestamp;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12968,6 +13117,8 @@ declare x year;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12975,6 +13126,8 @@ declare x year(3);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12982,6 +13135,8 @@ declare x year(4);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12989,6 +13144,8 @@ declare x enum("1enum", "2enum");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12996,6 +13153,8 @@ declare x set("1set", "2set");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.38:
@@ -13643,7 +13802,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13669,7 +13828,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -14926,7 +15085,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
-0
+-46744073709551616
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -14945,6 +15104,8 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -14972,6 +15133,10 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -14980,7 +15145,9 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -14989,7 +15156,10 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15008,6 +15178,10 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15016,7 +15190,9 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15025,7 +15201,10 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15061,7 +15240,10 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15097,7 +15279,10 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000001
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15106,7 +15291,10 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-1
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15115,7 +15303,10 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000001
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15124,7 +15315,10 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15142,7 +15336,9 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15151,7 +15347,9 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15160,7 +15358,9 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15178,7 +15378,9 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15187,7 +15389,9 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15196,7 +15400,9 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15214,7 +15420,9 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15223,7 +15431,9 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15232,7 +15442,9 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15250,7 +15462,9 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15259,7 +15473,9 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15268,7 +15484,9 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15286,7 +15504,9 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15295,7 +15515,9 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15304,7 +15526,9 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15322,7 +15546,9 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15331,7 +15557,9 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15340,7 +15568,9 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15349,7 +15579,10 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483648
+-2147483638
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15385,7 +15618,9 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15412,7 +15647,11 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-0
+16777215
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15421,7 +15660,9 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15430,7 +15671,9 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15440,6 +15683,9 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15448,7 +15694,9 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15457,7 +15705,10 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15466,7 +15717,9 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15476,6 +15729,9 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15484,7 +15740,9 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15493,7 +15751,10 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15502,7 +15763,12 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999999.999999999999999999999999999999
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15512,6 +15778,10 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15521,6 +15791,10 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15529,7 +15803,10 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15577,7 +15854,9 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15586,7 +15865,9 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15595,7 +15876,10 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15613,7 +15897,9 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15622,7 +15908,9 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15631,7 +15919,9 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15667,7 +15957,11 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-0
+65535
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15703,7 +15997,11 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-0
+255
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
@@ -15759,7 +16057,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-26:00:00
+25:59:59
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -15768,7 +16066,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:01
+1998-01-02 01:01:00
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -15778,6 +16076,8 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -15787,6 +16087,8 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
 CREATE FUNCTION fn96( f1 char binary) returns char binary
 BEGIN
@@ -15796,6 +16098,8 @@ END//
 SELECT fn96( 'h');
 fn96( 'h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -15917,7 +16221,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
--9223372036854775808
+18400000000000000000
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -15926,7 +16230,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-184000000000000000
+00184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -15935,7 +16239,9 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
--9220000000000000
+00000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
@@ -15947,7 +16253,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
@@ -15959,7 +16265,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -15968,7 +16274,11 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -15977,7 +16287,9 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
@@ -15989,7 +16301,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
@@ -16001,7 +16316,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
@@ -16013,7 +16328,11 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
@@ -16025,7 +16344,9 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
@@ -16037,7 +16358,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
@@ -16049,7 +16373,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000
+-1000000000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
@@ -16061,7 +16385,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000
+10000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
@@ -16073,7 +16397,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-10000000000000000.000000000
+000000000000000010000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
@@ -16085,7 +16409,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
--1000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
@@ -16094,7 +16421,7 @@ SELECT f1;
 END//
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000.000000000
+-1000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
@@ -16103,10 +16430,10 @@ SELECT f1;
 END//
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+100000000000000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+1000000000000000000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
@@ -16118,10 +16445,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp20_duz( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+0000000000000000000000000000000000000000000100000000000000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+0000000000000000000000000000000000000001000000000000000000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
@@ -16133,7 +16460,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-1.000000000
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
@@ -16145,7 +16475,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-1.000000000
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
@@ -16157,7 +16490,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-1.000000000
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
@@ -16169,7 +16505,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16187,7 +16526,9 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16196,7 +16537,9 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16205,7 +16548,9 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16223,7 +16568,9 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16232,7 +16579,9 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16241,7 +16590,9 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16259,7 +16610,9 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16268,7 +16621,9 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16277,7 +16632,9 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16295,7 +16652,9 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16304,7 +16663,9 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16313,7 +16674,9 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16331,7 +16694,9 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16340,7 +16705,9 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16349,7 +16716,9 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16367,7 +16736,9 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16376,7 +16747,9 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16385,7 +16758,9 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16394,7 +16769,10 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2150000000
+-2147483638
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16421,7 +16799,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-215000000
+0215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16430,7 +16808,9 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16457,7 +16837,11 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
--8388602
+16777215
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16466,7 +16850,9 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16475,7 +16861,9 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16484,7 +16872,10 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16493,7 +16884,9 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16502,7 +16895,10 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16511,7 +16907,9 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16520,7 +16918,10 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16529,7 +16930,9 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16538,7 +16941,10 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
@@ -16547,7 +16953,12 @@ SELECT f1;
 END//
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
@@ -16556,7 +16967,11 @@ SELECT f1;
 END//
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
@@ -16565,7 +16980,11 @@ SELECT f1;
 END//
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
@@ -16574,7 +16993,10 @@ SELECT f1;
 END//
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
@@ -16583,7 +17005,7 @@ SELECT f1;
 END//
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000.000000000
+-10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
@@ -16592,7 +17014,7 @@ SELECT f1;
 END//
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
@@ -16601,7 +17023,7 @@ SELECT f1;
 END//
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
@@ -16610,7 +17032,7 @@ SELECT f1;
 END//
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -16619,7 +17041,9 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -16628,7 +17052,9 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -16637,7 +17063,10 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
--999999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -16646,7 +17075,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.10000
+1.1
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -16655,7 +17084,9 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-1.10000
+10
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -16664,7 +17095,9 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -16673,7 +17106,9 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -16709,7 +17144,11 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
--32602
+65535
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -16745,7 +17184,11 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
--102
+255
+Warnings:
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp89;
 DROP PROCEDURE IF EXISTS sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -16765,7 +17208,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-26:00:00.999997
+25:59:59
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -16774,7 +17217,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:01.000001
+1998-01-02 01:01:00
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -16783,7 +17226,9 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -16792,7 +17237,9 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -16801,7 +17248,9 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -16846,7 +17295,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-61
+2061
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -16901,6 +17350,8 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -16937,9 +17388,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
+2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	2033	2084	2033	2084
+2061	2071	2061	2071	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17010,9 +17461,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
+a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17155,7 +17606,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-9223372036854775807	NULL
+18400000000000000000	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17163,7 +17614,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-9223372036854775807	9223372036854775807	NULL
+18400000000000000000	18400000000000000000	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17171,7 +17622,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
--2	-2	-2
+18353255926290448384	18353255926290448384	18353255926290448384
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17179,7 +17630,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
--2	-2
+18353255926290448384	18353255926290448384
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17237,9 +17688,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17291,9 +17742,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17337,9 +17788,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17372,9 +17823,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17407,9 +17858,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17442,9 +17893,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17477,9 +17928,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17545,9 +17996,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -17579,9 +18030,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -17613,9 +18064,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -17647,9 +18098,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -17681,9 +18132,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -17715,9 +18166,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -17783,9 +18234,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -17817,9 +18268,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -17851,9 +18302,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -17919,9 +18370,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -17953,9 +18404,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -17987,9 +18438,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18021,9 +18472,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18089,9 +18540,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18123,9 +18574,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18191,9 +18642,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18225,9 +18676,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18293,9 +18744,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18327,9 +18778,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18361,9 +18812,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18395,9 +18846,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18429,9 +18880,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18463,9 +18914,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18497,9 +18948,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18531,9 +18982,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -18565,9 +19016,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -18599,9 +19050,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -18633,9 +19084,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -18667,9 +19118,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -18701,9 +19152,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -18735,9 +19186,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -18769,9 +19220,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -18803,9 +19254,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -18837,9 +19288,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -18871,9 +19322,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -18905,9 +19356,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	61	61	71	61	61	71
+2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	61	71	61	71
+2061	2071	2061	2071	2061	2071	2061	2071
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19041,9 +19492,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
+a	a	a	a	a	a	a	a	a	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	aah	ah	aah
+a	a	a	a	a	a	a	a
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19075,9 +19526,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
+a	a	a	a	a	a	a	a	NULL	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	NULL	ah	aah
+a	a	a	a	a	NULL	a	a
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19177,9 +19628,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19211,9 +19662,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19245,9 +19696,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19279,9 +19730,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19313,9 +19764,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19347,9 +19798,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19381,9 +19832,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19415,9 +19866,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19449,9 +19900,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19483,9 +19934,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19517,9 +19968,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -19551,9 +20002,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -19585,9 +20036,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -19619,9 +20070,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -19653,9 +20104,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -19687,9 +20138,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -19721,9 +20172,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -19823,9 +20274,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -19857,9 +20308,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -19925,9 +20376,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -19959,9 +20410,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -19993,9 +20444,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20027,9 +20478,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20061,9 +20512,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20095,9 +20546,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20129,9 +20580,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20163,9 +20614,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20231,9 +20682,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20265,9 +20716,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20299,9 +20750,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20367,9 +20818,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20435,9 +20886,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20463,7 +20914,7 @@ insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
 Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
+sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
@@ -20499,7 +20950,7 @@ SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
 Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
+sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
@@ -20542,7 +20993,7 @@ show warnings;
 END//
 show CREATE PROCEDURE sp4;
 Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -20590,14 +21041,14 @@ set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
 Procedure	sql_mode	Create Procedure
-sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
 END
 show CREATE PROCEDURE sp6b;
 Procedure	sql_mode	Create Procedure
-sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
@@ -20605,7 +21056,7 @@ set @y=@x;
 END
 show CREATE PROCEDURE sp6c;
 Procedure	sql_mode	Create Procedure
-sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
@@ -20791,7 +21242,7 @@ END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
 Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
@@ -20823,7 +21274,7 @@ END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
 Procedure	sql_mode	Create Procedure
-sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
+sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
old mode 100644
new mode 100755
index b314b6c7f1a..7a16c10859b
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
@@ -166,7 +166,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
+SELECT f1, f2 into @x, @y from t2 limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -209,7 +209,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
+SELECT f4, f3 into @x, @y from t2 limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -544,9 +544,6 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
-Warnings:
-Note	1051	Unknown table 'tqq'
-Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()
@@ -1087,8 +1084,7 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
-where f4 >=-5000 order by f4 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1171,7 +1167,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2 order by f4;
+SELECT f1, f2, f4, f5 from t2;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1191,21 +1187,21 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
 open cur1;
 open cur2;
 BEGIN
-declare continue handler for sqlstate '02000' set count=1;
+declare continue handler for sqlstate '02000' set count = 1;
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-1-', count, newf1, newf2, newf4, newf5;
 insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-set count= 4;
+set count = 4;
 BEGIN
-while count> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-2-', count, newf1, newf2, newf4, newf5;
-set count = count- 1;
+set count = count - 1;
 END while;
 SELECT '-3-', count, newf1, newf2, newf4, newf4;
 END;
@@ -1274,10 +1270,8 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
-where f4>=-5000 order by f4 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
-where f4>=-5000 order by f4 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1308,10 +1302,8 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
-WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
-WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_03.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_07.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
old mode 100644
new mode 100755
index f41d5d7d440..33a51a7edbe
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
@@ -80,7 +80,7 @@ connect(localhost,user_1,,db_storedproc,MYSQL_PORT,MYSQL_SOCK);
 user_1@localhost	db_storedproc
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
+SELECT * FROM db_storedproc.t1 LIMIT 1;
 END//
 CREATE FUNCTION fn31105(n INT) RETURNS INT
 BEGIN
@@ -209,7 +209,7 @@ CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -226,7 +226,7 @@ CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -246,7 +246,7 @@ CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -279,7 +279,7 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
index 4d9a6c64947..4bbee8aa133 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
@@ -199,9 +199,6 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
-ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
-CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
-BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 insert into t1 (f2) values ('insert 3.5.1.7');
 select * from t1;
 f1	f2	f3
@@ -210,14 +207,12 @@ update t1 set f2='update 3.5.1.7';
 select * from t1;
 f1	f2	f3
 NULL	update 3.5.1.7	42
-select trigger_name from information_schema.triggers order by trigger_name;
+select trigger_name from information_schema.triggers;
 trigger_name
 trg5_1
 trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
 drop trigger trg5_1;
 drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
-ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
-drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 drop table t1;
 
 Testcase 3.5.1.8:
@@ -319,7 +314,7 @@ insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 select @test_var1, @test_var2, @test_var3;
 @test_var1	@test_var2	@test_var3
 trig1	trig2	trig3
-select * from t1 order by f2;
+select * from t1;
 f1	f2
 trig1	1
 trig1	2
@@ -329,7 +324,7 @@ trig2	3
 select * from trig_db3.t1;
 f1	f2
 trig3	4
-select * from t1 order by f2;
+select * from t1;
 f1	f2
 trig1	1
 trig1	2
@@ -354,10 +349,10 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1 
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers;
 trigger_schema	trigger_name	event_object_table
-trig_db1	trig1_a	t1
 trig_db1	trig1_b	t1
+trig_db1	trig1_a	t1
 trig_db2	trig2	t1
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03.result b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
index 73befa606c9..3dbfa77b464 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
@@ -82,16 +82,16 @@ Testcase 3.5.3.2/6:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 grant ALL  on *.* to test_noprivs@localhost;
-revoke TRIGGER on *.* from test_noprivs@localhost;
+revoke SUPER  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -104,10 +104,10 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-Got one of the listed errors
+ERROR 42000: Access denied; you need the SUPER privilege for this operation
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 select current_user;
@@ -122,12 +122,15 @@ root@localhost
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
 ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1'
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
+
+note: once 15166 is fixed a similar case for SELECT needs to be added
+---------------------------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -136,10 +139,10 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-Got one of the listed errors
+ERROR 42000: Access denied; you need the SUPER privilege for this operation
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -148,12 +151,12 @@ use priv_db;
 drop trigger trg1_2;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-no');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 drop trigger trg1_2;
 
 Testcase 3.5.3.7a:
@@ -163,12 +166,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke UPDATE  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
+grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -177,24 +180,24 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-select f1 from t1 order by f1;
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
 use priv_db;
 select current_user;
@@ -202,220 +205,236 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 drop trigger trg4a_2;
 
 Testcase 3.5.3.7b:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs;
+grant SUPER on *.* to test_noprivs;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1b
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
+insert 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2b';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT on priv_db.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.7-2a
+update 3.5.3.7-1b
 insert 3.5.3.7-2b
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
 -----------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2c';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2c');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
-trig 3.5.3.7-2c
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
+trig 3.5.3.7-2c
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
+GRANT SUPER ON *.* TO 'test_noprivs'@'%'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
-trig 3.5.3.7-2c
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
+trig 3.5.3.7-2c
+insert 3.5.3.7-1d
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2d';
+
+SELECT priv added to bypass bug 15166
+-------------------------------------
+grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2d');
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 insert 3.5.3.2-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-trig 3.5.3.7-2b
-trig 3.5.3.7-2c
-trig 3.5.3.7-2d
 update 3.5.3.7-1b
+trig 3.5.3.7-2b
+insert 3.5.3.7-1c
+trig 3.5.3.7-2c
+insert 3.5.3.7-1d
+trig 3.5.3.7-2d
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -425,12 +444,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke SELECT  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
+grant SUPER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -439,7 +458,7 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 
 Trigger create disabled - should fail - Bug 8887
 ------------------------------------------------
@@ -458,13 +477,17 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-2a
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2a');
 select @test_var;
 @test_var
@@ -474,26 +497,26 @@ drop trigger trg5a_2;
 Testcase: 3.5.3.8b
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke SELECT  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -510,7 +533,7 @@ before trig 3.5.3.8-1b
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -520,6 +543,10 @@ insert into t1 (f1) values ('insert 3.5.3.8-2b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-2b
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE on priv_db.* to test_yesprivs@localhost;
 update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 select @test_var;
 @test_var
@@ -529,26 +556,26 @@ drop trigger trg5b_2;
 Testcase 3.5.3.8c:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -561,12 +588,16 @@ before trig 3.5.3.8-1c
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2c';
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2c');
 select @test_var;
 @test_var
@@ -576,24 +607,24 @@ drop trigger trg5c_2;
 Testcase: 3.5.3.8d:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant TRIGGER on *.* to test_noprivs@localhost;
+grant SUPER on *.* to test_noprivs@localhost;
 grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
@@ -607,12 +638,16 @@ before trig 3.5.3.8-1d
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2d';
+
+UPDATE priv added to bypass bug 15166
+-------------------------------------
+grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2d');
 select @test_var;
 @test_var
@@ -627,12 +662,12 @@ drop table if exists t2;
 create table t1 (f1 int) engine= myisam;
 create table t2 (f2 int) engine= myisam;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant TRIGGER on *.* to test_yesprivs@localhost;
+grant SUPER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t2` TO 'test_yesprivs'@'localhost'
 GRANT SELECT, UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -648,10 +683,10 @@ ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
 4
-select f2 from t2 order by f2;
+select f2 from t2;
 f2
 4
 use priv_db;
@@ -664,11 +699,11 @@ ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
-2
 4
-select f2 from t2 order by f2;
+2
+select f2 from t2;
 f2
 1
 use priv_db;
@@ -681,12 +716,12 @@ ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
-1
-2
 4
-select f2 from t2 order by f2;
+2
+1
+select f2 from t2;
 f2
 1
 select @aaa;
@@ -702,13 +737,13 @@ ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1 order by f1;
+select f1 from t1;
 f1
-1
-1
-2
 4
-select f2 from t2 order by f2;
+2
+1
+1
+select f2 from t2;
 f2
 drop database if exists priv_db;
 drop user test_yesprivs@localhost;
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
index e10b5fe919d..16d91726e30 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
@@ -93,18 +93,18 @@ Create trigger trg1 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.1';
 Use db_drop;
 Insert into t1 values ('Insert error 3.5.4.1');
-Select * from t1 order by f1;
+Select * from t1;
 f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers;
 trigger_schema	trigger_name	event_object_table
 Insert into t1 values ('Insert no trigger 3.5.4.1');
-Select * from t1 order by f1;
+Select * from t1;
 f1
-Insert no trigger 3.5.4.1
 Trigger 3.5.4.1
+Insert no trigger 3.5.4.1
 drop trigger trg1;
 drop database if exists db_drop;
 revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -258,7 +258,7 @@ use dbtest_one;
 Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Select * from dbtest_two.t2 order by f1;
+Select * from dbtest_two.t2;
 f1
 1st Insert 3.5.
 2nd Insert 3.5.
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_08.result b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
index 906aea070d9..ec8e12ff32d 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
@@ -139,10 +139,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
+select * from db_test.t1_i;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u order by u120;
+select * from db_test.t1_u;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -150,7 +150,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d order by d120;
+select * from db_test.t1_d;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -162,22 +162,14 @@ select @test_var;
 3.5.8.4 - single SQL - insert
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
-BEGIN
 insert into db_test.t1_i 
 values (new.f120, new.f136, new.f144, new.f163);
-END//
-Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-f120	f122	f136	f144	f163
-1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
-i120	i136	i144	i163
-1	00222	0000023456	1.050000000000000000000000000000
 update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 I	Test 3.5.8.4-Single Insert	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
+select * from db_test.t1_i;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
 I	00222	0000023456	1.050000000000000000000000000000
@@ -194,14 +186,14 @@ update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 U	Test 3.5.8.4-Single Update	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u order by u120;
+select * from db_test.t1_u;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 
 3.5.8.3/4 - single SQL - delete
 -------------------------------
@@ -214,7 +206,7 @@ f122='Test 3.5.8.4-Single Delete'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 D	Test 3.5.8.4-Single Delete	00444	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_d order by d120;
+select * from db_test.t1_d;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -261,29 +253,29 @@ END//
 set @test_var='Empty', @test_var2=0;
 Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	one	2nd else
 Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	two	2nd else
 D	Test 3.5.8.5-if	00102	two	2nd else
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
-d	Test 3.5.8.5-if	00010	three	2nd if
 D	Test 3.5.8.5-if	00101	three	2nd if
 D	Test 3.5.8.5-if	00102	three	2nd if
+d	Test 3.5.8.5-if	00010	three	2nd if
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+from tb3 where f122 = 'Test 3.5.8.5-if';
 f120	f122	f136	@test_var	@test_var2
-d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00101	three	2nd else
 D	Test 3.5.8.5-if	00102	three	2nd else
+d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00103	three	2nd else
 create trigger trg3 before update on tb3 for each row
 BEGIN
@@ -343,20 +335,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -366,34 +358,34 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
-1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
 B	Test 3.5.8.5-case	00191	0000000016	1*0000099999
 C	Test 3.5.8.5-case	00200	0000000001	1*0000099999
+1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 Insert into tb3 (f120, f122, f136, f144) 
 values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case';
 f120	f122	f136	f144	@test_var
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 create trigger trg3a before update on tb3 for each row
 BEGIN
 CASE
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_09.result b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
index 6a98e527244..9643aa567e3 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
@@ -120,7 +120,7 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
 Insert into tb3 (f122, f136, f163) 
 values ('Test 3.5.9.3', 7, 123.17);
 Update tb3 Set f136=8 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -136,7 +136,7 @@ a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
 f118	f121	f122	f136	f163
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 @tr_var_b4_136, @tr_var_b4_163;
@@ -176,7 +176,7 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
 Insert into tb3 (f122, f136, f151, f163) 
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%' order by f163;
+where f122 like 'Test 3.5.9.4%';
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -194,9 +194,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1048	Column 'f136' cannot be null
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig' order by f163;
+where f122 like 'Test 3.5.9.4-trig';
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
index d1ab6daa423..7867fc9f9e2 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
@@ -87,7 +87,7 @@ Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1);
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+from tb3 where f122 like 'Test 3.5.10.1/2/3%';
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -101,7 +101,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+where f122 like 'Test 3.5.10.1/2/3%';
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -115,7 +115,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+where f122 like 'Test 3.5.10.1/2/3%';
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -146,7 +146,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
-Select * from tb_load order by f1 limit 10;
+Select * from tb_load limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -241,7 +241,7 @@ insert into t3 (f1) values (new.f1+1000);
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3 order by f1;
+select * from t3;
 f1
 12
 102
@@ -276,17 +276,17 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1 order by f1;
+select * from t1;
 f1
 0
 1
-select * from t2 order by f2;
+select * from t2;
 f2
 2
-select * from t3 order by f3;
+select * from t3;
 f3
 3
-select * from t4 order by f4;
+select * from t4;
 f4
 4
 drop trigger tr1;
@@ -373,7 +373,7 @@ create table t4 (f4 tinyint) engine = myisam;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL
+  `f1` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values (1);
 create trigger tr1 after insert on t1
@@ -385,16 +385,16 @@ for each row insert into t4 (f4) values (new.f3+1000);
 set autocommit=0;
 start transaction;
 insert into t1 values (1);
-ERROR 22003: Out of range value for column 'f4' at row 1
+ERROR 22003: Out of range value adjusted for column 'f4' at row 1
 commit;
-select * from t1 order by f1;
+select * from t1;
 f1
 1
 1
-select * from t2 order by f2;
+select * from t2;
 f2
 2
-select * from t3 order by f3;
+select * from t3;
 f3
 3
 drop trigger tr1;
diff --git a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result
index a3620575c8b..3a76024cf80 100644
--- a/mysql-test/suite/funcs_1/r/myisam_views.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result
@@ -470,8 +470,7 @@ SET @x=0;
 CREATE or REPLACE VIEW v1 AS Select 1 INTO @x;
 ERROR HY000: View's SELECT contains a 'INTO' clause
 Select @x;
-@x
-0
+ERROR HY000: View's SELECT contains a variable or parameter
 CREATE or REPLACE VIEW v1 AS Select 1
 FROM (SELECT 1 FROM t1) my_table;
 ERROR HY000: View's SELECT contains a subquery in the FROM clause
@@ -608,9 +607,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 CREATE or REPLACE view v1 as Select f59, f60
 from tb2 by group f59  ;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by group f59' at line 2
-
-Testcase 3.3.1.5 
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
 DROP VIEW  IF EXISTS v1 ;
 CREATE VIEW v1 SELECT * FROM tb2 limit 100 ;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT * FROM tb2 limit 100' at line 1
@@ -630,9 +627,7 @@ CREATE VIEW v1    SELECT 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1' at line 1
 CREATE VIEW v1 AS         ;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
-
-Testcase 3.3.1.6 
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
 DROP VIEW  IF EXISTS v1 ;
 CREATE or REPLACE                       VIEW v1
 as SELECT * from tb2 limit 100 ;
@@ -1817,9 +1812,7 @@ ERROR HY000: View's SELECT contains a subquery in the FROM clause
 SELECT * FROM test.v1      ;
 ERROR 42S02: Table 'test.v1' doesn't exist
 Drop view if exists test.v1 ;
-
-Testcase 3.3.1.40 
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
 Drop view if exists test.v1 ;
 Set @var1 = 'ABC' ;
 Set @var2 = 'XYZ' ;
@@ -1828,9 +1821,7 @@ ERROR HY000: View's SELECT contains a variable or parameter
 CREATE VIEW test.v1 AS SELECT @@global.sort_buffer_size;
 ERROR HY000: View's SELECT contains a variable or parameter
 Drop view if exists test.v1 ;
-
-Testcase 3.3.1.41 
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
 Drop view if exists test.v1 ;
 Drop procedure if exists sp1 ;
 Create procedure sp1() DETERMINISTIC
@@ -1847,9 +1838,7 @@ Warnings:
 Note	1051	Unknown table 'test.v1'
 Drop procedure sp1 ;
 ERROR 42000: PROCEDURE test.sp1 does not exist
-
-Testcase 3.3.1.42 
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
 Drop VIEW if exists test.v1 ;
 CREATE TEMPORARY VIEW test.v1 AS
 SELECT * FROM test.tb2 limit 2 ;
@@ -1861,9 +1850,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SELECT * FROM test.tb2 limit 2' at line 1
 Drop view if exists test.v1 ;
 Use test;
-
-Testcase 3.3.1.43 
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
 Drop view if exists test.v1 ;
 CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
 INSERT INTO test.v1 values(122,432);
@@ -1948,7 +1935,7 @@ f1	f2
 2	two
 4	four
 INSERT INTO v1 VALUES(2,'two');
-ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '2' for key 1
 INSERT INTO v1 VALUES(3,'three');
 affected rows: 1
 INSERT INTO v1 VALUES(6,'six');
@@ -1967,7 +1954,7 @@ f1	f2
 3	three
 4	four
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
-ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '2' for key 1
 UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
@@ -2014,12 +2001,12 @@ DROP VIEW  IF EXISTS test.v1;
 CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
 ENGINE = myisam;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1 order by f1, f2;
+SELECT * FROM t1;
 f1	f2
 A	1
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 f1	f2
 A	1
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -2027,7 +2014,7 @@ affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 INSERT INTO v1 VALUES('B',2);
 affected rows: 1
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 f1	f2
 A	2
 B	2
@@ -2035,7 +2022,7 @@ UPDATE v1 SET f2 = 4;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 INSERT INTO v1 VALUES('B',3);
 ERROR HY000: CHECK OPTION failed 'test.v1'
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 f1	f2
 A	2
 B	2
@@ -10575,7 +10562,7 @@ f1	f2	f3	f4
 DELETE FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '0' for key 1
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10644,7 +10631,7 @@ DROP VIEW v1;
 CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '0' for key 1
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10979,11 +10966,11 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(5)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11003,12 +10990,12 @@ f4x	char(5)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4x	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(10);
@@ -11026,14 +11013,14 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(10)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
 2	NULL	<-- 10 -->	t1 2
 2	NULL	<-- 10 -->	v1 2
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11062,7 +11049,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(8)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11071,7 +11058,7 @@ f1	f2	f4	report
 2	NULL	<-- 10 -	v1 2
 3	NULL	<-- 10 -	t1 3
 3	NULL	<-- 10 -	v1 3
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11095,7 +11082,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11106,7 +11093,7 @@ f1	f2	f4	report
 3	NULL	<-- 10 -	v1 3
 4	NULL	<------ 20 -------->	t1 4
 4	NULL	<------ 20 -------->	v1 4
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11134,7 +11121,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11147,7 +11134,7 @@ f1	f2	f4	report
 4	NULL	<------ 20 -------->	v1 4
 <------------- 30 ----------->	NULL	<------ 20 -------->	t1 5
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11171,7 +11158,7 @@ f4	varchar(20)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report
 -1	ABC	t1 0
 -1	ABC	v1 0
@@ -11185,7 +11172,7 @@ f1	f4	report
 <------------- 30 ----------->	<------ 20 -------->	t1 5
 <------------- 30 ----------->	<------ 20 -------->	v1 5
 ABC	<------ 20 -------->	t1 6
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
 INSERT INTO t1 SET f1 = 'ABC', f2 = '1500-12-04',
@@ -11204,7 +11191,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11220,7 +11207,7 @@ f1	f4	report	f2
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	1500-12-04
 ABC	<------ 20 -------->	v1 7	1500-12-04
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11254,7 +11241,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11269,10 +11256,10 @@ f1	f4	report	f2
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	NULL
-ABC	<------ 20 -------->	t1 8	-0.00033
 ABC	<------ 20 -------->	v1 7	NULL
+ABC	<------ 20 -------->	t1 8	-0.00033
 ABC	<------ 20 -------->	v1 8	-0.00033
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11287,8 +11274,8 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	-0.00033	<------ 20 -------->	t1 8
 ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	t1 8
 ABC	-0.00033	<------ 20 -------->	v1 8
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
 INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
@@ -11311,7 +11298,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 f1	f4	report	f2	f3
 -1	ABC	t1 0	NULL	NULL
 -1	ABC	v1 0	NULL	NULL
@@ -11326,12 +11313,12 @@ f1	f4	report	f2	f3
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL	NULL
 ABC	<------ 20 -------->	t1 6	NULL	NULL
 ABC	<------ 20 -------->	t1 7	NULL	NULL
-ABC	<------ 20 -------->	t1 8	-0.00033	NULL
-ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
 ABC	<------ 20 -------->	v1 7	NULL	NULL
+ABC	<------ 20 -------->	t1 8	-0.00033	NULL
 ABC	<------ 20 -------->	v1 8	-0.00033	NULL
+ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
 ABC	<------ 20 -------->	v1 9a	-0.00033	NULL
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11346,10 +11333,10 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	-0.00033	<------ 20 -------->	t1 8
-ABC	-0.00033	<------ 20 -------->	t1 9
 ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	t1 8
 ABC	-0.00033	<------ 20 -------->	v1 8
+ABC	-0.00033	<------ 20 -------->	t1 9
 ABC	-0.00033	<------ 20 -------->	v1 9a
 DROP TABLE t1;
 DROP VIEW  v1;
@@ -11364,10 +11351,10 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1 order by f1, f2;
+SELECT * FROM t1;
 f1	f2
 ABC	3
-SELECT * FROM v1 order by 2;
+SELECT * FROM v1;
 f1	my_sqrt
 ABC	1.7320508075689
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
@@ -11380,21 +11367,21 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1 order by f1, f2;
+SELECT * FROM t1;
 f1	f2
 ABC	3
 ABC	DEF
-SELECT * FROM v1 order by 2;
+SELECT * FROM v1;
 f1	my_sqrt
-ABC	0
 ABC	1.7320508075689
+ABC	0
 SELECT SQRT('DEF');
 SQRT('DEF')
 0
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2 order by 1;
+SELECT * FROM v2;
 SQRT('DEF')
 0
 Warnings:
@@ -11404,27 +11391,27 @@ DESCRIBE v2;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM v2 order by 2;
+SELECT * FROM v2;
 f1	my_sqrt
-ABC	0
 ABC	1.7320508075689
-CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
-SELECT * FROM t2 order by 2;
-f1	my_sqrt
 ABC	0
+CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
+SELECT * FROM t2;
+f1	my_sqrt
 ABC	1.73205080756888
+ABC	0
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
-SELECT * FROM t2 order by 2;
+SELECT * FROM t2;
 f1	my_sqrt
-ABC	0
 ABC	1.73205080756888
+ABC	0
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
-SELECT * FROM t2 order by 2;
+SELECT * FROM t2;
 f1	my_sqrt
-ABC	0
 ABC	1.73205080756888
+ABC	0
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
old mode 100644
new mode 100755
index 2efc5a83663..a8d52fee0b5
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
@@ -209,7 +209,7 @@ BEGIN
     set @x = x;
     set @y = y;
     set @z = 234;
-    SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
+    SELECT f1, f2 into @x, @y from t2 limit 1;
     SELECT @x, @y, @z, invar;
     BEGIN
       set @x = 2;
@@ -257,7 +257,7 @@ BEGIN
    declare x integer; declare y integer;
    set @x=x;
    set @y=y;
-   SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
+   SELECT f4, f3 into @x, @y from t2 limit 1;
    SELECT @x, @y;
 END//
 delimiter ;//
@@ -1271,8 +1271,7 @@ BEGIN
    declare f5_value char(20);
    declare f4_value integer;
    declare f6_value integer;
-   declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
-                where f4 >=-5000 order by f4 limit 3;
+   declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
    open cur1;
    while proceed do
       SELECT count AS 'loop';
@@ -1369,7 +1368,7 @@ create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) )
 
 #Error: 1329 SQLSTATE: 02000 (ER_SP_FETCH_NO_DATA) Message: No data to FETCH
 
-SELECT f1, f2, f4, f5 from t2 order by f4;
+SELECT f1, f2, f4, f5 from t2;
 
 delimiter //;
 CREATE PROCEDURE sp1( )
@@ -1380,21 +1379,21 @@ BEGIN
    declare newf2 char(20);
    declare newf5 char(20);
    declare newf4 integer;
-   declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
-   declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+   declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+   declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
    open cur1;
    open cur2;
    BEGIN
-      declare continue handler for sqlstate '02000' set count=1;
+      declare continue handler for sqlstate '02000' set count = 1;
       fetch cur1 into newf1, newf2, newf4, newf5;
       SELECT '-1-', count, newf1, newf2, newf4, newf5;
       insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-      set count= 4;
+      set count = 4;
       BEGIN
-         while count> 0 do
+         while count > 0 do
             fetch cur1 into newf1, newf2, newf4, newf5;
             SELECT '-2-', count, newf1, newf2, newf4, newf5;
-            set count = count- 1;
+            set count = count - 1;
          END while;
          SELECT '-3-', count, newf1, newf2, newf4, newf4;
       END;
@@ -1454,10 +1453,8 @@ BEGIN
    declare i_newf12 char(20);
    declare i_newf13 date;
    declare i_newf14 integer;
-   declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
-                where f4>=-5000 order by f4 limit 4;
-   declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
-                where f4>=-5000 order by f4 limit 3;
+   declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
+   declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
    declare continue handler for sqlstate '02000' set proceed=0;
    open cur1;
    open cur2;
@@ -1489,10 +1486,8 @@ BEGIN
    DECLARE o_newf12 CHAR(20);
    DECLARE o_newf13 DATE;
    DECLARE o_newf14 INTEGER;
-   DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
-                WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
-   DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
-                WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+   DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+   DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
    DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
    OPEN cur1;
    OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_03.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
old mode 100644
new mode 100755
index e69a95a724e..d7b0a370a82
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
@@ -54,7 +54,7 @@ connect (user2_1, localhost, user_1, , db_storedproc);
 delimiter //;
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-   SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
+   SELECT * FROM db_storedproc.t1 LIMIT 1;
 END//
 delimiter ;//
 
@@ -244,21 +244,21 @@ delimiter ;//
 
 CALL sp_ins_1();
 SELECT row_count();
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 
 CALL sp_ins_3();
 #FIXME: check is 1 correct here? I expect 3 for 3 inserted rows inside the procedure
 SELECT row_count();
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 
 CALL sp_upd();
 SELECT row_count();
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 
 #FIXME: check is 3 correct here?  I expect 7 for 4 inserted and then 3 updated rows inside the procedure
 CALL sp_ins_upd();
 SELECT row_count();
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 
 # cleanup
 DROP PROCEDURE sp_ins_1;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
index 49bd5b98401..b88410b83f4 100644
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
@@ -6,16 +6,19 @@ let $message= .
               .                         IMPORTANT NOTICE:
               .                         -----------------
               .
-              .  FIXME: The .result files are still NOT CHECKED for correctness!
+              .  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
+              .         for correctness!
               .
               .  FIXME: Several tests are affected by known problems around DECIMAL
-              .  FIXME: and NUMERIC that will be checked again after WL#2984 once
+              .  FIXME: and NUMERIC that needs to be checked again after WL#2984
               .  FIXME: has been completed. Some of them are marked in the result.
               .
-              . Currently (Dec 06, 2005) this .result file is checked OK for Linux
-              . with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
-              . Using the available Windows version 5.0.16 there are differences
-              . that can be ignored (e.g. WL#2984).
+              .  This .result file has been checked OK with Linux 5.0.23-bk,
+              .  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
+              .
+              . This file has been saved although it might contain failures / wrong
+              . results to be able to detect _new_ differences in the behaviour.
+              . Hopefully the remaining checks can be made soon.
               .;
 --source include/show_msg80.inc
 
@@ -911,7 +914,7 @@ SELECT * from t1 where f2 = f1;
 #/t'ql/mysql-test
 #t]# t@localhost t
 
---error 0,1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE function()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE function;
@@ -1012,7 +1015,7 @@ CREATE PROCEDURE collate()
 CREATE PROCEDURE column()
    SELECT * from t1 where f2=f1;
 
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE columns()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE columns;
@@ -1189,7 +1192,7 @@ CREATE PROCEDURE false()
 CREATE PROCEDURE fetch()
    SELECT * from t1 where f2=f1;
 
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE fields()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE fields;
@@ -1210,7 +1213,7 @@ CREATE PROCEDURE force()
 CREATE PROCEDURE foreign()
    SELECT * from t1 where f2=f1;
 
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE found()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE found;
@@ -1223,7 +1226,7 @@ CREATE PROCEDURE from()
 CREATE PROCEDURE fulltext()
    SELECT * from t1 where f2=f1;
 
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE goto()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE goto;
@@ -1492,7 +1495,7 @@ CREATE PROCEDURE precision()
 CREATE PROCEDURE primary()
    SELECT * from t1 where f2=f1;
 
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE privileges()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE privileges;
@@ -1653,7 +1656,7 @@ CREATE PROCEDURE straight_join()
 CREATE PROCEDURE table()
    SELECT * from t1 where f2=f1;
 
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE tables()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE tables;
@@ -1834,7 +1837,7 @@ CREATE FUNCTION char ascii not null(f1 char ascii not null) returns char ascii n
 CREATE FUNCTION tinytext(f1 tinytext) returns tinytext
     return f1;
 
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE FUNCTION text(f1 text) returns text
     return f1;
   DROP FUNCTION text;
@@ -10125,7 +10128,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE sp1()
 BEGIN
     declare precision char;
@@ -10427,7 +10430,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE sp1()
 BEGIN
     declare soname char;
diff --git a/mysql-test/suite/funcs_1/t/innodb_storedproc_02.test b/mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/innodb_storedproc_03.test b/mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/innodb_storedproc_06.test b/mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/innodb_storedproc_07.test b/mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/innodb_storedproc_08.test b/mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/innodb_storedproc_10.test b/mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/memory_storedproc_02.test b/mysql-test/suite/funcs_1/t/memory_storedproc_02.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/memory_storedproc_03.test b/mysql-test/suite/funcs_1/t/memory_storedproc_03.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/memory_storedproc_06.test b/mysql-test/suite/funcs_1/t/memory_storedproc_06.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/memory_storedproc_07.test b/mysql-test/suite/funcs_1/t/memory_storedproc_07.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/memory_storedproc_08.test b/mysql-test/suite/funcs_1/t/memory_storedproc_08.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/memory_storedproc_10.test b/mysql-test/suite/funcs_1/t/memory_storedproc_10.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/myisam_storedproc_02.test b/mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/myisam_storedproc_03.test b/mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/myisam_storedproc_06.test b/mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/myisam_storedproc_07.test b/mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/myisam_storedproc_08.test b/mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/t/myisam_storedproc_10.test b/mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
old mode 100644
new mode 100755
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
index af94041d245..26a5dab3370 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
@@ -214,29 +214,21 @@ let $message= Testcase 3.5.1.7: - need to fix;
 	eval create table t1 (f1 int, f2 char(25),f3 int) engine=$engine_type;
 	CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1 
 		for each row set new.f3 = '14';
-# In 5.0 names to long (more than 64 chars) were trimed without an error
-# In 5.1 an error is returned. So adding a call with the expected error 
-# and one with a shorter name to validate proper execution
-	--error 1059
 	CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 		BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
-	CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
-		BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 
 	insert into t1 (f2) values ('insert 3.5.1.7');
 	select * from t1;
 	update t1 set f2='update 3.5.1.7';
 	select * from t1;
-	select trigger_name from information_schema.triggers order by trigger_name;
+	select trigger_name from information_schema.triggers;
 
 #Cleanup
 	--disable_warnings 
 	--error 0, 1360
 	drop trigger trg5_1;
-	# In 5.1 the long name should generate an error that is to long
-	--error 1059
+	# The above trigger should be dropped since the name was trimmed.
 	drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
-	drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 	drop table t1;
 
 #Section 3.5.1.8
@@ -393,10 +385,10 @@ let $message= Testcase 3.5.1.11:;
 	insert into trig_db2.t2 (f1,f2) values ('insert to db2 t2 from db1',3);
 	insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 	select @test_var1, @test_var2, @test_var3;
-	select * from t1 order by f2;
+	select * from t1;
 	select * from trig_db2.t2;
 	select * from trig_db3.t1;
-	select * from t1 order by f2;
+	select * from t1;
 	use test;
 
 #Cleanup
@@ -442,7 +434,7 @@ let $message= Testcase 3.5.2.1/2/3:;
 	create trigger trig_db2.trig2 before insert on trig_db2.t1 
 		for each row set @test_var3='trig2';
 	select trigger_schema, trigger_name, event_object_table
-		from information_schema.triggers order by trigger_name;
+		from information_schema.triggers;
 
 	set @test_var1= '', @test_var2= '', @test_var3= '';
 	insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_03.inc b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
index 4821b47099a..764fccec734 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
@@ -29,23 +29,23 @@ let $message= Testcase 3.5.3:;
 	set password for test_yesprivs@localhost = password('PWD');
 
 #Section 3.5.3.1 / 3.5.3.2
-# Test case: Ensure TRIGGER privilege is required to create a trigger
+# Test case: Ensure SUPER privilege is required to create a trigger
 #Section 3.5.3.3 / 3.5.3.4
-# Test case: Ensure that root always has the TRIGGER privilege.
+# Test case: Ensure that root always has the SUPER privilege.
 # OMR - No need to test this since SUPER priv is an existing one and not related
 #       or added for triggers (TP 2005-06-06)
 #Section 3.5.3.5 / 3.5.3.6
-# Test case: Ensure that the TRIGGER privilege is required to drop a trigger.
+# Test case: Ensure that the SUPER privilege is required to drop a trigger.
 let $message= Testcase 3.5.3.2/6:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 	grant ALL  on *.* to test_noprivs@localhost;
-	revoke TRIGGER on *.* from test_noprivs@localhost;
+	revoke SUPER  on *.* from test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant TRIGGER on *.* to test_yesprivs@localhost;
+	grant SUPER on *.* to test_yesprivs@localhost;
 # Adding the minimal priv to be able to set to the db
 	grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
@@ -63,15 +63,14 @@ let $message= Testcase 3.5.3.2:;
         select current_user;
 	use priv_db;
 
-# error 1227 is better, as it says, that not the privilege
-	--error 1142,1227
+	--error 1227
 	create trigger trg1_1 before INSERT on t1 for each row
 		set new.f1 = 'trig 3.5.3.2_1-no';
 
 	connection default;
 	use priv_db;
 	insert into t1 (f1) values ('insert 3.5.3.2-no');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 
 	connection yes_privs;
         select current_user;
@@ -84,27 +83,29 @@ let $message= Testcase 3.5.3.2:;
         select current_user;
 	use priv_db;
 
-        --error 1143
+        # Added following the fix to bug 5861
+	--error 1143
 	insert into t1 (f1) values ('insert 3.5.3.2-yes');
-	select f1 from t1 order by f1;
-
-        grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-        insert into t1 (f1) values ('insert 3.5.3.2-yes');
-        select f1 from t1 order by f1;
+	select f1 from t1;
+	grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
+let $message= note: once 15166 is fixed a similar case for SELECT needs to be added;
+--source include/show_msg.inc
 
+	insert into t1 (f1) values ('insert 3.5.3.2-yes');
+	select f1 from t1;
 let $message= Testcase 3.5.3.6:;
 --source include/show_msg.inc
 
 	connection no_privs;
 	use priv_db;
 
-	--error 1142,1227
+	--error 1227
 	drop trigger trg1_2;
 
 	connection default;
 	use priv_db;
 	insert into t1 (f1) values ('insert 3.5.3.6-yes');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 
 	connection yes_privs;
 	use priv_db;
@@ -114,7 +115,7 @@ let $message= Testcase 3.5.3.6:;
 	connection default;
 	use priv_db;
 	insert into t1 (f1) values ('insert 3.5.3.6-no');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 
 # Cleanup
 	--disable_warnings
@@ -143,7 +144,7 @@ let $message=Testcase 3.5.3.7a:;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
+	grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
@@ -155,7 +156,7 @@ let $message=Testcase 3.5.3.7a:;
 	select current_user;
 	use priv_db;
 	show grants;
-	select f1 from t1 order by f1;
+	select f1 from t1;
 
 let $message= Trigger create disabled - should fail - Bug 8884;
 --source include/show_msg.inc
@@ -165,7 +166,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1a');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 	--error 0, 1360
 	drop trigger trg4a_1;
 
@@ -178,8 +179,14 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
+
+        # Added to bypass bug 15166
+let $message= SELECT priv added to bypass bug 15166;
+--source include/show_msg.inc
+	grant SELECT on *.* to test_yesprivs@localhost;
+
 	insert into t1 (f1) values ('insert 3.5.3.7-2b');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 
 # Cleanup
 	--disable_warnings
@@ -193,13 +200,13 @@ let $message= Testcase 3.5.3.7b:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant TRIGGER on *.* to test_noprivs;
+	grant SUPER on *.* to test_noprivs;
 	grant ALL  on priv_db.* to test_noprivs@localhost;
 	revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 	show grants for test_noprivs;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant TRIGGER on *.* to test_yesprivs@localhost;
+	grant SUPER on *.* to test_yesprivs@localhost;
 	grant UPDATE on priv_db.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -221,9 +228,9 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1b');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 	update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-	select f1 from t1 order by f1;
+	select f1 from t1;
 	--error 0, 1360
 	drop trigger trg4b_1;
 
@@ -235,10 +242,15 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
+        # Added to bypass bug 15166
+let $message= SELECT priv added to bypass bug 15166;
+--source include/show_msg.inc
+	grant SELECT on priv_db.* to test_yesprivs@localhost;
+
 	insert into t1 (f1) values ('insert 3.5.3.7-2b');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 	update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-	select f1 from t1 order by f1;
+	select f1 from t1;
 # Cleanup
 	--disable_warnings
 	drop trigger trg4b_2;
@@ -251,13 +263,13 @@ let $message= Testcase 3.5.3.7c;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant TRIGGER on *.* to test_noprivs@localhost;
+	grant SUPER on *.* to test_noprivs@localhost;
 	grant ALL  on priv_db.t1 to test_noprivs@localhost;
 	revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 	show grants for test_noprivs;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant TRIGGER on *.* to test_yesprivs@localhost;
+	grant SUPER on *.* to test_yesprivs@localhost;
 	grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -279,7 +291,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1c');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 	--error 0, 1360
 	drop trigger trg4c_1;
 
@@ -291,8 +303,13 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
+        # Added to bypass bug 15166
+let $message= SELECT priv added to bypass bug 15166;
+--source include/show_msg.inc
+	grant SELECT on priv_db.t1 to test_yesprivs@localhost;
+
 	insert into t1 (f1) values ('insert 3.5.3.7-2c');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 
 # Cleanup
 	--disable_warnings
@@ -308,13 +325,13 @@ let $message= Testcase 3.5.3.7d:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant TRIGGER on *.* to test_noprivs@localhost;
+	grant SUPER on *.* to test_noprivs@localhost;
 # There is no ALL privs on the column level
 	grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 	show grants for test_noprivs;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant TRIGGER on *.* to test_yesprivs@localhost;
+	grant SUPER on *.* to test_yesprivs@localhost;
 	grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_noprivs;
 
@@ -335,7 +352,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1d');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 	--error 0, 1360
 	drop trigger trg4d_1;
 
@@ -347,8 +364,13 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
+        # Added to bypass bug 15166
+let $message= SELECT priv added to bypass bug 15166;
+--source include/show_msg.inc
+	grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
+
 	insert into t1 (f1) values ('insert 3.5.3.7-2d');
-	select f1 from t1 order by f1;
+	select f1 from t1;
 
 # Cleanup
 	--disable_warnings
@@ -372,7 +394,7 @@ let $message= Testcase 3.5.3.8a:;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
+	grant SUPER, SELECT on *.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
@@ -411,6 +433,11 @@ let $message= Trigger create disabled - should fail - Bug 8887;
         set @test_var= 'before trig 3.5.3.8-2a';
 	select @test_var;
 
+        # Added to bypass bug 15166
+let $message= UPDATE priv added to bypass bug 15166;
+--source include/show_msg.inc
+	grant UPDATE on *.* to test_yesprivs@localhost;
+
 	insert into t1 (f1) values ('insert 3.5.3.8-2a');
 	select @test_var;
 
@@ -426,13 +453,13 @@ let $message= Testcase: 3.5.3.8b;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant TRIGGER on *.* to test_noprivs@localhost;
+	grant SUPER on *.* to test_noprivs@localhost;
 	grant ALL  on priv_db.* to test_noprivs@localhost;
 	revoke SELECT  on priv_db.* from test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant TRIGGER on *.* to test_yesprivs@localhost;
+	grant SUPER on *.* to test_yesprivs@localhost;
 	grant SELECT on priv_db.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -472,6 +499,11 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	insert into t1 (f1) values ('insert 3.5.3.8-2b');
 	select @test_var;
 
+        # Added to bypass bug 15166
+let $message= UPDATE priv added to bypass bug 15166;
+--source include/show_msg.inc
+	grant UPDATE on priv_db.* to test_yesprivs@localhost;
+
 	update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 	select @test_var;
 # Cleanup
@@ -486,13 +518,13 @@ let $message= Testcase 3.5.3.8c:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant TRIGGER on *.* to test_noprivs@localhost;
+	grant SUPER on *.* to test_noprivs@localhost;
 	grant ALL  on priv_db.t1 to test_noprivs@localhost;
 	revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant TRIGGER on *.* to test_yesprivs@localhost;
+	grant SUPER on *.* to test_yesprivs@localhost;
 	grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -528,6 +560,11 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	connection default;
         set @test_var='before trig 3.5.3.8-2c';
 
+        # Added to bypass bug 15166
+let $message= UPDATE priv added to bypass bug 15166;
+--source include/show_msg.inc
+	grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
+
 	insert into t1 (f1) values ('insert 3.5.3.8-2c');
 	select @test_var;
 # Cleanup
@@ -542,13 +579,13 @@ let $message=Testcase: 3.5.3.8d:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant TRIGGER on *.* to test_noprivs@localhost;
+	grant SUPER on *.* to test_noprivs@localhost;
 # There is no ALL prov on the column level
 	grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant TRIGGER on *.* to test_yesprivs@localhost;
+	grant SUPER on *.* to test_yesprivs@localhost;
 	grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_noprivs@localhost;
 
@@ -583,6 +620,11 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	connection default;
         set @test_var='before trig 3.5.3.8-2d';
 
+        # Added to bypass bug 15166
+let $message= UPDATE priv added to bypass bug 15166;
+--source include/show_msg.inc
+	grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
+
 	insert into t1 (f1) values ('insert 3.5.3.8-2d');
 	select @test_var;
 
@@ -608,7 +650,7 @@ let $message=Testcase: 3.5.3.x:;
         eval create table t2 (f2 int) engine= $engine_type;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant TRIGGER on *.* to test_yesprivs@localhost;
+	grant SUPER on *.* to test_yesprivs@localhost;
 	grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 	grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
@@ -629,8 +671,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 	grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (4);
-	select f1 from t1 order by f1;
-	select f2 from t2 order by f2;
+	select f1 from t1;
+	select f2 from t2;
 
 	connection yes_353x;
 	use priv_db;
@@ -645,8 +687,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 	grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (2);
-	select f1 from t1 order by f1;
-	select f2 from t2 order by f2;
+	select f1 from t1;
+	select f2 from t2;
 
 	connection yes_353x;
 	use priv_db;
@@ -661,8 +703,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 	grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (1);
-	select f1 from t1 order by f1;
-	select f2 from t2 order by f2;
+	select f1 from t1;
+	select f2 from t2;
         select @aaa;
 
 	connection yes_353x;
@@ -678,8 +720,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 	grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (1);
-	select f1 from t1 order by f1;
-	select f2 from t2 order by f2;
+	select f1 from t1;
+	select f2 from t2;
 
 
 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
index ccfeb1aec99..15c94ada975 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
@@ -51,14 +51,14 @@ let $message= Testcase 3.5.4.1:;
 	connection con1_general;
 	Use db_drop;
 	Insert into t1 values ('Insert error 3.5.4.1');
-	Select * from t1 order by f1;
+	Select * from t1;
 	connection con1_super;
 	drop trigger trg1;
 	select trigger_schema, trigger_name, event_object_table
-		from information_schema.triggers order by trigger_name;
+		from information_schema.triggers;
 	connection con1_general;
 	Insert into t1 values ('Insert no trigger 3.5.4.1');
-	Select * from t1 order by f1;
+	Select * from t1;
 
 #Cleanup
 	--disable_warnings 
@@ -294,7 +294,7 @@ let $message= Testcase 3.5.5.4:;
 	Select * from t2;
 	use dbtest_one;
 	Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
-	Select * from dbtest_two.t2 order by f1;
+	Select * from dbtest_two.t2;
 
 #Cleanup
 	connection con1_super;
@@ -535,7 +535,7 @@ let $message= Testcase 3.5.7.13/14:;
 	Create trigger trg9_1 BEFORE DELETE 
 		on tb3 for each row set @test_var=@test_var+1;
 
-	--error ER_NOT_SUPPORTED_YET
+	--error ER_NOT_SUPPORTED_YET 
 	Create trigger trg9_2 BEFORE DELETE 
 		on tb3 for each row set @test_var=@test_var+10;
 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_08.inc b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
index 4a7ea486248..300080e455d 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
@@ -111,10 +111,9 @@ let $message= 3.5.8.4 - multiple SQL;
 	Insert into tb3 (f120, f122, f136, f144, f163) 
 		values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 	Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
-# error in ndb
-	select * from db_test.t1_i order by i120;
-	select * from db_test.t1_u order by u120;
-	select * from db_test.t1_d order by d120;
+	select * from db_test.t1_i;
+	select * from db_test.t1_u;
+	select * from db_test.t1_d;
 	select @test_var;
 
 
@@ -122,22 +121,16 @@ let $message= 3.5.8.4 - single SQL - insert;
 --source include/show_msg.inc
 # Trigger definition - single SQL Insert
 	connection con2_super;
-        delimiter //;
 	Create trigger trg2 BEFORE UPDATE on tb3 for each row
-        BEGIN
 		insert into db_test.t1_i 
 			values (new.f120, new.f136, new.f144, new.f163);
-        END//
-        delimiter ;//
 
 # Trigger exeution - single SQL Insert
 	connection con2_general;
-        Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-        select * from db_test.t1_i order by i120;
 	update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 	Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-	select * from db_test.t1_i order by i120;
+	select * from db_test.t1_i;
 
 
 let $message= 3.5.8.4 - single SQL - update;
@@ -155,7 +148,7 @@ let $message= 3.5.8.4 - single SQL - update;
 	update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 		 where f122='Test 3.5.8.4-Single Insert';
 	Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-	select * from db_test.t1_u order by u120;
+	select * from db_test.t1_u;
 
 
 let $message= 3.5.8.3/4 - single SQL - delete;
@@ -174,7 +167,7 @@ let $message= 3.5.8.3/4 - single SQL - delete;
 		 where f122='Test 3.5.8.4-Single Update';
 #unlock tables;
 	Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-	select * from db_test.t1_d order by d120;
+	select * from db_test.t1_d;
 
 
 let $message= 3.5.8.3/4 - single SQL - select;
@@ -235,16 +228,16 @@ let $message= Testcase 3.5.8.5 (IF):;
 	set @test_var='Empty', @test_var2=0;
 	Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+		from tb3 where f122 = 'Test 3.5.8.5-if';
 	Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+		from tb3 where f122 = 'Test 3.5.8.5-if';
 	Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+		from tb3 where f122 = 'Test 3.5.8.5-if';
 	Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
+		from tb3 where f122 = 'Test 3.5.8.5-if';
 
 	delimiter //;
 	--error 1064
@@ -320,28 +313,28 @@ let $message= Testcase 3.5.8.5-case:;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('a', 'Test 3.5.8.5-case', 5, 7);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case';
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('b', 'Test 3.5.8.5-case', 71,16);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case';
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('c', 'Test 3.5.8.5-case', 80,1);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case';
 	Insert into tb3 (f120, f122, f136) 
 		values ('d', 'Test 3.5.8.5-case', 152);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case';
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('e', 'Test 3.5.8.5-case', 200, 8);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case';
 	--error 0, 1339
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('f', 'Test 3.5.8.5-case', 100, 8);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case';
 
 	delimiter //;
 	--error 1064
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_09.inc b/mysql-test/suite/funcs_1/triggers/triggers_09.inc
index 912c5f50b21..4eaaf3e35e2 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_09.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_09.inc
@@ -85,7 +85,7 @@ let $message= Testcase 3.5.9.3:;
 		values ('Test 3.5.9.3', 7, 123.17);
 	Update tb3 Set f136=8 where f122='Test 3.5.9.3';
 
-	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
+	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
@@ -104,7 +104,7 @@ let $message= Testcase 3.5.9.3:;
 
 	delete from tb3 where f122='Test 3.5.9.3';
 
-	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
+	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
@@ -159,7 +159,7 @@ let $message= Testcase 3.5.9.4:;
 		values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 
 	select f118, f121, f122, f136, f151, f163 from tb3 
-		where f122 like 'Test 3.5.9.4%' order by f163;
+		where f122 like 'Test 3.5.9.4%';
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
@@ -180,7 +180,7 @@ let $message= Testcase 3.5.9.4:;
 		 where f122='Test 3.5.9.4';
 
 	select f118, f121, f122, f136, f151, f163 from tb3 
-		where f122 like 'Test 3.5.9.4-trig' order by f163;
+		where f122 like 'Test 3.5.9.4-trig';
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
index 1b7505260f7..534c4efaa86 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
@@ -48,7 +48,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 	Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 	Insert into vw11 (f122, f151) values ('Not in View', 3);
 	select f121, f122, f151, f163
-		from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+		from tb3 where f122 like 'Test 3.5.10.1/2/3%';
 	select f121, f122, f151, f163 from vw11;
 	select f121, f122, f151, f163
 		from tb3 where f122 like 'Not in View';
@@ -56,7 +56,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 #Section 3.5.10.2
 	Update vw11 set f163=1;
 	select f121, f122, f151, f163 from tb3
-		where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+		where f122 like 'Test 3.5.10.1/2/3%';
 	select f121, f122, f151, f163 from vw11;
 
 #Section 3.5.10.3
@@ -64,7 +64,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 	Select @test_var as 'before delete';
 	delete from vw11 where f151=1;
 	select f121, f122, f151, f163 from tb3
-		where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+		where f122 like 'Test 3.5.10.1/2/3%';
 	select f121, f122, f151, f163 from vw11;
 	Select @test_var as 'after delete';
 
@@ -98,7 +98,7 @@ let $message= Testcase 3.5.10.4:;
 	eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 
 	select @counter as 'Rows Loaded After';
-	Select * from tb_load order by f1 limit 10;
+	Select * from tb_load limit 10;
 
 #Cleanup
 	--disable_warnings
@@ -233,7 +233,7 @@ let $message= Testcase y.y.y.2: Check for triggers starting triggers;
 #lock tables t1 write, t2_1 write, t2_2 write, t2_3 write, t2_4 write, t3 write;
 	insert into t1 values (1);
 #unlock tables;
-	select * from t3 order by f1;
+	select * from t3;
 
 #Cleanup
 	--disable_warnings
@@ -274,10 +274,10 @@ let $message= Testcase y.y.y.3: Circular trigger reference;
 	# OBN See bug 11896
 	--error 1442
 	insert into t1 values (1);
-	select * from t1 order by f1;
-	select * from t2 order by f2;
-	select * from t3 order by f3;
-	select * from t4 order by f4;
+	select * from t1;
+	select * from t2;
+	select * from t3;
+	select * from t4;
 
 #Cleanup
 	--disable_warnings
@@ -384,9 +384,9 @@ let $message= Testcase y.y.y.5: Roleback of nested trigger references;
 	--error 1264
 	insert into t1 values (1);
 	commit;
-	select * from t1 order by f1;
-	select * from t2 order by f2;
-	select * from t3 order by f3;
+	select * from t1;
+	select * from t2;
+	select * from t3;
 #unlock tables;
 #Cleanup
 	--disable_warnings
diff --git a/mysql-test/suite/funcs_1/views/func_view.inc b/mysql-test/suite/funcs_1/views/func_view.inc
index 3bf9e96b332..4479db22e70 100644
--- a/mysql-test/suite/funcs_1/views/func_view.inc
+++ b/mysql-test/suite/funcs_1/views/func_view.inc
@@ -3,8 +3,7 @@
 #  Functions within VIEWs                         #
 #                                                 #
 ###################################################
-# 2006-12-08 ML   Maintenance + refinements
-# 2005-09-14 ML   Create this test
+# 14.09.2005 ML
 
 let $message= ! Attention: The file with the expected results suffers from
 Bug#10713: mysqldump includes database in create view and referenced tables;
@@ -69,7 +68,7 @@ Bug#10713: mysqldump includes database in create view and referenced tables;
 #         But there will be a special messages within the protocol files.
 #         Example:
 #            "Attention: CAST --> SIGNED INTEGER
-#            The file with expected results suffers from Bug 5913";
+#            The file with expected results suffers from Bug 5083 5913 9809";
 #            means, the file with expected results contains result sets which
 #            are known to be wrong.
 #            "Attention: The last <whatever> failed" 
@@ -188,7 +187,6 @@ CREATE TABLE t1_modes
 --enable_query_log
 
 # The table to be used in the FROM parts of the SELECTs
---replace_result $type <engine_to_be_tested>
 eval CREATE TABLE t1_values
 (
    id BIGINT AUTO_INCREMENT,
@@ -418,8 +416,8 @@ eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = -25;
 # SELECT * FROM t1_values;
 
-# 1.    Cast Functions and Operators
-# 1.1   CAST
+# 1.     Cast Functions and Operators
+# 1.1.   CAST
 #
 # Note(ML): I guess the CAST routines are used in many other functions.
 #           Therefore check also nearly all "ugly" variants like 
@@ -589,10 +587,15 @@ let $col_type= my_bigint;
 eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = 1758;
 let $col_type= my_double;
-# Bug#12440: CAST(data type DOUBLE AS TIME) strange results;
+let $message= some statements disabled because of
+Bug#12440: CAST(data type DOUBLE AS TIME) strange results;
+--source include/show_msg80.inc
+if (0)
+{
 --source suite/funcs_1/views/fv_cast.inc
 eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = +1.758E+3;
+}
 let $col_type= my_datetime;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_date;
@@ -628,11 +631,16 @@ let $col_type= my_bigint;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_decimal;
 --source suite/funcs_1/views/fv_cast.inc
-# Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian;
+let $message= some statements disabled because of
+Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian;
+--source include/show_msg80.inc
+if (0)
+{
 let $col_type= my_double;
 --source suite/funcs_1/views/fv_cast.inc
 eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = -0.33333333E+4;
+}
 let $col_type= my_datetime;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_date;
@@ -650,8 +658,11 @@ let $target_type= SIGNED INTEGER;
 #
 let $message= 
 "Attention: CAST --> SIGNED INTEGER
+            The file with expected results suffers from
+            Bug#5083 Big integer values are inserted as negative into 
+                     decimal/string columns
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Status: To be fixed later";
+            Both have the status: To be fixed later";
 --source include/show_msg80.inc
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_cast.inc
@@ -665,9 +676,14 @@ let $col_type= my_bigint;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_decimal;
 --source suite/funcs_1/views/fv_cast.inc
-# Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result;
+let $message= some statements disabled because of
+Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result;
+--source include/show_msg80.inc
+if (0)
+{
 let $col_type= my_double;
 --source suite/funcs_1/views/fv_cast.inc
+}
 let $col_type= my_datetime;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_date;
@@ -685,7 +701,7 @@ let $target_type= UNSIGNED INTEGER;
 #
 let $message= 
 "Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5913";
+            The file with expected results suffers from Bug 5083 5913 9809";
 --source include/show_msg80.inc
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_cast.inc
@@ -700,11 +716,10 @@ let $col_type= my_bigint;
 let $col_type= my_decimal;
 --source suite/funcs_1/views/fv_cast.inc
 let $message= some statements disabled because of
-Bug#5913 Traditional mode: BIGINT range not correctly delimited;
+Bugs#8663: cant use bgint unsigned as input to cast;
 --source include/show_msg80.inc
 if (0)
 {
-# Bugs#8663: cant use bgint unsigned as input to cast
 let $col_type= my_double;
 --source suite/funcs_1/views/fv_cast.inc
 }
@@ -832,6 +847,11 @@ let $col_type= my_year;
 #           select if(isnull(`test`.`t1`.`f1`),_latin1'IS     NULL',
 #                  _latin1'IS NOT NULL'),...
 #
+let $message=
+"Attention: IF($col_type IS NULL, ...
+            The file with expected results suffers from 
+            Bug#11689. successful CREATE VIEW but SELECT on view fails.";
+--source include/show_msg80.inc
 # Bug#11689 success on Create view .. IF(col1 IS NULL,...), col2 ; but SELECT fails
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_if2.inc
@@ -1010,7 +1030,7 @@ eval SET @my_select =
 #
 let $message= 
 "Attention: LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', <numeric column>)
-            The file with expected results suffers from Bug 10963"
+            The file with expected results suffers from Bug 10963 11728"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
             because there are 32/64 Bit differences;
 --source include/show_msg80.inc
@@ -1064,10 +1084,8 @@ $col_type, id FROM t1_values';
 #            If the file doesn't exist or cannot be read ... ,
 #            the function returns NULL.
 # SELECT LOADFILE
-#        Prepare a file:
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 eval SET @my_select = 
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
 --source suite/funcs_1/views/fv1.inc
 
 
@@ -1291,13 +1309,14 @@ while ($select_id)
        --disable_query_log
        eval set @got_errno= $mysql_errno ;
        let $run0= `SELECT @got_errno = 0`;
-       --enable_query_log
-       if (!$run0)
+       let $print_warning= `SELECT @got_errno`;
+       if ($print_warning)
        {
-          --echo
-          --echo Attention: The last CREATE VIEW failed
-          --echo
+          SELECT 'Attention: The last CREATE VIEW failed ' AS ""
+           UNION
+          SELECT '' ;
        }
+       --enable_query_log
     }
 
     # FIXME           The loop over the modes will start here.
@@ -1311,17 +1330,21 @@ while ($select_id)
           --disable_result_log
        }
        eval $my_select
-            WHERE select_id = $select_id OR select_id IS NULL order by id;
+            WHERE select_id = $select_id OR select_id IS NULL;
        if ($run_no_result)
        {
           --enable_result_log
        }
-       if ($mysql_errno)
+       --disable_query_log
+       eval set @got_errno= $mysql_errno ;
+       let $print_warning= `SELECT @got_errno`;
+       if ($print_warning)
        {
-          --echo
-          --echo Attention: The last SELECT on the base table failed
-          --echo
+          SELECT 'Attention: The last SELECT on the base table failed' AS ""
+           UNION
+          SELECT '' ;
        }
+       --enable_query_log
     }
 
     # $run0 is 1, if CREATE VIEW was successful.
@@ -1330,12 +1353,16 @@ while ($select_id)
     {
        # Check the CREATE VIEW statement
        SHOW CREATE VIEW v1;
-       if ($mysql_errno)
+       --disable_query_log
+       eval set @got_errno= $mysql_errno ;
+       let $print_warning= `SELECT @got_errno`;
+       if ($print_warning)
        {
-          --echo
-          --echo Attention: The last SHOW CREATE VIEW failed
-          --echo
+          SELECT 'Attention: The last SHOW CREATE VIEW failed' AS ""
+           UNION
+          SELECT '' ;
        }
+       --enable_query_log
 
        # Maybe a Join is faster
        if ($run_no_result)
@@ -1344,17 +1371,21 @@ while ($select_id)
        }
        eval SELECT v1.* FROM v1
             WHERE v1.id IN (SELECT id FROM t1_values
-                            WHERE select_id = $select_id OR select_id IS NULL) order by id;
+                            WHERE select_id = $select_id OR select_id IS NULL);
        if ($run_no_result)
        {
           --enable_result_log
        }
-       if ($mysql_errno)
+       --disable_query_log
+       eval set @got_errno= $mysql_errno ;
+       let $print_warning= `SELECT @got_errno`;
+       if ($print_warning)
        {
-          --echo
-          --echo Attention: The last SELECT from VIEW failed
-          --echo
+          SELECT 'Attention: The last SELECT from VIEW failed' AS ""
+           UNION
+          SELECT '' ;
        }
+       --enable_query_log
 
        DROP VIEW v1;
     }
@@ -1363,11 +1394,11 @@ while ($select_id)
 
     # Produce two empty lines as separator between different SELECTS
     # to be tested.
-    --echo
-    --echo
+    --disable_query_log
+    SELECT '' AS "";
+    --enable_query_log
 
     dec $select_id ;
 }
 
 DROP TABLE t1_selects, t1_modes, t1_values;
---exec rm $MYSQLTEST_VARDIR/tmp/func_view.dat
diff --git a/mysql-test/suite/funcs_1/views/views_master.inc b/mysql-test/suite/funcs_1/views/views_master.inc
index 0e3371bdb18..b06873af159 100644
--- a/mysql-test/suite/funcs_1/views/views_master.inc
+++ b/mysql-test/suite/funcs_1/views/views_master.inc
@@ -1772,7 +1772,7 @@ SELECT * FROM v1 ORDER BY f1;
 --enable_info
 # 1.   The record to be inserted will be within the scope of the view.
 #      But there is already a record with the PRIMARY KEY f1 = 2 .
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error 1062
 INSERT INTO v1 VALUES(2,'two');
 # 2.   The record to be inserted will be within the scope of the view.
 #      There is no already existing record with the PRIMARY KEY f1 = 3 .
@@ -1789,7 +1789,7 @@ SELECT * FROM v1 ORDER BY f1;
 # 1.   The record to be updated is within the scope of the view
 #      and will stay inside the scope.
 #      But there is already a record with the PRIMARY KEY f1 = 2 .
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error 1062
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
 # 2.   The record to be updated is within the scope of the view
 #      and will stay inside the scope.
@@ -1873,11 +1873,11 @@ DROP VIEW  IF EXISTS test.v1;
 eval CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
      ENGINE = $engine_type;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1 order by f1, f2;
+SELECT * FROM t1;
 
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 --enable_info
 # positive cases
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -1885,7 +1885,7 @@ INSERT INTO v1 VALUES('B',2);
 --disable_info
 # Bug#11771: View over InnoDB table, wrong result SELECT on VIEW,
 #            field->query_id wrong
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 # negative cases
 --enable_info
 --error 1369
@@ -1895,7 +1895,7 @@ INSERT INTO v1 VALUES('B',3);
 --disable_info
 # Bug#11771: View over InnoDB table, wrong result SELECT on VIEW,
 #            field->query_id wrong
-SELECT * FROM v1 order by f1, f2;
+SELECT * FROM v1;
 
 
 let $message= Testcase 3.3.1.49 ;
@@ -3287,7 +3287,7 @@ DELETE FROM t1;
 #           f1 gets the default 0, because we are in the native sql_mode
 INSERT INTO v1 SET f2 = 'ABC';
 #           f1 gets the default 0, but this value is already exists
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error 1062
 INSERT INTO v1 SET f2 = 'ABC';
 SELECT * from t1;
 DELETE FROM t1;
@@ -3375,7 +3375,7 @@ CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 #           f1 gets the default 0, because we are in the native sql_mode
 INSERT INTO v1 SET f2 = 'ABC';
 #           f1 gets the default 0 and this value is already exists
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error 1062
 INSERT INTO v1 SET f2 = 'ABC';
 SELECT * from t1;
 DELETE FROM t1;
@@ -3838,8 +3838,8 @@ INSERT INTO v1 SET f1 = -1, f4 = 'ABC', report = 'v1 0';
 # 0. Initial state
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, report;
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM t1;
+SELECT * FROM v1;
 #
 # 1. Name of one base table column is altered
 ALTER TABLE t1 CHANGE COLUMN f4 f4x CHAR(5);
@@ -3854,9 +3854,9 @@ DESCRIBE t1;
 # Bug#12533 crash on DESCRIBE <view> after renaming base table column;
 --error 1356
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 --error 1356
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 #
 # 2. Length of one base table column is increased
@@ -3865,8 +3865,8 @@ INSERT INTO t1 SET f1 = 2, f4 = '<-- 10 -->', report = 't1 2';
 INSERT INTO v1 SET f1 = 2, f4 = '<-- 10 -->', report = 'v1 2';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, report;
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM t1;
+SELECT * FROM v1;
 #
 # 3. Length of one base table column is reduced
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(8);
@@ -3874,8 +3874,8 @@ INSERT INTO t1 SET f1 = 3, f4 = '<-- 10 -->', report = 't1 3';
 INSERT INTO v1 SET f1 = 3, f4 = '<-- 10 -->', report = 'v1 3';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, report;
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM t1;
+SELECT * FROM v1;
 #
 # 4. Type of one base table column is altered   string -> string
 ALTER TABLE t1 CHANGE COLUMN f4 f4 VARCHAR(20);
@@ -3883,8 +3883,8 @@ INSERT INTO t1 SET f1 = 4, f4 = '<------ 20 -------->', report = 't1 4';
 INSERT INTO v1 SET f1 = 4, f4 = '<------ 20 -------->', report = 'v1 4';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, report;
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM t1;
+SELECT * FROM v1;
 #
 # 5. Type of one base table column altered   numeric -> string 
 ALTER TABLE t1 CHANGE COLUMN f1 f1 VARCHAR(30);
@@ -3894,8 +3894,8 @@ INSERT INTO v1 SET f1 = '<------------- 30 ----------->',
                    f4 = '<------ 20 -------->', report = 'v1 5';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, report;
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM t1;
+SELECT * FROM v1;
 #
 # 6. DROP of one base table column
 ALTER TABLE t1 DROP COLUMN f2;
@@ -3905,9 +3905,9 @@ INSERT INTO v1 SET f1 = 'ABC', f4 = '<------ 20 -------->', report = 'v1 6';
 DESCRIBE t1;
 --error 1356
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, report;
+SELECT * FROM t1;
 --error 1356
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM v1;
 #
 # 7. Recreation of dropped base table column with the same data type like before
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
@@ -3917,8 +3917,8 @@ INSERT INTO v1 SET f1 = 'ABC', f2 = '1500-12-04',
                    f4 = '<------ 20 -------->', report = 'v1 7';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, report;
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM t1;
+SELECT * FROM v1;
 #
 # 8. Recreation of dropped base table column with a different data type
 #    like before
@@ -3930,8 +3930,8 @@ INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
                    f4 = '<------ 20 -------->', report = 'v1 8';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, report;
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM t1;
+SELECT * FROM v1;
 #
 # 9. Add a column to the base table
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
@@ -3944,8 +3944,8 @@ INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
                    f4 = '<------ 20 -------->', report = 'v1 9a';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, report;
-SELECT * FROM v1 order by f1, report;
+SELECT * FROM t1;
+SELECT * FROM v1;
 #
 # 10. VIEW with numeric function is "victim" of data type change
 DROP TABLE t1;
@@ -3955,32 +3955,32 @@ INSERT INTO t1   SET f1 = 'ABC', f2 = 3;
 CREATE VIEW v1 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, f2;
-SELECT * FROM v1 order by 2;
+SELECT * FROM t1;
+SELECT * FROM v1;
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
 INSERT INTO t1   SET f1 = 'ABC', f2 = 'DEF';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1 order by f1, f2;
-SELECT * FROM v1 order by 2;
+SELECT * FROM t1;
+SELECT * FROM v1;
 # Some statements for comparison
 # - the ugly SQRT('DEF) as constant
 SELECT SQRT('DEF');
 # - Will a VIEW based on the same definition show the same result ?
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2 order by 1;
+SELECT * FROM v2;
 # - Will a VIEW v2 created after the base table column recreation show the same
 #   result set like v1 ?
 CREATE OR REPLACE VIEW v2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 DESCRIBE v2;
-SELECT * FROM v2 order by 2;
+SELECT * FROM v2;
 # - What will be the content of base table created with AS SELECT ?
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM t2 order by 2;
+SELECT * FROM t2;
 --enable_ps_protocol
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
@@ -3988,7 +3988,7 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM t2 order by 2;
+SELECT * FROM t2;
 --enable_ps_protocol
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
@@ -3996,7 +3996,7 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM t2 order by 2;
+SELECT * FROM t2;
 --enable_ps_protocol
 #
 DROP TABLE t1;

From 78587a08acfc4d9f34ffaf09672ded531eb4c38a Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Fri, 27 Jul 2007 15:36:10 +0300
Subject: [PATCH 072/139] portation of the test case for bug 29571 to cover row
 replication

---
 .../suite/rpl/r/rpl_row_insert_delayed.result | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result b/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
index 2044672f49d..87b375bf653 100644
--- a/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
+++ b/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
@@ -45,4 +45,30 @@ id	name
 20	is Bond
 USE test;
 DROP SCHEMA mysqlslap;
+use test;
+FLUSH LOGS;
+FLUSH LOGS;
+CREATE TABLE t1(a int, UNIQUE(a));
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+flush table t1;
+show binlog events in 'master-bin.000002' LIMIT 2,2;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+x	x	x	x	x	table_id: 23 (test.t1)
+x	x	x	x	x	table_id: 23 flags: STMT_END_F
+select * from t1;
+a
+1
+On slave
+show binlog events in 'slave-bin.000002' LIMIT 2,2;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+x	x	x	x	x	table_id: 23 (test.t1)
+x	x	x	x	x	table_id: 23 flags: STMT_END_F
+select * from t1;
+a
+1
+drop table t1;
+FLUSH LOGS;
+FLUSH LOGS;
+End of 5.0 tests
 set @@global.binlog_format = @old_global_binlog_format;

From 0936976e8d21a4980145d31657b862652af29f22 Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.(none)>
Date: Fri, 27 Jul 2007 16:37:29 +0400
Subject: [PATCH 073/139] A fix and a test case for Bug#24918 drop table and
 lock / inconsistent between perm and temp tables. Review fixes.

The original bug report complains that if we locked a temporary table
with LOCK TABLES statement, we would not leave LOCK TABLES mode
when this temporary table is dropped.

Additionally, the bug was escalated when it was discovered than
when a temporary transactional table that was previously
locked with LOCK TABLES statement was dropped, futher actions with
this table, such as UNLOCK TABLES, would lead to a crash.

The problem originates from incomplete support of transactional temporary
tables. When we added calls to handler::store_lock()/handler::external_lock()
to operations that work with such tables, we only covered the normal
server code flow and did not cover LOCK TABLES mode.
In LOCK TABLES mode, ::external_lock(LOCK) would sometimes be called without
matching ::external_lock(UNLOCK), e.g. when a transactional temporary table
was dropped. Additionally, this table would be left in the list of LOCKed
TABLES.

The patch aims to address this inadequacy. Now, whenever an instance
of 'handler' is destroyed, we assert that it was priorly
external_lock(UNLOCK)-ed. All the places that violate this assert
were fixed.

This patch introduces no changes in behavior -- the discrepancy in
behavior will be fixed when we start calling ::store_lock()/::external_lock()
for all tables, regardless whether they are transactional or not,
temporary or not.


mysql-test/r/innodb_mysql.result:
  Update test results (Bug#24918)
mysql-test/t/innodb_mysql.test:
  Add a test case for Bug#24918
sql/handler.h:
  Make handler::external_lock() a protected method. Backport from 5.1 its
  public wrapper handler::ha_external_lock().
  Assert that the handler is not closed if it is still locked.
sql/lock.cc:
  In mysql_lock_tables only call lock_external() for the list of tables that
  we called store_lock() for.
  E.g. get_lock_data() does not add non-transactional temporary tables to the
  lock list, so lock_external() should not be called for them.

  Use handler::ha_external_lock() instead of handler::external_lock().

  Add comments for mysql_lock_remove(), parameterize one strange
  side effect that it has. At least in one place where mysql_lock_remove
  is used, this side effect is not desired (DROP TABLE). The parameter
  will be dropped in 5.1, along with the side effect.
sql/mysql_priv.h:
  Update declaration of mysql_lock_remove().
sql/opt_range.cc:
  Deploy handler::ha_external_lock() instead of handler::external_lock()
sql/sql_base.cc:
  When closing a temporary table, remove the table from the list of LOCKed
  TABLES of this thread, in case it's there.
  It's there if it is a transactional temporary table.
  Use a new declaration of mysql_lock_remove().
sql/sql_class.h:
  Extend the comment for THD::temporary_tables.
sql/sql_table.cc:
  Deploy handler::ha_external_lock() instead of handler::external_lock()
---
 mysql-test/r/innodb_mysql.result | 28 ++++++++++++++++++++++
 mysql-test/t/innodb_mysql.test   | 34 +++++++++++++++++++++++++++
 sql/handler.h                    | 40 +++++++++++++++++++++++++++++---
 sql/lock.cc                      | 35 +++++++++++++++++++++++-----
 sql/mysql_priv.h                 |  3 ++-
 sql/opt_range.cc                 |  6 ++---
 sql/sql_base.cc                  | 40 ++++++++++++++++++++++++++++----
 sql/sql_class.h                  | 24 ++++++++++++++-----
 sql/sql_table.cc                 | 10 ++++----
 9 files changed, 192 insertions(+), 28 deletions(-)

diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index f32878309b8..6fb98f509ef 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -739,4 +739,32 @@ drop table if exists t1;
 create table t1 (a int) engine=innodb;
 alter table t1 alter a set default 1;
 drop table t1;
+
+Bug#24918 drop table and lock / inconsistent between 
+perm and temp tables
+
+Check transactional tables under LOCK TABLES
+
+drop table if exists t24918, t24918_tmp, t24918_trans, t24918_trans_tmp, 
+t24918_access;
+create table t24918_access (id int);
+create table t24918 (id int) engine=myisam;
+create temporary table t24918_tmp (id int) engine=myisam;
+create table t24918_trans (id int) engine=innodb;
+create temporary table t24918_trans_tmp (id int) engine=innodb;
+lock table t24918 write, t24918_tmp write, t24918_trans write, t24918_trans_tmp write;
+drop table t24918;
+select * from t24918_access;
+ERROR HY000: Table 't24918_access' was not locked with LOCK TABLES
+drop table t24918_trans;
+select * from t24918_access;
+ERROR HY000: Table 't24918_access' was not locked with LOCK TABLES
+drop table t24918_trans_tmp;
+select * from t24918_access;
+ERROR HY000: Table 't24918_access' was not locked with LOCK TABLES
+drop table t24918_tmp;
+select * from t24918_access;
+ERROR HY000: Table 't24918_access' was not locked with LOCK TABLES
+unlock tables;
+drop table t24918_access;
 End of 5.0 tests
diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test
index 0d43d13ec3a..60d46863bfd 100644
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
@@ -754,4 +754,38 @@ create table t1 (a int) engine=innodb;
 alter table t1 alter a set default 1;
 drop table t1;
 
+
+--echo
+--echo Bug#24918 drop table and lock / inconsistent between 
+--echo perm and temp tables
+--echo
+--echo Check transactional tables under LOCK TABLES
+--echo
+--disable_warnings
+drop table if exists t24918, t24918_tmp, t24918_trans, t24918_trans_tmp, 
+t24918_access;
+--enable_warnings
+create table t24918_access (id int);
+create table t24918 (id int) engine=myisam;
+create temporary table t24918_tmp (id int) engine=myisam;
+create table t24918_trans (id int) engine=innodb;
+create temporary table t24918_trans_tmp (id int) engine=innodb;
+
+lock table t24918 write, t24918_tmp write, t24918_trans write, t24918_trans_tmp write;
+drop table t24918;
+--error ER_TABLE_NOT_LOCKED
+select * from t24918_access;
+drop table t24918_trans;
+--error ER_TABLE_NOT_LOCKED
+select * from t24918_access;
+drop table t24918_trans_tmp;
+--error ER_TABLE_NOT_LOCKED
+select * from t24918_access;
+drop table t24918_tmp;
+--error ER_TABLE_NOT_LOCKED
+select * from t24918_access;
+unlock tables;
+
+drop table t24918_access;
+
 --echo End of 5.0 tests
diff --git a/sql/handler.h b/sql/handler.h
index a3767573178..cd9f9a91008 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -508,6 +508,29 @@ class handler :public Sql_alloc
   */
   virtual int rnd_init(bool scan) =0;
   virtual int rnd_end() { return 0; }
+  /**
+    Is not invoked for non-transactional temporary tables.
+
+    Tells the storage engine that we intend to read or write data
+    from the table. This call is prefixed with a call to handler::store_lock()
+    and is invoked only for those handler instances that stored the lock.
+
+    Calls to rnd_init/index_init are prefixed with this call. When table
+    IO is complete, we call external_lock(F_UNLCK).
+    A storage engine writer should expect that each call to
+    ::external_lock(F_[RD|WR]LOCK is followed by a call to
+    ::external_lock(F_UNLCK). If it is not, it is a bug in MySQL.
+
+    The name and signature originate from the first implementation
+    in MyISAM, which would call fcntl to set/clear an advisory
+    lock on the data file in this method.
+
+    @param   lock_type    F_RDLCK, F_WRLCK, F_UNLCK
+
+    @return  non-0 in case of failure, 0 in case of success.
+    When lock_type is F_UNLCK, the return value is ignored.
+  */
+  virtual int external_lock(THD *thd, int lock_type) { return 0; }
 
 public:
   const handlerton *ht;                 /* storage engine of this handler */
@@ -548,6 +571,7 @@ public:
   uint raid_type,raid_chunks;
   FT_INFO *ft_handler;
   enum {NONE=0, INDEX, RND} inited;
+  bool locked;
   bool  auto_increment_column_changed;
   bool implicit_emptied;                /* Can be !=0 only if HEAP */
   const COND *pushed_cond;
@@ -560,10 +584,11 @@ public:
     create_time(0), check_time(0), update_time(0),
     key_used_on_scan(MAX_KEY), active_index(MAX_KEY),
     ref_length(sizeof(my_off_t)), block_size(0),
-    raid_type(0), ft_handler(0), inited(NONE), implicit_emptied(0),
+    raid_type(0), ft_handler(0), inited(NONE),
+    locked(FALSE), implicit_emptied(0),
     pushed_cond(NULL)
     {}
-  virtual ~handler(void) { /* TODO: DBUG_ASSERT(inited == NONE); */ }
+  virtual ~handler(void) { DBUG_ASSERT(locked == FALSE); /* TODO: DBUG_ASSERT(inited == NONE); */ }
   virtual handler *clone(MEM_ROOT *mem_root);
   int ha_open(const char *name, int mode, int test_if_locked);
   void adjust_next_insert_id_after_explicit_value(ulonglong nr);
@@ -597,6 +622,13 @@ public:
 
   virtual const char *index_type(uint key_number) { DBUG_ASSERT(0); return "";}
 
+  int ha_external_lock(THD *thd, int lock_type)
+  {
+    int rc;
+    DBUG_ENTER("ha_external_lock");
+    locked= lock_type != F_UNLCK;
+    DBUG_RETURN(external_lock(thd, lock_type));
+  }
   int ha_index_init(uint idx)
   {
     DBUG_ENTER("ha_index_init");
@@ -689,7 +721,6 @@ public:
   virtual int extra_opt(enum ha_extra_function operation, ulong cache_size)
   { return extra(operation); }
   virtual int reset() { return extra(HA_EXTRA_RESET); }
-  virtual int external_lock(THD *thd, int lock_type) { return 0; }
   virtual void unlock_row() {}
   virtual int start_stmt(THD *thd, thr_lock_type lock_type) {return 0;}
   /*
@@ -837,6 +868,9 @@ public:
 
   /* lock_count() can be more than one if the table is a MERGE */
   virtual uint lock_count(void) const { return 1; }
+  /**
+    Is not invoked for non-transactional temporary tables.
+  */
   virtual THR_LOCK_DATA **store_lock(THD *thd,
 				     THR_LOCK_DATA **to,
 				     enum thr_lock_type lock_type)=0;
diff --git a/sql/lock.cc b/sql/lock.cc
index 93358e56701..f730ac56d35 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -151,7 +151,8 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count,
     }
 
     thd->proc_info="System lock";
-    if (lock_external(thd, tables, count))
+    if (sql_lock->table_count && lock_external(thd, sql_lock->table,
+                                               sql_lock->table_count))
     {
       /* Clear the lock type of all lock data to avoid reusage. */
       reset_lock_data(sql_lock);
@@ -246,12 +247,12 @@ static int lock_external(THD *thd, TABLE **tables, uint count)
 	 (*tables)->reginfo.lock_type <= TL_READ_NO_INSERT))
       lock_type=F_RDLCK;
 
-    if ((error=(*tables)->file->external_lock(thd,lock_type)))
+    if ((error= (*tables)->file->ha_external_lock(thd,lock_type)))
     {
       print_lock_error(error, (*tables)->file->table_type());
       for (; i-- ; tables--)
       {
-	(*tables)->file->external_lock(thd, F_UNLCK);
+	(*tables)->file->ha_external_lock(thd, F_UNLCK);
 	(*tables)->current_lock=F_UNLCK;
       }
       DBUG_RETURN(error);
@@ -353,10 +354,28 @@ void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock)
 }
 
 
+/**
+  Try to find the table in the list of locked tables.
+  In case of success, unlock the table and remove it from this list.
 
-void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table)
+  @note This function has a legacy side effect: the table is
+  unlocked even if it is not found in the locked list.
+  It's not clear if this side effect is intentional or still
+  desirable. It might lead to unmatched calls to
+  unlock_external(). Moreover, a discrepancy can be left
+  unnoticed by the storage engine, because in
+  unlock_external() we call handler::external_lock(F_UNLCK) only
+  if table->current_lock is not F_UNLCK.
+
+  @param  always_unlock   specify explicitly if the legacy side
+                          effect is desired.
+*/
+
+void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table,
+                       bool always_unlock)
 {
-  mysql_unlock_some_tables(thd, &table,1);
+  if (always_unlock == TRUE)
+    mysql_unlock_some_tables(thd, &table, /* table count */ 1);
   if (locked)
   {
     reg1 uint i;
@@ -370,6 +389,10 @@ void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table)
 
         DBUG_ASSERT(table->lock_position == i);
 
+        /* Unlock if not yet unlocked */
+        if (always_unlock == FALSE)
+          mysql_unlock_some_tables(thd, &table, /* table count */ 1);
+
         /* Decrement table_count in advance, making below expressions easier */
         old_tables= --locked->table_count;
 
@@ -623,7 +646,7 @@ static int unlock_external(THD *thd, TABLE **table,uint count)
     if ((*table)->current_lock != F_UNLCK)
     {
       (*table)->current_lock = F_UNLCK;
-      if ((error=(*table)->file->external_lock(thd, F_UNLCK)))
+      if ((error= (*table)->file->ha_external_lock(thd, F_UNLCK)))
       {
 	error_code=error;
 	print_lock_error(error_code, (*table)->file->table_type());
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index d14aab57489..ca6aa8ecab0 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1452,7 +1452,8 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count,
 void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock);
 void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock);
 void mysql_unlock_some_tables(THD *thd, TABLE **table,uint count);
-void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table);
+void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table,
+                       bool always_unlock);
 void mysql_lock_abort(THD *thd, TABLE *table);
 bool mysql_lock_abort_for_thread(THD *thd, TABLE *table);
 MYSQL_LOCK *mysql_lock_merge(MYSQL_LOCK *a,MYSQL_LOCK *b);
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 247f0eada49..d978c8882ac 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -972,7 +972,7 @@ QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT()
         DBUG_PRINT("info", ("Freeing separate handler 0x%lx (free: %d)", (long) file,
                             free_file));
         file->reset();
-        file->external_lock(current_thd, F_UNLCK);
+        file->ha_external_lock(current_thd, F_UNLCK);
         file->close();
       }
     }
@@ -1142,7 +1142,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
     /* Caller will free the memory */
     goto failure;  /* purecov: inspected */
   }
-  if (file->external_lock(thd, F_RDLCK))
+  if (file->ha_external_lock(thd, F_RDLCK))
     goto failure;
   if (!head->no_keyread)
   {
@@ -1152,7 +1152,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
   if (file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) ||
       init() || reset())
   {
-    file->external_lock(thd, F_UNLCK);
+    file->ha_external_lock(thd, F_UNLCK);
     file->close();
     goto failure;
   }
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 3860dfa1ded..61847a6b168 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1037,6 +1037,31 @@ TABLE **find_temporary_table(THD *thd, const char *db, const char *table_name)
   return 0;					// Not a temporary table
 }
 
+
+/**
+  Drop a temporary table.
+
+  Try to locate the table in the list of thd->temporary_tables.
+  If the table is found:
+   - if the table is in thd->locked_tables, unlock it and
+     remove it from the list of locked tables. Currently only transactional
+     temporary tables are present in the locked_tables list.
+   - Close the temporary table, remove its .FRM
+   - remove the table from the list of temporary tables
+
+  This function is used to drop user temporary tables, as well as
+  internal tables created in CREATE TEMPORARY TABLE ... SELECT
+  or ALTER TABLE. Even though part of the work done by this function
+  is redundant when the table is internal, as long as we
+  link both internal and user temporary tables into the same
+  thd->temporary_tables list, it's impossible to tell here whether
+  we're dealing with an internal or a user temporary table.
+
+  @retval TRUE   the table was not found in the list of temporary tables
+                 of this thread
+  @retval FALSE  the table was found and dropped successfully.
+*/
+
 bool close_temporary_table(THD *thd, const char *db, const char *table_name)
 {
   TABLE *table,**prev;
@@ -1045,6 +1070,11 @@ bool close_temporary_table(THD *thd, const char *db, const char *table_name)
     return 1;
   table= *prev;
   *prev= table->next;
+  /*
+    If LOCK TABLES list is not empty and contains this table,
+    unlock the table and remove the table from this list.
+  */
+  mysql_lock_remove(thd, thd->locked_tables, table, FALSE);
   close_temporary(table, 1);
   if (thd->slave_thread)
     --slave_open_temp_tables;
@@ -1120,7 +1150,7 @@ TABLE *unlink_open_table(THD *thd, TABLE *list, TABLE *find)
 	!memcmp(list->s->table_cache_key, key, key_length))
     {
       if (thd->locked_tables)
-	mysql_lock_remove(thd, thd->locked_tables,list);
+        mysql_lock_remove(thd, thd->locked_tables, list, TRUE);
       VOID(hash_delete(&open_cache,(byte*) list)); // Close table
     }
     else
@@ -1151,6 +1181,8 @@ TABLE *unlink_open_table(THD *thd, TABLE *list, TABLE *find)
           dropped is already unlocked. In the former case it will
           also remove lock on the table. But one should not rely on
           this behaviour as it may change in future.
+          Currently, however, this function is never called for a
+          table that was locked with LOCK TABLES.
 */
 
 void drop_open_table(THD *thd, TABLE *table, const char *db_name,
@@ -2099,7 +2131,7 @@ bool close_data_tables(THD *thd,const char *db, const char *table_name)
     if (!strcmp(table->s->table_name, table_name) &&
 	!strcmp(table->s->db, db))
     {
-      mysql_lock_remove(thd, thd->locked_tables,table);
+      mysql_lock_remove(thd, thd->locked_tables, table, TRUE);
       table->file->close();
       table->db_stat=0;
     }
@@ -2239,7 +2271,7 @@ void close_old_data_files(THD *thd, TABLE *table, bool morph_locks,
             instances of this table.
           */
           mysql_lock_abort(thd, table);
-          mysql_lock_remove(thd, thd->locked_tables, table);
+          mysql_lock_remove(thd, thd->locked_tables, table, TRUE);
           /*
             We want to protect the table from concurrent DDL operations
             (like RENAME TABLE) until we will re-open and re-lock it.
@@ -2343,7 +2375,7 @@ bool drop_locked_tables(THD *thd,const char *db, const char *table_name)
     if (!strcmp(table->s->table_name, table_name) &&
 	!strcmp(table->s->db, db))
     {
-      mysql_lock_remove(thd, thd->locked_tables,table);
+      mysql_lock_remove(thd, thd->locked_tables, table, TRUE);
       VOID(hash_delete(&open_cache,(byte*) table));
       found=1;
     }
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 058f130d4e7..6ffbd9b4ac7 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -995,13 +995,25 @@ enum prelocked_mode_type {NON_PRELOCKED= 0, PRELOCKED= 1,
 class Open_tables_state
 {
 public:
-  /*
-    open_tables - list of regular tables in use by this thread
-    temporary_tables - list of temp tables in use by this thread
-    handler_tables - list of tables that were opened with HANDLER OPEN
-     and are still in use by this thread
+  /**
+    List of regular tables in use by this thread. Contains temporary and
+    base tables that were opened with @see open_tables().
   */
-  TABLE *open_tables, *temporary_tables, *handler_tables, *derived_tables;
+  TABLE *open_tables;
+  /**
+    List of temporary tables used by this thread. Contains user-level
+    temporary tables, created with CREATE TEMPORARY TABLE, and
+    internal temporary tables, created, e.g., to resolve a SELECT,
+    or for an intermediate table used in ALTER.
+    XXX Why are internal temporary tables added to this list?
+  */
+  TABLE *temporary_tables;
+  /**
+    List of tables that were opened with HANDLER OPEN and are
+    still in use by this thread.
+  */
+  TABLE *handler_tables;
+  TABLE *derived_tables;
   /*
     During a MySQL session, one can lock tables in two modes: automatic
     or manual. In automatic mode all necessary tables are locked just before
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index e02595836ca..f11082a712c 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -3791,10 +3791,10 @@ view_err:
   {
     VOID(pthread_mutex_lock(&LOCK_open));
     wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN);
-    table->file->external_lock(thd, F_WRLCK);
+    table->file->ha_external_lock(thd, F_WRLCK);
     alter_table_manage_keys(table, table->file->indexes_are_disabled(),
                             alter_info->keys_onoff);
-    table->file->external_lock(thd, F_UNLCK);
+    table->file->ha_external_lock(thd, F_UNLCK);
     VOID(pthread_mutex_unlock(&LOCK_open));
     error= ha_commit_stmt(thd);
     if (ha_commit(thd))
@@ -3813,7 +3813,7 @@ view_err:
 	The following function call will free the new_table pointer,
 	in close_temporary_table(), so we can safely directly jump to err
       */
-      close_temporary_table(thd,new_db,tmp_name);
+      close_temporary_table(thd, new_db, tmp_name);
       goto err;
     }
     /* Close lock if this is a transactional table */
@@ -4086,7 +4086,7 @@ copy_data_between_tables(TABLE *from,TABLE *to,
   if (!(copy= new Copy_field[to->s->fields]))
     DBUG_RETURN(-1);				/* purecov: inspected */
 
-  if (to->file->external_lock(thd, F_WRLCK))
+  if (to->file->ha_external_lock(thd, F_WRLCK))
     DBUG_RETURN(-1);
 
   /* We need external lock before we can disable/enable keys */
@@ -4238,7 +4238,7 @@ copy_data_between_tables(TABLE *from,TABLE *to,
   free_io_cache(from);
   *copied= found_count;
   *deleted=delete_count;
-  if (to->file->external_lock(thd,F_UNLCK))
+  if (to->file->ha_external_lock(thd,F_UNLCK))
     error=1;
   DBUG_RETURN(error > 0 ? -1 : 0);
 }

From aad42dc7f4484de4ac3b635e8db59ff2c0665bd2 Mon Sep 17 00:00:00 2001
From: unknown <jperkin@production.mysql.com>
Date: Fri, 27 Jul 2007 15:14:21 +0200
Subject: [PATCH 074/139] More fixes and cleanups for bug#28585:

  - make the 'dist-hook' from top-level Makefile work again.
  - we can find my_print_defaults from --basedir by parsing command
    line arguments prior to running my_print_defaults.
  - take advantage of additional command line parsing and allow the
    --no-defaults etc arguments to work anywhere rather than having
    to be the first argument.
  - find SQL files either from binary archive or source install.
  - consolidate and tidy code and error messages.


scripts/mysql_install_db.sh:
  Consolidate error messages.
---
 scripts/mysql_install_db.sh | 109 ++++++++++++++++++++++++++----------
 1 file changed, 79 insertions(+), 30 deletions(-)

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 7e1f6217b7b..a66129af1d3 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -32,12 +32,6 @@ in_rpm=0
 ip_only=0
 windows=0
 
-case "$1" in
-  --no-defaults|--defaults-file=*|--defaults-extra-file=*)
-    defaults="$1"; shift
-    ;;
-esac
-
 usage()
 {
   cat <<EOF
@@ -112,6 +106,8 @@ parse_arguments()
       --verbose) verbose=1 ;; # Obsolete
       --rpm) in_rpm=1 ;;
       --help) usage ;;
+      --no-defaults|--defaults-file=*|--defaults-extra-file=*)
+        defaults="$arg" ;;
 
       --windows)
 	# This is actually a "cross bootstrap" argument used when
@@ -139,20 +135,71 @@ parse_arguments()
   done
 }
 
-# Sanity check - make sure we can find my_print_defaults either in the binary
-# distribution or within the installed source compile.
-print_defaults="@bindir@/my_print_defaults"
-if ! test -x $print_defaults
-then
-  echo "FATAL ERROR: Could not find $print_defaults"
+# Try to find a specific file within --basedir which can either be a binary
+# release or installed source directory and return the path.
+find_in_basedir()
+{
+  case "$1" in
+    --dir)
+      return_dir=1; shift
+      ;;
+  esac
+
+  file=$1; shift
+
+  for dir in "$@"
+  do
+    if test -f "$basedir/$dir/$file"
+    then
+      if test -n "$return_dir"
+      then
+        echo "$basedir/$dir"
+      else
+        echo "$basedir/$dir/$file"
+      fi
+      break
+    fi
+  done
+}
+
+missing_in_basedir()
+{
+  echo "FATAL ERROR: Could not find $* inside --basedir"
   echo
-  echo "If you are using a binary release, you must run this script from"
-  echo "within the directory the archive extracted into.  If you compiled"
-  echo "MySQL yourself you must run 'make install' first."
-  exit 1
+  echo "When using --basedir you must point either into a MySQL binary"
+  echo "distribution directory or a compiled tree previously populated"
+  echo "by 'make install'"
+}
+
+# Ok, let's go.  We first need to parse arguments which are required by
+# my_print_defaults so that we can execute it first, then later re-parse
+# the command line to add any extra bits that we need.
+parse_arguments PICK-ARGS-FROM-ARGV "$@"
+
+# We can now find my_print_defaults, either in the supplied --basedir
+# location or in the installed area.
+if test -n "$basedir"
+then
+  print_defaults=`find_in_basedir my_print_defaults bin extra`
+  if ! test -x "$print_defaults"
+  then
+    missing_in_basedir my_print_defaults
+    exit 1
+  fi
+else
+  print_defaults="@bindir@/my_print_defaults"
+  if ! test -x "$print_defaults"
+  then
+    echo "FATAL ERROR: Could not find $print_defaults"
+    echo
+    echo "If you are using a binary release, you must run this script from"
+    echo "within the directory the archive extracted into.  If you compiled"
+    echo "MySQL yourself you must run 'make install' first."
+    exit 1
+  fi
 fi
 
-# Firstly, get arguments from the groups [mysqld] and [mysql_install_db]
+# Now we can get arguments from the groups [mysqld] and [mysql_install_db]
 # in the my.cfg file, then re-run to merge with command line arguments.
 parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
@@ -163,20 +210,24 @@ then
   basedir="@prefix@"
   bindir="@bindir@"
   mysqld="@libexecdir@/mysqld"
+  pkgdatadir="@pkgdatadir@"
 else
   bindir="$basedir/bin"
-  for dir in libexec sbin bin
-  do
-    if test -x "$basedir/$dir/mysqld"
-    then
-      mysqld="$basedir/$dir/mysqld"
-      break
-    fi
-  done
-  if test -z "$mysqld"
+  # We set up bootstrap-specific paths later, so skip this for --windows
+  if test "$windows" -eq 0
   then
-    echo "FATAL ERROR: Could not find mysqld inside supplied --basedir"
-    exit 1
+    pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
+    if test -z "$pkgdatadir"
+    then
+      missing_in_basedir fill_help_tables.sql
+      exit 1
+    fi
+    mysqld=`find_in_basedir mysqld libexec sbin bin`
+    if ! test -x "$mysqld"
+    then
+      missing_in_basedir mysqld
+      exit 1
+    fi
   fi
 fi
 
@@ -190,8 +241,6 @@ fi
 if test -n "$srcdir"
 then
   pkgdatadir="$srcdir/scripts"
-else
-  pkgdatadir="@pkgdatadir@"
 fi
 
 fill_help_tables="$pkgdatadir/fill_help_tables.sql"

From a09787e8dd5e8d2ce193326b4dfb1cf672057930 Mon Sep 17 00:00:00 2001
From: unknown <serg@janus.mylan>
Date: Fri, 27 Jul 2007 15:37:37 +0200
Subject: [PATCH 075/139] Bug #30094 mi_test_all: assertion failure updated to
 keypart_map api

storage/myisam/mi_test2.c:
  Bug #30094 mi_test_all: assertion failure
  updated to keypart_map api
  prefix char keys are not supported anymore
---
 storage/myisam/mi_test1.c |  5 +++--
 storage/myisam/mi_test2.c | 23 +++++++++++++----------
 storage/myisam/mi_test3.c |  8 ++++----
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/storage/myisam/mi_test1.c b/storage/myisam/mi_test1.c
index 1165ea4bb32..08627ba7e92 100644
--- a/storage/myisam/mi_test1.c
+++ b/storage/myisam/mi_test1.c
@@ -258,7 +258,8 @@ static int run_test(const char *filename)
 	continue;
       create_key(key,j);
       my_errno=0;
-      if ((error = mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT)))
+      if ((error = mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,
+                           HA_READ_KEY_EXACT)))
       {
 	if (verbose || (flags[j] >= 1 ||
 			(error && my_errno != HA_ERR_KEY_NOT_FOUND)))
@@ -285,7 +286,7 @@ static int run_test(const char *filename)
   {
     create_key(key,i);
     my_errno=0;
-    error=mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT);
+    error=mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT);
     if (verbose ||
 	(error == 0 && flags[i] == 0 && unique_key) ||
 	(error && (flags[i] != 0 || my_errno != HA_ERR_KEY_NOT_FOUND)))
diff --git a/storage/myisam/mi_test2.c b/storage/myisam/mi_test2.c
index 96ee82e023c..99d0c23d2a4 100644
--- a/storage/myisam/mi_test2.c
+++ b/storage/myisam/mi_test2.c
@@ -263,7 +263,7 @@ int main(int argc, char *argv[])
       if (!j)
 	for (j=999 ; j>0 && key1[j] == 0 ; j--) ;
       sprintf(key,"%6d",j);
-      if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
+      if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
       {
 	printf("Test in loop: Can't find key: \"%s\"\n",key);
 	goto err;
@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
     if (j != 0)
     {
       sprintf(key,"%6d",j);
-      if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
+      if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
       {
 	printf("can't find key1: \"%s\"\n",key);
 	goto err;
@@ -325,7 +325,7 @@ int main(int argc, char *argv[])
     if (j != 0)
     {
       sprintf(key,"%6d",j);
-      if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
+      if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
       {
 	printf("can't find key1: \"%s\"\n",key);
 	goto err;
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
     DBUG_PRINT("progpos",("first - next -> last - prev -> first"));
     if (verbose) printf("	 Using key: \"%s\"  Keys: %d\n",key,dupp_keys);
 
-    if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
+    if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
       goto err;
     if (mi_rsame(file,read_record2,-1))
       goto err;
@@ -422,7 +422,7 @@ int main(int argc, char *argv[])
     }
 
     /* Check of mi_rnext_same */
-    if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
+    if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
       goto err;
     ant=1;
     while (!mi_rnext_same(file,read_record3) && ant < dupp_keys+10)
@@ -496,7 +496,7 @@ int main(int argc, char *argv[])
       goto err;
   if (bcmp(read_record2,read_record3,reclength))
      printf("Can't find last record\n");
-
+#ifdef NOT_ANYMORE
   if (!silent)
     puts("- Test read key-part");
   strmov(key2,key);
@@ -514,12 +514,14 @@ int main(int argc, char *argv[])
       goto end;
     }
   }
+#endif
   if (dupp_keys > 2)
   {
     if (!silent)
       printf("- Read key (first) - next - delete - next -> last\n");
     DBUG_PRINT("progpos",("first - next - delete - next -> last"));
-    if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT)) goto err;
+    if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
+      goto err;
     if (mi_rnext(file,read_record3,0)) goto err;
     if (mi_delete(file,read_record3)) goto err;
     opt_delete++;
@@ -555,7 +557,8 @@ int main(int argc, char *argv[])
     if (!silent)
       printf("- Read first - delete - next -> last\n");
     DBUG_PRINT("progpos",("first - delete - next -> last"));
-    if (mi_rkey(file,read_record3,0,key,0,HA_READ_KEY_EXACT)) goto err;
+    if (mi_rkey(file,read_record3,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
+      goto err;
     if (mi_delete(file,read_record3)) goto err;
     opt_delete++;
     ant=1;
@@ -618,10 +621,10 @@ int main(int argc, char *argv[])
     copy_key(file,(uint) i,(uchar*) read_record,(uchar*) key);
     copy_key(file,(uint) i,(uchar*) read_record2,(uchar*) key2);
     min_key.key= key;
-    min_key.length= USE_WHOLE_KEY;
+    min_key.keypart_map= HA_WHOLE_KEY;
     min_key.flag= HA_READ_KEY_EXACT;
     max_key.key= key2;
-    max_key.length= USE_WHOLE_KEY;
+    max_key.keypart_map= HA_WHOLE_KEY;
     max_key.flag= HA_READ_AFTER_KEY;
 
     range_records= mi_records_in_range(file,(int) i, &min_key, &max_key);
diff --git a/storage/myisam/mi_test3.c b/storage/myisam/mi_test3.c
index 982b999c3a5..ed9cd8e7b8c 100644
--- a/storage/myisam/mi_test3.c
+++ b/storage/myisam/mi_test3.c
@@ -243,8 +243,8 @@ int test_read(MI_INFO *file,int id)
   for (i=0 ; i < 100 ; i++)
   {
     find=rnd(100000);
-    if (!mi_rkey(file,record.id,1,(uchar*) &find,
-		 sizeof(find),HA_READ_KEY_EXACT))
+    if (!mi_rkey(file,record.id,1,(uchar*) &find, HA_WHOLE_KEY,
+                 HA_READ_KEY_EXACT))
       found++;
     else
     {
@@ -426,8 +426,8 @@ int test_update(MI_INFO *file,int id,int lock_type)
   {
     tmp=rnd(100000);
     int4store(find,tmp);
-    if (!mi_rkey(file,record.id,1,(uchar*) find,
-		 sizeof(find),HA_READ_KEY_EXACT))
+    if (!mi_rkey(file,record.id,1,(uchar*) find, HA_WHOLE_KEY,
+                 HA_READ_KEY_EXACT))
       found++;
     else
     {

From 339ea316b938b9b1c2a166c6580bf84333d80a5f Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Fri, 27 Jul 2007 17:39:01 +0400
Subject: [PATCH 076/139] Fix for BUG#28030: test im_instance_conf fails with
 an assert.

The problem was a race condition on shutdown -- when IM got shutdown
request while a guarded mysqld is starting. In this case the Guardian
thread tried to stop the mysqld, but might fail if the mysqld hadn't
created pid-file so far. When this happened, the mysqld-monitor thread
didn't stop, so the assert in Thread_registry happened.

The fix is to make several attempts to stop mysqld if it is active.


server-tools/instance-manager/guardian.cc:
  Try to stop mysqld several times if it is still active.
server-tools/instance-manager/instance.cc:
  Make Instance::kill_mysqld() to return operation status.
server-tools/instance-manager/instance.h:
  Make Instance::kill_mysqld() to return operation status.
server-tools/instance-manager/thread_registry.cc:
  Log unregistered thread ids.
---
 server-tools/instance-manager/guardian.cc     | 31 ++++++++++++++++++-
 server-tools/instance-manager/instance.cc     |  8 +++--
 server-tools/instance-manager/instance.h      |  2 +-
 .../instance-manager/thread_registry.cc       |  8 +++--
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc
index e114496248e..b49b0ec0a00 100644
--- a/server-tools/instance-manager/guardian.cc
+++ b/server-tools/instance-manager/guardian.cc
@@ -403,6 +403,8 @@ void Guardian::init()
 
 void Guardian::stop_instances()
 {
+  static const int NUM_STOP_ATTEMPTS = 100;
+
   Instance_map::Iterator instances_it(instance_map);
   Instance *instance;
 
@@ -438,7 +440,34 @@ void Guardian::stop_instances()
 
     /* Request mysqld to stop. */
 
-    instance->kill_mysqld(SIGTERM);
+    bool instance_stopped= FALSE;
+
+    for (int cur_attempt= 0; cur_attempt < NUM_STOP_ATTEMPTS; ++cur_attempt)
+    {
+      if (!instance->kill_mysqld(SIGTERM))
+      {
+        instance_stopped= TRUE;
+        break;
+      }
+
+      if (!instance->is_active())
+      {
+        instance_stopped= TRUE;
+        break;
+      }
+
+      /* Sleep for 0.3 sec and check again. */
+
+      my_sleep(300000);
+    }
+
+    /*
+      Abort if we failed to stop mysqld instance. That should not happen,
+      but if it happened, we don't know what to do and prefer to have clear
+      failure with coredump.
+    */
+
+    DBUG_ASSERT(instance_stopped);
 
     instance->unlock();
   }
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc
index 80e7e99214b..4a1b658737e 100644
--- a/server-tools/instance-manager/instance.cc
+++ b/server-tools/instance-manager/instance.cc
@@ -771,7 +771,7 @@ bool Instance::stop_mysqld()
     These operations should also be used in Guardian to manage instances.
 */
 
-void Instance::kill_mysqld(int signum)
+bool Instance::kill_mysqld(int signum)
 {
   pid_t mysqld_pid= options.load_pid();
 
@@ -780,7 +780,7 @@ void Instance::kill_mysqld(int signum)
     log_info("Instance '%s': no pid file to send a signal (%d).",
              (const char *) get_name()->str,
              (int) signum);
-    return;
+    return TRUE;
   }
 
   log_info("Instance '%s': sending %d to %d...",
@@ -792,7 +792,7 @@ void Instance::kill_mysqld(int signum)
   {
     log_info("Instance '%s': kill() failed.",
              (const char *) get_name()->str);
-    return;
+    return TRUE;
   }
 
   /* Kill suceeded */
@@ -804,6 +804,8 @@ void Instance::kill_mysqld(int signum)
     /* After sucessful hard kill the pidfile need to be removed */
     options.unlink_pidfile();
   }
+
+  return FALSE;
 }
 
 
diff --git a/server-tools/instance-manager/instance.h b/server-tools/instance-manager/instance.h
index e87bb49b49c..aa9c923cba1 100644
--- a/server-tools/instance-manager/instance.h
+++ b/server-tools/instance-manager/instance.h
@@ -104,7 +104,7 @@ public:
 
   bool start_mysqld();
   bool stop_mysqld();
-  void kill_mysqld(int signo);
+  bool kill_mysqld(int signo);
 
   void lock();
   void unlock();
diff --git a/server-tools/instance-manager/thread_registry.cc b/server-tools/instance-manager/thread_registry.cc
index 700ed22afe7..72d81523022 100644
--- a/server-tools/instance-manager/thread_registry.cc
+++ b/server-tools/instance-manager/thread_registry.cc
@@ -64,8 +64,12 @@ Thread_registry::~Thread_registry()
   /* Check that no one uses the repository. */
   pthread_mutex_lock(&LOCK_thread_registry);
 
-  if (head.next != &head)
-    log_error("Not all threads died properly\n");
+  for (Thread_info *ti= head.next; ti != &head; ti= ti->next)
+  {
+    log_error("Thread_registry: unregistered thread: %lu.",
+              (unsigned long) ti->thread_id);
+  }
+
   /* All threads must unregister */
   DBUG_ASSERT(head.next == &head);
 

From 39f3cda7c7fa75c0208d58495e42b5dc0cc6a061 Mon Sep 17 00:00:00 2001
From: unknown <joerg@debian.(none)>
Date: Fri, 27 Jul 2007 15:41:27 +0200
Subject: [PATCH 077/139] Fix a bad BitKeeper dependency structure for the
 "funcs_1" suite:

Step 2:
Restore the 5.1 contents in the 5.0-dependent files.


mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_views.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_views.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_views.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/views/func_view.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/views/views_master.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
---
 .../suite/funcs_1/cursors/cursors_master.test |    1 -
 .../funcs_1/datadict/datadict_master.inc      |    8 +-
 .../funcs_1/datadict/datadict_tables.inc      |    2 +-
 .../suite/funcs_1/r/innodb__datadict.result   | 3098 ++++++++++++++---
 .../suite/funcs_1/r/innodb_func_view.result   | 1399 ++++----
 .../suite/funcs_1/r/innodb_storedproc.result  | 1221 ++-----
 .../funcs_1/r/innodb_storedproc_02.result     |   36 +-
 .../funcs_1/r/innodb_storedproc_10.result     |   10 +-
 .../suite/funcs_1/r/innodb_trig_0102.result   |   15 +-
 .../suite/funcs_1/r/innodb_trig_03.result     |  301 +-
 .../suite/funcs_1/r/innodb_trig_0407.result   |   10 +-
 .../suite/funcs_1/r/innodb_trig_08.result     |   60 +-
 .../suite/funcs_1/r/innodb_trig_09.result     |   10 +-
 .../funcs_1/r/innodb_trig_1011ext.result      |   28 +-
 .../suite/funcs_1/r/innodb_trig_frkey.result  |    2 +-
 .../suite/funcs_1/r/innodb_views.result       |   96 +-
 .../suite/funcs_1/r/memory__datadict.result   | 3098 ++++++++++++++---
 .../suite/funcs_1/r/memory_func_view.result   | 1399 ++++----
 .../suite/funcs_1/r/memory_storedproc.result  | 1221 ++-----
 .../funcs_1/r/memory_storedproc_02.result     |   36 +-
 .../funcs_1/r/memory_storedproc_10.result     |   10 +-
 .../suite/funcs_1/r/memory_trig_0102.result   |   15 +-
 .../suite/funcs_1/r/memory_trig_03.result     |  301 +-
 .../suite/funcs_1/r/memory_trig_0407.result   |   10 +-
 .../suite/funcs_1/r/memory_trig_08.result     |   60 +-
 .../suite/funcs_1/r/memory_trig_09.result     |   10 +-
 .../funcs_1/r/memory_trig_1011ext.result      |   28 +-
 .../suite/funcs_1/r/memory_views.result       |   96 +-
 .../suite/funcs_1/r/myisam__datadict.result   | 3098 ++++++++++++++---
 .../suite/funcs_1/r/myisam_func_view.result   | 1399 ++++----
 .../suite/funcs_1/r/myisam_storedproc.result  | 1221 ++-----
 .../funcs_1/r/myisam_storedproc_02.result     |   36 +-
 .../funcs_1/r/myisam_storedproc_10.result     |   10 +-
 .../suite/funcs_1/r/myisam_trig_0102.result   |   15 +-
 .../suite/funcs_1/r/myisam_trig_03.result     |  301 +-
 .../suite/funcs_1/r/myisam_trig_0407.result   |   10 +-
 .../suite/funcs_1/r/myisam_trig_08.result     |   60 +-
 .../suite/funcs_1/r/myisam_trig_09.result     |   10 +-
 .../funcs_1/r/myisam_trig_1011ext.result      |   28 +-
 .../suite/funcs_1/r/myisam_views.result       |  123 +-
 .../funcs_1/storedproc/storedproc_02.inc      |   33 +-
 .../funcs_1/storedproc/storedproc_10.inc      |   10 +-
 .../funcs_1/storedproc/storedproc_master.inc  |   35 +-
 .../suite/funcs_1/triggers/triggers_0102.inc  |   18 +-
 .../suite/funcs_1/triggers/triggers_03.inc    |  144 +-
 .../suite/funcs_1/triggers/triggers_0407.inc  |   10 +-
 .../suite/funcs_1/triggers/triggers_08.inc    |   39 +-
 .../suite/funcs_1/triggers/triggers_09.inc    |    8 +-
 .../funcs_1/triggers/triggers_1011ext.inc     |   24 +-
 mysql-test/suite/funcs_1/views/func_view.inc  |  111 +-
 .../suite/funcs_1/views/views_master.inc      |   74 +-
 51 files changed, 12413 insertions(+), 6985 deletions(-)

diff --git a/mysql-test/suite/funcs_1/cursors/cursors_master.test b/mysql-test/suite/funcs_1/cursors/cursors_master.test
index 19961503b77..cf4c9e56dfa 100644
--- a/mysql-test/suite/funcs_1/cursors/cursors_master.test
+++ b/mysql-test/suite/funcs_1/cursors/cursors_master.test
@@ -1,4 +1,3 @@
 #### suite/funcs_1/cursors/cursors_master.test
-
 let $message= NOT YET IMPLEMENTED: cursor tests;
 --source include/show_msg80.inc
diff --git a/mysql-test/suite/funcs_1/datadict/datadict_master.inc b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
index 03d3eeb3777..6088a5c5143 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_master.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
@@ -3881,11 +3881,11 @@ let $message= Testcase 3.2.20.1:;
 let $is_table= referential_constraints;
 # when table is implemented remove this and the next 4 lines and "enable" 5th line:
 # and don't forget to add the test description to QATestPlanV50func
-let $message= checking a table that will be implemented later;
---source include/show_msg.inc
---error 1109
+#let $message= checking a table that will be implemented later;
+#--source include/show_msg.inc
+#--error 1109
 eval DESC $is_table;
-#--source suite/funcs_1/datadict/datadict_show_table_design.inc
+--source suite/funcs_1/datadict/datadict_show_table_design.inc
 # -------------------------------------------------------------------------------------------------------
 
 
diff --git a/mysql-test/suite/funcs_1/datadict/datadict_tables.inc b/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
index ea6e7c5d534..14e39c083b0 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
@@ -58,5 +58,5 @@ eval $dd_part1 triggers                              $dd_part2;
 --error 1109
 eval $dd_part1 parameters $dd_part2;
 
---error 1109
+--error 0,1109
 eval $dd_part1 referential_constraints $dd_part2;
diff --git a/mysql-test/suite/funcs_1/r/innodb__datadict.result b/mysql-test/suite/funcs_1/r/innodb__datadict.result
index 675f30da14a..25c5fbbf358 100644
--- a/mysql-test/suite/funcs_1/r/innodb__datadict.result
+++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result
@@ -435,10 +435,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -461,7 +472,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -482,7 +493,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -503,7 +514,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -524,7 +535,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -545,7 +556,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -563,10 +574,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -587,7 +787,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -608,7 +808,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -629,7 +829,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -647,10 +847,52 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -671,7 +913,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -692,7 +934,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -713,7 +955,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -734,7 +976,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -755,7 +997,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -776,7 +1018,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -901,6 +1143,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -922,6 +1185,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1027,6 +1311,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1069,6 +1395,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1534,6 +1902,8 @@ t.table_type, t.engine
 from schemata s inner join tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
@@ -1566,6 +1936,10 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -1578,6 +1952,17 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1585,6 +1970,8 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
@@ -1617,6 +2004,10 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -1629,6 +2020,17 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -1636,6 +2038,8 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
@@ -1668,6 +2072,10 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -1680,6 +2088,17 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -1687,6 +2106,8 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
@@ -1719,6 +2140,10 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -1731,6 +2156,17 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -1738,6 +2174,8 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
@@ -1770,6 +2208,10 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -1782,6 +2224,17 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -1789,6 +2242,8 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
@@ -1821,6 +2276,10 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -1833,6 +2292,17 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -1858,14 +2328,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -1880,6 +2350,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1892,6 +2431,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1922,6 +2515,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1942,20 +2539,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -2006,20 +2603,20 @@ NULL	db_datadict	v1	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_genera
 NULL	db_datadict	v1	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references	
-NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select,insert,update,references	
 NULL	db_datadict	vu	u	1		NO	varchar	81	243	NULL	NULL	utf8	utf8_general_ci	varchar(81)			select,insert,update,references	
@@ -2053,10 +2650,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
+NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
+NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
+NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
+NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
+NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
+NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
+NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -2090,6 +2713,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
+NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -2114,13 +2747,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
+NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -2165,14 +2818,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -2539,7 +3194,7 @@ cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
 eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
 select sum(id) from collations;
 sum(id)
-10741
+10840
 select collation_name, character_set_name into @x,@y
 from collation_character_set_applicability limit 1;
 select @x, @y;
@@ -2564,6 +3219,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -2575,6 +3232,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	1	NULL	NULL		BTREE	
@@ -2584,6 +3243,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -2614,6 +3274,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -2629,6 +3290,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -2639,6 +3301,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -2654,6 +3317,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -2664,6 +3328,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -2679,6 +3344,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -2696,6 +3362,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -2710,6 +3378,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 select * from table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 select * from column_privileges;
@@ -2718,6 +3388,7 @@ select * from table_constraints;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
@@ -2727,8 +3398,11 @@ NULL	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 NULL	mysql	name	mysql	help_topic	UNIQUE
 NULL	mysql	PRIMARY	mysql	host	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	ndb_binlog_index	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	proc	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	servers	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone_leap_second	PRIMARY KEY
@@ -2746,6 +3420,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_category	name	1	NULL	NULL	NULL	NULL
@@ -2757,6 +3433,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_topic	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -2765,6 +3443,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -2780,7 +3459,7 @@ NULL	mysql	PRIMARY	NULL	mysql	user	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	user	User	2	NULL	NULL	NULL	NULL
 select count(*) as max_recs from key_column_usage;
 max_recs
-40
+45
 select max(cardinality) from statistics;
 max(cardinality)
 393
@@ -2801,10 +3480,21 @@ Table or view 'COLLATIONS' is associated with the database 'information_schema'.
 Table or view 'COLLATION_CHARACTER_SET_APPLICABILITY' is associated with the database 'information_schema'.
 Table or view 'COLUMNS' is associated with the database 'information_schema'.
 Table or view 'COLUMN_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'ENGINES' is associated with the database 'information_schema'.
+Table or view 'EVENTS' is associated with the database 'information_schema'.
+Table or view 'FILES' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_STATUS' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_schema'.
+Table or view 'PARTITIONS' is associated with the database 'information_schema'.
+Table or view 'PLUGINS' is associated with the database 'information_schema'.
+Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
 Table or view 'SCHEMA_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'SESSION_STATUS' is associated with the database 'information_schema'.
+Table or view 'SESSION_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'STATISTICS' is associated with the database 'information_schema'.
 Table or view 'TABLES' is associated with the database 'information_schema'.
 Table or view 'TABLE_CONSTRAINTS' is associated with the database 'information_schema'.
@@ -2817,14 +3507,20 @@ Table or view 'vu' is associated with the database 'db_datadict'.
 Table or view 'vu1' is associated with the database 'db_datadict'.
 Table or view 'columns_priv' is associated with the database 'mysql'.
 Table or view 'db' is associated with the database 'mysql'.
+Table or view 'event' is associated with the database 'mysql'.
 Table or view 'func' is associated with the database 'mysql'.
+Table or view 'general_log' is associated with the database 'mysql'.
 Table or view 'help_category' is associated with the database 'mysql'.
 Table or view 'help_keyword' is associated with the database 'mysql'.
 Table or view 'help_relation' is associated with the database 'mysql'.
 Table or view 'help_topic' is associated with the database 'mysql'.
 Table or view 'host' is associated with the database 'mysql'.
+Table or view 'ndb_binlog_index' is associated with the database 'mysql'.
+Table or view 'plugin' is associated with the database 'mysql'.
 Table or view 'proc' is associated with the database 'mysql'.
 Table or view 'procs_priv' is associated with the database 'mysql'.
+Table or view 'servers' is associated with the database 'mysql'.
+Table or view 'slow_log' is associated with the database 'mysql'.
 Table or view 'tables_priv' is associated with the database 'mysql'.
 Table or view 'time_zone' is associated with the database 'mysql'.
 Table or view 'time_zone_leap_second' is associated with the database 'mysql'.
@@ -2871,12 +3567,12 @@ select * from table_constraints limit 0,5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select count(*) as max_recs from key_column_usage limit 0,5;
 max_recs
-40
+45
 select information_schema.tables.table_name as "table name",
 count(distinct(column_name)) as "no of columns in the table"
   from information_schema.tables left outer join information_schema.columns on
@@ -2889,19 +3585,36 @@ COLLATION_CHARACTER_SET_APPLICABILITY	2
 COLUMNS	19
 columns_priv	7
 COLUMN_PRIVILEGES	7
-db	20
+db	22
+ENGINES	6
+event	18
+EVENTS	21
+FILES	38
 func	4
+general_log	6
+GLOBAL_STATUS	2
+GLOBAL_VARIABLES	2
 help_category	4
 help_keyword	2
 help_relation	2
 help_topic	6
-host	19
+host	20
 KEY_COLUMN_USAGE	12
+ndb_binlog_index	7
+PARTITIONS	25
+plugin	2
+PLUGINS	10
 proc	16
+PROCESSLIST	8
 procs_priv	8
+REFERENTIAL_CONSTRAINTS	11
 ROUTINES	20
 SCHEMATA	5
 SCHEMA_PRIVILEGES	5
+servers	9
+SESSION_STATUS	2
+SESSION_VARIABLES	2
+slow_log	11
 STATISTICS	15
 t1	6
 t10	6
@@ -2927,7 +3640,7 @@ time_zone_name	2
 time_zone_transition	3
 time_zone_transition_type	5
 TRIGGERS	19
-user	37
+user	39
 USER_PRIVILEGES	4
 v1	21
 VIEWS	8
@@ -2941,7 +3654,7 @@ CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_P
 NULL	information_schema	utf8	utf8_general_ci	NULL
 SELECT * FROM tables                                LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
 SELECT * FROM columns                               LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2986,7 +3699,7 @@ TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATA
 SELECT * FROM parameters LIMIT 1;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT * FROM referential_constraints LIMIT 1;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	UNIQUE_CONSTRAINT_CATALOG	UNIQUE_CONSTRAINT_SCHEMA	UNIQUE_CONSTRAINT_NAME	MATCH_OPTION	UPDATE_RULE	DELETE_RULE	TABLE_NAME	REFERENCED_TABLE_NAME
 use db_datadict;
 select * from schemata;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
@@ -3076,7 +3789,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3097,7 +3810,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3118,7 +3831,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3139,7 +3852,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3160,7 +3873,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3178,10 +3891,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3202,7 +4104,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3223,7 +4125,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3244,7 +4146,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3262,10 +4164,52 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3286,7 +4230,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3307,7 +4251,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3328,7 +4272,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3349,7 +4293,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3370,7 +4314,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3391,7 +4335,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3516,6 +4460,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3537,6 +4502,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3642,6 +4628,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3684,6 +4712,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4149,6 +5219,8 @@ t.table_type, t.engine
 from information_schema.schemata s inner join information_schema.tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
@@ -4181,6 +5253,10 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -4193,6 +5269,17 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -4200,6 +5287,8 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
@@ -4232,6 +5321,10 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -4244,6 +5337,17 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -4251,6 +5355,8 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
@@ -4283,6 +5389,10 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -4295,6 +5405,17 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -4302,6 +5423,8 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
@@ -4334,6 +5457,10 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -4346,6 +5473,17 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -4353,6 +5491,8 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
@@ -4385,6 +5525,10 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -4397,6 +5541,17 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -4404,6 +5559,8 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
@@ -4436,6 +5593,10 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -4448,6 +5609,17 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -4522,9 +5694,9 @@ select * from information_schema.table_constraints limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select * from information_schema.key_column_usage limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Host	1	NULL	NULL	NULL	NULL
@@ -4534,7 +5706,7 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Table_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 select count(*) as max_recs from information_schema.key_column_usage limit 0, 5;
 max_recs
-40
+45
 
 root: check with db name
 ------------------------
@@ -4543,34 +5715,34 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-51
+68
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-657
+842
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
 SELECT COUNT(*) FROM information_schema. collations                            ;
 COUNT(*)
-126
+127
 SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ;
 COUNT(*)
-126
+128
 SELECT COUNT(*) FROM information_schema. routines                              ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM information_schema. statistics                            ;
 COUNT(*)
-43
+48
 SELECT COUNT(*) FROM information_schema. views                                 ;
 COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-75
+81
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
-28
+32
 SELECT COUNT(*) FROM information_schema. table_privileges                      ;
 COUNT(*)
 0
@@ -4579,17 +5751,18 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. table_constraints                     ;
 COUNT(*)
-20
+24
 SELECT COUNT(*) FROM information_schema. key_column_usage                      ;
 COUNT(*)
-40
+45
 SELECT COUNT(*) FROM information_schema. triggers                              ;
 COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. parameters ;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT COUNT(*) FROM information_schema. referential_constraints ;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+COUNT(*)
+0
 USE db_datadict;
 DROP VIEW v1, vu1, vu;
 DROP PROCEDURE db_datadict.sp_1;
@@ -4607,10 +5780,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-48
+65
 select count(*) as the_cols from columns;
 the_cols
-632
+817
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -4648,10 +5821,21 @@ information_schema, COLLATIONS
 information_schema, COLLATION_CHARACTER_SET_APPLICABILITY
 information_schema, COLUMNS
 information_schema, COLUMN_PRIVILEGES
+information_schema, ENGINES
+information_schema, EVENTS
+information_schema, FILES
+information_schema, GLOBAL_STATUS
+information_schema, GLOBAL_VARIABLES
 information_schema, KEY_COLUMN_USAGE
+information_schema, PARTITIONS
+information_schema, PLUGINS
+information_schema, PROCESSLIST
+information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
 information_schema, SCHEMA_PRIVILEGES
+information_schema, SESSION_STATUS
+information_schema, SESSION_VARIABLES
 information_schema, STATISTICS
 information_schema, TABLES
 information_schema, TABLE_CONSTRAINTS
@@ -4661,14 +5845,20 @@ information_schema, USER_PRIVILEGES
 information_schema, VIEWS
 mysql, columns_priv
 mysql, db
+mysql, event
 mysql, func
+mysql, general_log
 mysql, help_category
 mysql, help_keyword
 mysql, help_relation
 mysql, help_topic
 mysql, host
+mysql, ndb_binlog_index
+mysql, plugin
 mysql, proc
 mysql, procs_priv
+mysql, servers
+mysql, slow_log
 mysql, tables_priv
 mysql, time_zone
 mysql, time_zone_leap_second
@@ -4714,7 +5904,7 @@ NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
 select sum(ordinal_position) from key_column_usage;
 sum(ordinal_position)
-77
+83
 select * from schemata limit 0,5;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
 NULL	information_schema	utf8	utf8_general_ci	NULL
@@ -4761,6 +5951,8 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
+'root'@'127.0.0.1'
+'root'@'127.0.0.1'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -4786,6 +5978,10 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'localhost'
+'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
@@ -6294,6 +7490,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6309,6 +7506,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6319,6 +7517,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6334,6 +7533,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6344,6 +7544,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6359,6 +7560,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6439,6 +7641,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6454,6 +7657,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6464,6 +7668,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6479,6 +7684,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6489,6 +7695,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6504,6 +7711,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
@@ -6570,6 +7778,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6585,6 +7794,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6595,6 +7805,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6610,6 +7821,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6620,6 +7832,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6635,6 +7848,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6713,6 +7927,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6728,6 +7943,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6738,6 +7954,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6753,6 +7970,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6763,6 +7981,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6778,6 +7997,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6852,6 +8072,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6867,6 +8088,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6877,6 +8099,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6892,6 +8115,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6902,6 +8126,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6917,6 +8142,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7004,6 +8230,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7019,6 +8246,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7029,6 +8257,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7044,6 +8273,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7054,6 +8284,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7069,6 +8300,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
@@ -7134,6 +8366,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7149,6 +8382,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7159,6 +8393,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7174,6 +8409,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7184,6 +8420,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7199,6 +8436,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7240,10 +8478,21 @@ information_schema	COLLATIONS	MEMORY
 information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	MEMORY
 information_schema	COLUMNS	MyISAM
 information_schema	COLUMN_PRIVILEGES	MEMORY
+information_schema	ENGINES	MEMORY
+information_schema	EVENTS	MyISAM
+information_schema	FILES	MEMORY
+information_schema	GLOBAL_STATUS	MEMORY
+information_schema	GLOBAL_VARIABLES	MyISAM
 information_schema	KEY_COLUMN_USAGE	MEMORY
+information_schema	PARTITIONS	MyISAM
+information_schema	PLUGINS	MyISAM
+information_schema	PROCESSLIST	MyISAM
+information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
 information_schema	SCHEMA_PRIVILEGES	MEMORY
+information_schema	SESSION_STATUS	MEMORY
+information_schema	SESSION_VARIABLES	MyISAM
 information_schema	STATISTICS	MEMORY
 information_schema	TABLES	MEMORY
 information_schema	TABLE_CONSTRAINTS	MEMORY
@@ -7272,10 +8521,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7302,10 +8562,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7369,6 +8640,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -7383,6 +8655,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -7473,10 +8746,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7515,14 +8799,14 @@ COLUMNS	TABLE_CATALOG	varchar(4096)
 COLUMNS	TABLE_SCHEMA	varchar(64)
 COLUMNS	TABLE_NAME	varchar(64)
 COLUMNS	COLUMN_NAME	varchar(64)
-COLUMNS	ORDINAL_POSITION	bigint(21)
+COLUMNS	ORDINAL_POSITION	bigint(21) unsigned
 COLUMNS	COLUMN_DEFAULT	longtext
 COLUMNS	IS_NULLABLE	varchar(3)
 COLUMNS	DATA_TYPE	varchar(64)
-COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21)
-COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21)
-COLUMNS	NUMERIC_PRECISION	bigint(21)
-COLUMNS	NUMERIC_SCALE	bigint(21)
+COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned
+COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21) unsigned
+COLUMNS	NUMERIC_PRECISION	bigint(21) unsigned
+COLUMNS	NUMERIC_SCALE	bigint(21) unsigned
 COLUMNS	CHARACTER_SET_NAME	varchar(64)
 COLUMNS	COLLATION_NAME	varchar(64)
 COLUMNS	COLUMN_TYPE	longtext
@@ -7537,6 +8821,75 @@ COLUMN_PRIVILEGES	TABLE_NAME	varchar(64)
 COLUMN_PRIVILEGES	COLUMN_NAME	varchar(64)
 COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 COLUMN_PRIVILEGES	IS_GRANTABLE	varchar(3)
+ENGINES	ENGINE	varchar(64)
+ENGINES	SUPPORT	varchar(8)
+ENGINES	COMMENT	varchar(80)
+ENGINES	TRANSACTIONS	varchar(3)
+ENGINES	XA	varchar(3)
+ENGINES	SAVEPOINTS	varchar(3)
+EVENTS	EVENT_CATALOG	varchar(64)
+EVENTS	EVENT_SCHEMA	varchar(64)
+EVENTS	EVENT_NAME	varchar(64)
+EVENTS	DEFINER	varchar(77)
+EVENTS	TIME_ZONE	varchar(64)
+EVENTS	EVENT_BODY	varchar(8)
+EVENTS	EVENT_DEFINITION	longtext
+EVENTS	EVENT_TYPE	varchar(9)
+EVENTS	EXECUTE_AT	datetime
+EVENTS	INTERVAL_VALUE	varchar(256)
+EVENTS	INTERVAL_FIELD	varchar(18)
+EVENTS	SQL_MODE	longtext
+EVENTS	STARTS	datetime
+EVENTS	ENDS	datetime
+EVENTS	STATUS	varchar(18)
+EVENTS	ON_COMPLETION	varchar(12)
+EVENTS	CREATED	datetime
+EVENTS	LAST_ALTERED	datetime
+EVENTS	LAST_EXECUTED	datetime
+EVENTS	EVENT_COMMENT	varchar(64)
+EVENTS	ORIGINATOR	bigint(10)
+FILES	FILE_ID	bigint(4)
+FILES	FILE_NAME	varchar(64)
+FILES	FILE_TYPE	varchar(20)
+FILES	TABLESPACE_NAME	varchar(64)
+FILES	TABLE_CATALOG	varchar(64)
+FILES	TABLE_SCHEMA	varchar(64)
+FILES	TABLE_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NUMBER	bigint(4)
+FILES	ENGINE	varchar(64)
+FILES	FULLTEXT_KEYS	varchar(64)
+FILES	DELETED_ROWS	bigint(4)
+FILES	UPDATE_COUNT	bigint(4)
+FILES	FREE_EXTENTS	bigint(4)
+FILES	TOTAL_EXTENTS	bigint(4)
+FILES	EXTENT_SIZE	bigint(4)
+FILES	INITIAL_SIZE	bigint(21) unsigned
+FILES	MAXIMUM_SIZE	bigint(21) unsigned
+FILES	AUTOEXTEND_SIZE	bigint(21) unsigned
+FILES	CREATION_TIME	datetime
+FILES	LAST_UPDATE_TIME	datetime
+FILES	LAST_ACCESS_TIME	datetime
+FILES	RECOVER_TIME	bigint(4)
+FILES	TRANSACTION_COUNTER	bigint(4)
+FILES	VERSION	bigint(21) unsigned
+FILES	ROW_FORMAT	varchar(10)
+FILES	TABLE_ROWS	bigint(21) unsigned
+FILES	AVG_ROW_LENGTH	bigint(21) unsigned
+FILES	DATA_LENGTH	bigint(21) unsigned
+FILES	MAX_DATA_LENGTH	bigint(21) unsigned
+FILES	INDEX_LENGTH	bigint(21) unsigned
+FILES	DATA_FREE	bigint(21) unsigned
+FILES	CREATE_TIME	datetime
+FILES	UPDATE_TIME	datetime
+FILES	CHECK_TIME	datetime
+FILES	CHECKSUM	bigint(21) unsigned
+FILES	STATUS	varchar(20)
+FILES	EXTRA	varchar(255)
+GLOBAL_STATUS	VARIABLE_NAME	varchar(64)
+GLOBAL_STATUS	VARIABLE_VALUE	decimal(22,7)
+GLOBAL_VARIABLES	VARIABLE_NAME	varchar(64)
+GLOBAL_VARIABLES	VARIABLE_VALUE	longtext
 KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar(4096)
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar(64)
@@ -7549,6 +8902,60 @@ KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar(64)
+PARTITIONS	TABLE_CATALOG	varchar(4096)
+PARTITIONS	TABLE_SCHEMA	varchar(64)
+PARTITIONS	TABLE_NAME	varchar(64)
+PARTITIONS	PARTITION_NAME	varchar(64)
+PARTITIONS	SUBPARTITION_NAME	varchar(64)
+PARTITIONS	PARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	PARTITION_METHOD	varchar(12)
+PARTITIONS	SUBPARTITION_METHOD	varchar(12)
+PARTITIONS	PARTITION_EXPRESSION	longtext
+PARTITIONS	SUBPARTITION_EXPRESSION	longtext
+PARTITIONS	PARTITION_DESCRIPTION	longtext
+PARTITIONS	TABLE_ROWS	bigint(21) unsigned
+PARTITIONS	AVG_ROW_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	MAX_DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	INDEX_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_FREE	bigint(21) unsigned
+PARTITIONS	CREATE_TIME	datetime
+PARTITIONS	UPDATE_TIME	datetime
+PARTITIONS	CHECK_TIME	datetime
+PARTITIONS	CHECKSUM	bigint(21) unsigned
+PARTITIONS	PARTITION_COMMENT	varchar(80)
+PARTITIONS	NODEGROUP	varchar(12)
+PARTITIONS	TABLESPACE_NAME	varchar(64)
+PLUGINS	PLUGIN_NAME	varchar(64)
+PLUGINS	PLUGIN_VERSION	varchar(20)
+PLUGINS	PLUGIN_STATUS	varchar(10)
+PLUGINS	PLUGIN_TYPE	varchar(80)
+PLUGINS	PLUGIN_TYPE_VERSION	varchar(20)
+PLUGINS	PLUGIN_LIBRARY	varchar(64)
+PLUGINS	PLUGIN_LIBRARY_VERSION	varchar(20)
+PLUGINS	PLUGIN_AUTHOR	varchar(64)
+PLUGINS	PLUGIN_DESCRIPTION	longtext
+PLUGINS	PLUGIN_LICENSE	varchar(80)
+PROCESSLIST	ID	bigint(4)
+PROCESSLIST	USER	varchar(16)
+PROCESSLIST	HOST	varchar(64)
+PROCESSLIST	DB	varchar(64)
+PROCESSLIST	COMMAND	varchar(16)
+PROCESSLIST	TIME	bigint(7)
+PROCESSLIST	STATE	varchar(64)
+PROCESSLIST	INFO	longtext
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar(64)
+REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar(64)
 ROUTINES	SPECIFIC_NAME	varchar(64)
 ROUTINES	ROUTINE_CATALOG	varchar(4096)
 ROUTINES	ROUTINE_SCHEMA	varchar(64)
@@ -7579,6 +8986,10 @@ SCHEMA_PRIVILEGES	TABLE_CATALOG	varchar(4096)
 SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar(64)
 SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar(3)
+SESSION_STATUS	VARIABLE_NAME	varchar(64)
+SESSION_STATUS	VARIABLE_VALUE	decimal(22,7)
+SESSION_VARIABLES	VARIABLE_NAME	varchar(64)
+SESSION_VARIABLES	VARIABLE_VALUE	longtext
 STATISTICS	TABLE_CATALOG	varchar(4096)
 STATISTICS	TABLE_SCHEMA	varchar(64)
 STATISTICS	TABLE_NAME	varchar(64)
@@ -7599,20 +9010,20 @@ TABLES	TABLE_SCHEMA	varchar(64)
 TABLES	TABLE_NAME	varchar(64)
 TABLES	TABLE_TYPE	varchar(64)
 TABLES	ENGINE	varchar(64)
-TABLES	VERSION	bigint(21)
+TABLES	VERSION	bigint(21) unsigned
 TABLES	ROW_FORMAT	varchar(10)
-TABLES	TABLE_ROWS	bigint(21)
-TABLES	AVG_ROW_LENGTH	bigint(21)
-TABLES	DATA_LENGTH	bigint(21)
-TABLES	MAX_DATA_LENGTH	bigint(21)
-TABLES	INDEX_LENGTH	bigint(21)
-TABLES	DATA_FREE	bigint(21)
-TABLES	AUTO_INCREMENT	bigint(21)
+TABLES	TABLE_ROWS	bigint(21) unsigned
+TABLES	AVG_ROW_LENGTH	bigint(21) unsigned
+TABLES	DATA_LENGTH	bigint(21) unsigned
+TABLES	MAX_DATA_LENGTH	bigint(21) unsigned
+TABLES	INDEX_LENGTH	bigint(21) unsigned
+TABLES	DATA_FREE	bigint(21) unsigned
+TABLES	AUTO_INCREMENT	bigint(21) unsigned
 TABLES	CREATE_TIME	datetime
 TABLES	UPDATE_TIME	datetime
 TABLES	CHECK_TIME	datetime
 TABLES	TABLE_COLLATION	varchar(64)
-TABLES	CHECKSUM	bigint(21)
+TABLES	CHECKSUM	bigint(21) unsigned
 TABLES	CREATE_OPTIONS	varchar(255)
 TABLES	TABLE_COMMENT	varchar(80)
 TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
@@ -8014,6 +9425,7 @@ cp1250_general_ci
 cp1250_czech_cs
 cp1250_croatian_ci
 cp1250_bin
+cp1250_polish_ci
 gbk_chinese_ci
 gbk_bin
 latin5_turkish_ci
@@ -8221,10 +9633,10 @@ MAXLEN	bigint(3)	NO		0
 SHOW CREATE TABLE character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
-  `DESCRIPTION` varchar(60) NOT NULL default '',
-  `MAXLEN` bigint(3) NOT NULL default '0'
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
+  `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8302,12 +9714,12 @@ SORTLEN	bigint(3)	NO		0
 SHOW CREATE TABLE collations;
 Table	Create Table
 COLLATIONS	CREATE TEMPORARY TABLE `COLLATIONS` (
-  `COLLATION_NAME` varchar(64) NOT NULL default '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `ID` bigint(11) NOT NULL default '0',
-  `IS_DEFAULT` varchar(3) NOT NULL default '',
-  `IS_COMPILED` varchar(3) NOT NULL default '',
-  `SORTLEN` bigint(3) NOT NULL default '0'
+  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ID` bigint(11) NOT NULL DEFAULT '0',
+  `IS_DEFAULT` varchar(3) NOT NULL DEFAULT '',
+  `IS_COMPILED` varchar(3) NOT NULL DEFAULT '',
+  `SORTLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8378,6 +9790,7 @@ cp1250_general_ci	cp1250	26	Yes	Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_bin	cp1250	66		Yes	1
+cp1250_polish_ci	cp1250	99		Yes	1
 gbk_chinese_ci	gbk	28	Yes	Yes	1
 gbk_bin	gbk	87		Yes	1
 latin5_turkish_ci	latin5	30	Yes		0
@@ -8471,8 +9884,8 @@ CHARACTER_SET_NAME	varchar(64)	NO
 SHOW CREATE TABLE collation_character_set_applicability;
 Table	Create Table
 COLLATION_CHARACTER_SET_APPLICABILITY	CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
-  `COLLATION_NAME` varchar(64) NOT NULL default '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default ''
+  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8525,6 +9938,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -8539,6 +9953,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -8637,13 +10052,13 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE column_privileges;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8749,6 +10164,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_3'@'localhost'	NULL	db_datadict	SHOW VIEW	NO
 'user_3'@'localhost'	NULL	db_datadict	CREATE ROUTINE	NO
 'user_3'@'localhost'	NULL	db_datadict	ALTER ROUTINE	NO
+'user_3'@'localhost'	NULL	db_datadict	EVENT	NO
+'user_3'@'localhost'	NULL	db_datadict	TRIGGER	NO
 SELECT * FROM information_schema.column_privileges
 WHERE grantee LIKE "'user%"
  ORDER BY grantee, table_name, column_name, privilege_type;
@@ -8789,14 +10206,14 @@ TABLE_CATALOG	varchar(4096)	YES		NULL
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
 COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(21)	NO		0	
+ORDINAL_POSITION	bigint(21) unsigned	NO		0	
 COLUMN_DEFAULT	longtext	YES		NULL	
 IS_NULLABLE	varchar(3)	NO			
 DATA_TYPE	varchar(64)	NO			
-CHARACTER_MAXIMUM_LENGTH	bigint(21)	YES		NULL	
-CHARACTER_OCTET_LENGTH	bigint(21)	YES		NULL	
-NUMERIC_PRECISION	bigint(21)	YES		NULL	
-NUMERIC_SCALE	bigint(21)	YES		NULL	
+CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL	
+CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
+NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
+NUMERIC_SCALE	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 COLUMN_TYPE	longtext	NO			
@@ -8807,25 +10224,25 @@ COLUMN_COMMENT	varchar(255)	NO
 SHOW CREATE TABLE columns;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `ORDINAL_POSITION` bigint(21) NOT NULL default '0',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ORDINAL_POSITION` bigint(21) unsigned NOT NULL DEFAULT '0',
   `COLUMN_DEFAULT` longtext,
-  `IS_NULLABLE` varchar(3) NOT NULL default '',
-  `DATA_TYPE` varchar(64) NOT NULL default '',
-  `CHARACTER_MAXIMUM_LENGTH` bigint(21) default NULL,
-  `CHARACTER_OCTET_LENGTH` bigint(21) default NULL,
-  `NUMERIC_PRECISION` bigint(21) default NULL,
-  `NUMERIC_SCALE` bigint(21) default NULL,
-  `CHARACTER_SET_NAME` varchar(64) default NULL,
-  `COLLATION_NAME` varchar(64) default NULL,
+  `IS_NULLABLE` varchar(3) NOT NULL DEFAULT '',
+  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
+  `NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
+  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
+  `COLLATION_NAME` varchar(64) DEFAULT NULL,
   `COLUMN_TYPE` longtext NOT NULL,
-  `COLUMN_KEY` varchar(3) NOT NULL default '',
-  `EXTRA` varchar(20) NOT NULL default '',
-  `PRIVILEGES` varchar(80) NOT NULL default '',
-  `COLUMN_COMMENT` varchar(255) NOT NULL default ''
+  `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
+  `EXTRA` varchar(20) NOT NULL DEFAULT '',
+  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
+  `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8842,14 +10259,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8897,14 +10314,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8919,6 +10336,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8931,6 +10417,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8961,6 +10501,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8981,20 +10525,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -9067,10 +10611,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
+NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
+NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
+NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
+NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
+NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
+NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
+NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -9104,6 +10674,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
+NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -9128,13 +10708,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
+NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -9179,14 +10779,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -9535,14 +11137,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -9557,6 +11159,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9569,6 +11240,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9599,6 +11324,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9619,20 +11348,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -9969,14 +11698,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -9991,6 +11720,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10003,6 +11801,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10033,6 +11885,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10053,20 +11909,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10409,7 +12265,9 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	set	latin1	latin1_swedish_ci
 1.0000	text	latin1	latin1_swedish_ci
 1.0000	tinytext	latin1	latin1_swedish_ci
+1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	longtext	utf8	utf8_general_ci
+1.0000	mediumtext	utf8	utf8_general_ci
 1.0000	text	utf8	utf8_general_ci
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
@@ -10499,14 +12357,14 @@ NULL	information_schema	COLLATIONS	SORTLEN	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	COLUMNS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 1.0000	information_schema	COLUMNS	COLUMN_DEFAULT	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	COLUMNS	IS_NULLABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	COLUMNS	DATA_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	COLUMNS	CHARACTER_SET_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLLATION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	COLUMNS	COLUMN_TYPE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
@@ -10521,6 +12379,75 @@ NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(
 3.0000	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	ENGINES	SUPPORT	varchar	8	24	utf8	utf8_general_ci	varchar(8)
+3.0000	information_schema	ENGINES	COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	ENGINES	TRANSACTIONS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	XA	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	SAVEPOINTS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	EVENTS	EVENT_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)
+3.0000	information_schema	EVENTS	TIME_ZONE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_BODY	varchar	8	24	utf8	utf8_general_ci	varchar(8)
+1.0000	information_schema	EVENTS	EVENT_DEFINITION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	EVENTS	EVENT_TYPE	varchar	9	27	utf8	utf8_general_ci	varchar(9)
+NULL	information_schema	EVENTS	EXECUTE_AT	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	INTERVAL_VALUE	varchar	256	768	utf8	utf8_general_ci	varchar(256)
+3.0000	information_schema	EVENTS	INTERVAL_FIELD	varchar	18	54	utf8	utf8_general_ci	varchar(18)
+1.0000	information_schema	EVENTS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	EVENTS	STARTS	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	ENDS	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	STATUS	varchar	18	54	utf8	utf8_general_ci	varchar(18)
+3.0000	information_schema	EVENTS	ON_COMPLETION	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+NULL	information_schema	EVENTS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	LAST_EXECUTED	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	EVENT_COMMENT	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	EVENTS	ORIGINATOR	bigint	NULL	NULL	NULL	NULL	bigint(10)
+NULL	information_schema	FILES	FILE_ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	FILES	FILE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	FILE_TYPE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	FILES	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	LOGFILE_GROUP_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	FILES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	FULLTEXT_KEYS	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	FILES	DELETED_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	UPDATE_COUNT	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	FREE_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	TOTAL_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	EXTENT_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	INITIAL_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	MAXIMUM_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	CREATION_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	LAST_UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	LAST_ACCESS_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	RECOVER_TIME	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	TRANSACTION_COUNTER	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	FILES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
+NULL	information_schema	FILES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	FILES	STATUS	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	FILES	EXTRA	varchar	255	765	utf8	utf8_general_ci	varchar(255)
+3.0000	information_schema	GLOBAL_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10533,6 +12460,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint	NU
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+3.0000	information_schema	PARTITIONS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	PARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	SUBPARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	PARTITIONS	PARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+3.0000	information_schema	PARTITIONS	SUBPARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+1.0000	information_schema	PARTITIONS	PARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+1.0000	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+1.0000	information_schema	PARTITIONS	PARTITION_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	PARTITIONS	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	PARTITIONS	PARTITION_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	PARTITIONS	NODEGROUP	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+3.0000	information_schema	PARTITIONS	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_STATUS	varchar	10	30	utf8	utf8_general_ci	varchar(10)
+3.0000	information_schema	PLUGINS	PLUGIN_TYPE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_AUTHOR	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	PLUGINS	PLUGIN_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	PLUGINS	PLUGIN_LICENSE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	PROCESSLIST	USER	varchar	16	48	utf8	utf8_general_ci	varchar(16)
+3.0000	information_schema	PROCESSLIST	HOST	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PROCESSLIST	DB	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PROCESSLIST	COMMAND	varchar	16	48	utf8	utf8_general_ci	varchar(16)
+NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
+3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	SPECIFIC_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	ROUTINE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10563,6 +12544,10 @@ NULL	information_schema	ROUTINES	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datet
 3.0000	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	SESSION_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10583,20 +12568,20 @@ NULL	information_schema	STATISTICS	SUB_PART	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	TABLES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	TABLE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	TABLES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 NULL	information_schema	TABLES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 3.0000	information_schema	TABLES	TABLE_COLLATION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	TABLES	CREATE_OPTIONS	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 3.0000	information_schema	TABLES	TABLE_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
 3.0000	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
@@ -10669,10 +12654,36 @@ NULL	mysql	columns_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	db	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	db	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	db	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	event	db	char	64	192	utf8	utf8_bin	char(64)
+3.0000	mysql	event	name	char	64	192	utf8	utf8_general_ci	char(64)
+1.0000	mysql	event	body	longblob	4294967295	4294967295	NULL	NULL	longblob
+3.0000	mysql	event	definer	char	77	231	utf8	utf8_bin	char(77)
+NULL	mysql	event	execute_at	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	interval_value	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	event	interval_field	enum	18	54	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')
+NULL	mysql	event	created	timestamp	NULL	NULL	NULL	NULL	timestamp
+NULL	mysql	event	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
+NULL	mysql	event	last_executed	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	starts	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	ends	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	mysql	event	status	enum	18	54	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')
+3.0000	mysql	event	on_completion	enum	8	24	utf8	utf8_general_ci	enum('DROP','PRESERVE')
+3.0000	mysql	event	sql_mode	set	431	1293	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')
+3.0000	mysql	event	comment	char	64	192	utf8	utf8_bin	char(64)
+NULL	mysql	event	originator	int	NULL	NULL	NULL	NULL	int(10)
+1.0000	mysql	event	time_zone	char	64	64	latin1	latin1_swedish_ci	char(64)
 3.0000	mysql	func	name	char	64	192	utf8	utf8_bin	char(64)
 NULL	mysql	func	ret	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 3.0000	mysql	func	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	func	type	enum	9	27	utf8	utf8_general_ci	enum('function','aggregate')
+NULL	mysql	general_log	event_time	timestamp	NULL	NULL	NULL	NULL	timestamp
+1.0000	mysql	general_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
+NULL	mysql	general_log	thread_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	general_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	general_log	command_type	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	mysql	general_log	argument	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_category	parent_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
@@ -10706,6 +12717,16 @@ NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5)
 3.0000	mysql	host	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	host	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+NULL	mysql	ndb_binlog_index	Position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+1.0000	mysql	ndb_binlog_index	File	varchar	255	255	latin1	latin1_swedish_ci	varchar(255)
+NULL	mysql	ndb_binlog_index	epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	inserts	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	updates	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	deletes	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	schemaops	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+3.0000	mysql	plugin	name	char	64	192	utf8	utf8_bin	char(64)
+3.0000	mysql	plugin	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	proc	db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	proc	name	char	64	192	utf8	utf8_general_ci	char(64)
 3.0000	mysql	proc	type	enum	9	27	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')
@@ -10730,13 +12751,33 @@ NULL	mysql	proc	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	procs_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 3.0000	mysql	procs_priv	Proc_priv	set	27	81	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')
 NULL	mysql	procs_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
+3.0000	mysql	servers	Server_name	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Host	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Db	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Username	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Password	char	64	192	utf8	utf8_general_ci	char(64)
+NULL	mysql	servers	Port	int	NULL	NULL	NULL	NULL	int(4)
+3.0000	mysql	servers	Socket	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Wrapper	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Owner	char	64	192	utf8	utf8_general_ci	char(64)
+NULL	mysql	slow_log	start_time	timestamp	NULL	NULL	NULL	NULL	timestamp
+1.0000	mysql	slow_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
+NULL	mysql	slow_log	query_time	time	NULL	NULL	NULL	NULL	time
+NULL	mysql	slow_log	lock_time	time	NULL	NULL	NULL	NULL	time
+NULL	mysql	slow_log	rows_sent	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	rows_examined	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	slow_log	db	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+NULL	mysql	slow_log	last_insert_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	insert_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
+1.0000	mysql	slow_log	sql_text	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 3.0000	mysql	tables_priv	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	tables_priv	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	User	char	16	48	utf8	utf8_bin	char(16)
 3.0000	mysql	tables_priv	Table_name	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 NULL	mysql	tables_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	tables_priv	Table_priv	set	90	270	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')
+3.0000	mysql	tables_priv	Table_priv	set	98	294	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')
 3.0000	mysql	tables_priv	Column_priv	set	31	93	utf8	utf8_general_ci	set('Select','Insert','Update','References')
 NULL	mysql	time_zone	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	time_zone	Use_leap_seconds	enum	1	3	utf8	utf8_general_ci	enum('Y','N')
@@ -10781,6 +12822,8 @@ NULL	mysql	time_zone_transition_type	Is_DST	tinyint	NULL	NULL	NULL	NULL	tinyint(
 3.0000	mysql	user	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Create_user_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	user	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	user	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	ssl_type	enum	9	27	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')
 1.0000	mysql	user	ssl_cipher	blob	65535	65535	NULL	NULL	blob
 1.0000	mysql	user	x509_issuer	blob	65535	65535	NULL	NULL	blob
@@ -11141,18 +13184,18 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE key_column_usage;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `ORDINAL_POSITION` bigint(10) NOT NULL default '0',
-  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) default NULL,
-  `REFERENCED_TABLE_SCHEMA` varchar(64) default NULL,
-  `REFERENCED_TABLE_NAME` varchar(64) default NULL,
-  `REFERENCED_COLUMN_NAME` varchar(64) default NULL
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT '0',
+  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL,
+  `REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL,
+  `REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL,
+  `REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11213,6 +13256,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_keyword	help_keyword_id	1	NULL	NULL	NULL	NULL
@@ -11221,6 +13266,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_relation	help_topic_id	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -11229,6 +13276,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -11290,26 +13338,26 @@ DEFINER	varchar(77)	NO
 SHOW CREATE TABLE routines;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_CATALOG` varchar(4096) default NULL,
-  `ROUTINE_SCHEMA` varchar(64) NOT NULL default '',
-  `ROUTINE_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_TYPE` varchar(9) NOT NULL default '',
-  `DTD_IDENTIFIER` varchar(64) default NULL,
-  `ROUTINE_BODY` varchar(8) NOT NULL default '',
+  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_CATALOG` varchar(4096) DEFAULT NULL,
+  `ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT '',
+  `DTD_IDENTIFIER` varchar(64) DEFAULT NULL,
+  `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
   `ROUTINE_DEFINITION` longtext,
-  `EXTERNAL_NAME` varchar(64) default NULL,
-  `EXTERNAL_LANGUAGE` varchar(64) default NULL,
-  `PARAMETER_STYLE` varchar(8) NOT NULL default '',
-  `IS_DETERMINISTIC` varchar(3) NOT NULL default '',
-  `SQL_DATA_ACCESS` varchar(64) NOT NULL default '',
-  `SQL_PATH` varchar(64) default NULL,
-  `SECURITY_TYPE` varchar(7) NOT NULL default '',
-  `CREATED` datetime NOT NULL default '0000-00-00 00:00:00',
-  `LAST_ALTERED` datetime NOT NULL default '0000-00-00 00:00:00',
+  `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
+  `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
+  `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
+  `IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
+  `SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
+  `SQL_PATH` varchar(64) DEFAULT NULL,
+  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
+  `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `SQL_MODE` longtext NOT NULL,
-  `ROUTINE_COMMENT` varchar(64) NOT NULL default '',
-  `DEFINER` varchar(77) NOT NULL default ''
+  `ROUTINE_COMMENT` varchar(64) NOT NULL DEFAULT '',
+  `DEFINER` varchar(77) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11634,11 +13682,11 @@ SQL_PATH	varchar(4096)	YES		NULL
 SHOW CREATE TABLE schemata;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(4096) default NULL,
-  `SCHEMA_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL default '',
-  `SQL_PATH` varchar(4096) default NULL
+  `CATALOG_NAME` varchar(4096) DEFAULT NULL,
+  `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `SQL_PATH` varchar(4096) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11717,12 +13765,12 @@ CONSTRAINT_TYPE	varchar(64)	NO
 SHOW CREATE TABLE table_constraints;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `CONSTRAINT_TYPE` varchar(64) NOT NULL default ''
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_TYPE` varchar(64) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11797,12 +13845,12 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE table_privileges;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11856,6 +13904,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = USER();
@@ -11865,7 +13914,7 @@ SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = "'user_2'@'localhost'";
 USER()	COUNT(*)
-user_2@localhost	11
+user_2@localhost	12
 connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -11885,6 +13934,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'user_1'@'localhost'	NULL	db_datadict	tb1	SELECT	NO
 'user_3'@'localhost'	NULL	db_datadict	tb3	SELECT	NO
 	
@@ -11907,46 +13957,46 @@ TABLE_SCHEMA	varchar(64)	NO
 TABLE_NAME	varchar(64)	NO			
 TABLE_TYPE	varchar(64)	NO			
 ENGINE	varchar(64)	YES		NULL	
-VERSION	bigint(21)	YES		NULL	
+VERSION	bigint(21) unsigned	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
-TABLE_ROWS	bigint(21)	YES		NULL	
-AVG_ROW_LENGTH	bigint(21)	YES		NULL	
-DATA_LENGTH	bigint(21)	YES		NULL	
-MAX_DATA_LENGTH	bigint(21)	YES		NULL	
-INDEX_LENGTH	bigint(21)	YES		NULL	
-DATA_FREE	bigint(21)	YES		NULL	
-AUTO_INCREMENT	bigint(21)	YES		NULL	
+TABLE_ROWS	bigint(21) unsigned	YES		NULL	
+AVG_ROW_LENGTH	bigint(21) unsigned	YES		NULL	
+DATA_LENGTH	bigint(21) unsigned	YES		NULL	
+MAX_DATA_LENGTH	bigint(21) unsigned	YES		NULL	
+INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
+DATA_FREE	bigint(21) unsigned	YES		NULL	
+AUTO_INCREMENT	bigint(21) unsigned	YES		NULL	
 CREATE_TIME	datetime	YES		NULL	
 UPDATE_TIME	datetime	YES		NULL	
 CHECK_TIME	datetime	YES		NULL	
 TABLE_COLLATION	varchar(64)	YES		NULL	
-CHECKSUM	bigint(21)	YES		NULL	
+CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(255)	YES		NULL	
 TABLE_COMMENT	varchar(80)	NO			
 SHOW CREATE TABLE tables;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `TABLE_TYPE` varchar(64) NOT NULL default '',
-  `ENGINE` varchar(64) default NULL,
-  `VERSION` bigint(21) default NULL,
-  `ROW_FORMAT` varchar(10) default NULL,
-  `TABLE_ROWS` bigint(21) default NULL,
-  `AVG_ROW_LENGTH` bigint(21) default NULL,
-  `DATA_LENGTH` bigint(21) default NULL,
-  `MAX_DATA_LENGTH` bigint(21) default NULL,
-  `INDEX_LENGTH` bigint(21) default NULL,
-  `DATA_FREE` bigint(21) default NULL,
-  `AUTO_INCREMENT` bigint(21) default NULL,
-  `CREATE_TIME` datetime default NULL,
-  `UPDATE_TIME` datetime default NULL,
-  `CHECK_TIME` datetime default NULL,
-  `TABLE_COLLATION` varchar(64) default NULL,
-  `CHECKSUM` bigint(21) default NULL,
-  `CREATE_OPTIONS` varchar(255) default NULL,
-  `TABLE_COMMENT` varchar(80) NOT NULL default ''
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `ENGINE` varchar(64) DEFAULT NULL,
+  `VERSION` bigint(21) unsigned DEFAULT NULL,
+  `ROW_FORMAT` varchar(10) DEFAULT NULL,
+  `TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
+  `AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `DATA_FREE` bigint(21) unsigned DEFAULT NULL,
+  `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
+  `CREATE_TIME` datetime DEFAULT NULL,
+  `UPDATE_TIME` datetime DEFAULT NULL,
+  `CHECK_TIME` datetime DEFAULT NULL,
+  `TABLE_COLLATION` varchar(64) DEFAULT NULL,
+  `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
+  `CREATE_OPTIONS` varchar(255) DEFAULT NULL,
+  `TABLE_COMMENT` varchar(80) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11964,20 +14014,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 
@@ -12005,22 +14055,33 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12045,22 +14106,33 @@ connect(localhost,user_2,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12083,22 +14155,33 @@ connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12122,22 +14205,33 @@ root@localhost	db_datadict
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12147,14 +14241,20 @@ NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	N
 NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
 NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Column privileges
 NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Database privileges
+NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Events
 NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		User defined functions
+NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		General log
 NULL	mysql	help_category	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help categories
 NULL	mysql	help_keyword	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help keywords
 NULL	mysql	help_relation	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		keyword-topic relation
 NULL	mysql	help_topic	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help topics
 NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Host privileges;  Merged with database privileges
+NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
+NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		MySQL plugins
 NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Stored Procedures
 NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Procedure privileges
+NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		MySQL Foreign Servers table
+NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Slow log
 NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Table privileges
 NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zones
 NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Leap seconds information for time zones
@@ -12202,14 +14302,14 @@ SECURITY_TYPE	varchar(7)	NO
 SHOW CREATE TABLE views;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
   `VIEW_DEFINITION` longtext NOT NULL,
-  `CHECK_OPTION` varchar(8) NOT NULL default '',
-  `IS_UPDATABLE` varchar(3) NOT NULL default '',
-  `DEFINER` varchar(77) NOT NULL default '',
-  `SECURITY_TYPE` varchar(7) NOT NULL default ''
+  `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
+  `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
+  `DEFINER` varchar(77) NOT NULL DEFAULT '',
+  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12297,21 +14397,21 @@ COMMENT	varchar(16)	YES		NULL
 SHOW CREATE TABLE statistics;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `NON_UNIQUE` bigint(1) NOT NULL default '0',
-  `INDEX_SCHEMA` varchar(64) NOT NULL default '',
-  `INDEX_NAME` varchar(64) NOT NULL default '',
-  `SEQ_IN_INDEX` bigint(2) NOT NULL default '0',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `COLLATION` varchar(1) default NULL,
-  `CARDINALITY` bigint(21) default NULL,
-  `SUB_PART` bigint(3) default NULL,
-  `PACKED` varchar(10) default NULL,
-  `NULLABLE` varchar(3) NOT NULL default '',
-  `INDEX_TYPE` varchar(16) NOT NULL default '',
-  `COMMENT` varchar(16) default NULL
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `NON_UNIQUE` bigint(1) NOT NULL DEFAULT '0',
+  `INDEX_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `INDEX_NAME` varchar(64) NOT NULL DEFAULT '',
+  `SEQ_IN_INDEX` bigint(2) NOT NULL DEFAULT '0',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLLATION` varchar(1) DEFAULT NULL,
+  `CARDINALITY` bigint(21) DEFAULT NULL,
+  `SUB_PART` bigint(3) DEFAULT NULL,
+  `PACKED` varchar(10) DEFAULT NULL,
+  `NULLABLE` varchar(3) NOT NULL DEFAULT '',
+  `INDEX_TYPE` varchar(16) NOT NULL DEFAULT '',
+  `COMMENT` varchar(16) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12389,6 +14489,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -12400,6 +14502,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	0	NULL	NULL		BTREE	
@@ -12409,6 +14513,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -12458,11 +14563,11 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE schema_privileges;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12509,6 +14614,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12523,6 +14630,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401502,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12570,6 +14679,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12584,6 +14695,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401503_1,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12620,10 +14733,10 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE user_privileges;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12665,10 +14778,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12688,10 +14801,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12703,10 +14816,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12730,10 +14843,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12750,10 +14863,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12767,10 +14880,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12782,10 +14895,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT SELECT ON *.* TO 'user_1'@'localhost' WITH GRANT OPTION
@@ -12829,10 +14942,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12882,10 +14995,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12897,10 +15010,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12917,10 +15030,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12943,10 +15056,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -13003,23 +15116,23 @@ DEFINER	longtext	NO
 SHOW CREATE TABLE triggers;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(4096) default NULL,
-  `TRIGGER_SCHEMA` varchar(64) NOT NULL default '',
-  `TRIGGER_NAME` varchar(64) NOT NULL default '',
-  `EVENT_MANIPULATION` varchar(6) NOT NULL default '',
-  `EVENT_OBJECT_CATALOG` varchar(4096) default NULL,
-  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL default '',
-  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL default '',
-  `ACTION_ORDER` bigint(4) NOT NULL default '0',
+  `TRIGGER_CATALOG` varchar(4096) DEFAULT NULL,
+  `TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '',
+  `EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '',
+  `EVENT_OBJECT_CATALOG` varchar(4096) DEFAULT NULL,
+  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '',
+  `ACTION_ORDER` bigint(4) NOT NULL DEFAULT '0',
   `ACTION_CONDITION` longtext,
   `ACTION_STATEMENT` longtext NOT NULL,
-  `ACTION_ORIENTATION` varchar(9) NOT NULL default '',
-  `ACTION_TIMING` varchar(6) NOT NULL default '',
-  `ACTION_REFERENCE_OLD_TABLE` varchar(64) default NULL,
-  `ACTION_REFERENCE_NEW_TABLE` varchar(64) default NULL,
-  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL default '',
-  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL default '',
-  `CREATED` datetime default NULL,
+  `ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '',
+  `ACTION_TIMING` varchar(6) NOT NULL DEFAULT '',
+  `ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL,
+  `ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL,
+  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '',
+  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '',
+  `CREATED` datetime DEFAULT NULL,
   `SQL_MODE` longtext NOT NULL,
   `DEFINER` longtext NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -13067,11 +15180,70 @@ ERROR 42S02: Unknown table 'parameters' in information_schema
 
 Testcase 3.2.20.1:
 --------------------------------------------------------------------------------
-
-checking a table that will be implemented later
------------------------------------------------
 DESC referential_constraints;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+USE information_schema;
+DESC referential_constraints;
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+SHOW CREATE TABLE referential_constraints;
+Table	Create Table
+REFERENTIAL_CONSTRAINTS	CREATE TEMPORARY TABLE `REFERENTIAL_CONSTRAINTS` (
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `UNIQUE_CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `MATCH_OPTION` varchar(64) NOT NULL DEFAULT '',
+  `UPDATE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `DELETE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `REFERENCED_TABLE_NAME` varchar(64) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
+SELECT COUNT(*) FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+COUNT(*)
+11
+SELECT * FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 
 *** End of Data Dictionary Tests ***
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result
index 764aac53414..ab4508fb302 100644
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -9,7 +9,7 @@ CREATE TABLE t1_values
 id BIGINT AUTO_INCREMENT,
 select_id BIGINT,
 PRIMARY KEY(id)
-) ENGINE = 'InnoDB' ;
+) ENGINE = <engine_to_be_tested>;
 ALTER TABLE t1_values ADD my_char_30        CHAR(30);
 ALTER TABLE t1_values ADD my_varchar_1000   VARCHAR(1000);
 ALTER TABLE t1_values ADD my_binary_30      BINARY(30);
@@ -123,10 +123,8 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = 1758;
-
-some statements disabled because of
-Bug#12440: CAST(data type DOUBLE AS TIME) strange results
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = +1.758E+3;
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -135,29 +133,20 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_binary_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '-3333.3333';
-
-some statements disabled because of
-Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = -0.33333333E+4;
 
 "Attention: CAST --> SIGNED INTEGER
-            The file with expected results suffers from
-            Bug#5083 Big integer values are inserted as negative into 
-                     decimal/string columns
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Both have the status: To be fixed later"
---------------------------------------------------------------------------------
-
-some statements disabled because of
-Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result
+            Status: To be fixed later"
 --------------------------------------------------------------------------------
 
 "Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5083 5913 9809"
+            The file with expected results suffers from Bug 5913"
 --------------------------------------------------------------------------------
 
 some statements disabled because of
-Bugs#8663: cant use bgint unsigned as input to cast
+Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
 SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values';
@@ -175,11 +164,6 @@ SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values';
-
-"Attention: IF(my_year IS NULL, ...
-            The file with expected results suffers from 
-            Bug#11689. successful CREATE VIEW but SELECT on view fails."
---------------------------------------------------------------------------------
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_varchar_1000),
@@ -202,7 +186,7 @@ SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
 
 "Attention: LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', <numeric column>)
-            The file with expected results suffers from Bug 10963 11728"
+            The file with expected results suffers from Bug 10963"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
 because there are 32/64 Bit differences
 --------------------------------------------------------------------------------
@@ -216,8 +200,9 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
+SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select = 
-'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
+'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -299,19 +284,19 @@ SET sql_mode = '';
 --------------------------------------------------------------------------------
 CREATE VIEW v1 AS SELECT my_char_30, id FROM t1_values;
 SELECT my_char_30, id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL;
+WHERE select_id = 190 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL);
+WHERE select_id = 190 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values;
 SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL;
+WHERE select_id = 189 OR select_id IS NULL order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -323,7 +308,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select concat(_latin1'A',`t1_values`.`my_char_30`) AS `CONCAT('A',my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL);
+WHERE select_id = 189 OR select_id IS NULL) order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -337,13 +322,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL;
+WHERE select_id = 188 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varbinary_1000`) AS `LTRIM(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL);
+WHERE select_id = 188 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -351,13 +336,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL;
+WHERE select_id = 187 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_binary_30`) AS `LTRIM(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL);
+WHERE select_id = 187 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -365,13 +350,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL;
+WHERE select_id = 186 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varchar_1000`) AS `LTRIM(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL);
+WHERE select_id = 186 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -379,13 +364,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL;
+WHERE select_id = 185 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_char_30`) AS `LTRIM(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL);
+WHERE select_id = 185 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -393,13 +378,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL;
+WHERE select_id = 184 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varbinary_1000`) AS `LOWER(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL);
+WHERE select_id = 184 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -407,13 +392,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL;
+WHERE select_id = 183 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_binary_30`) AS `LOWER(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL);
+WHERE select_id = 183 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -421,13 +406,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL;
+WHERE select_id = 182 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LOWER(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL);
+WHERE select_id = 182 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -435,13 +420,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL;
+WHERE select_id = 181 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_char_30`) AS `LOWER(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL);
+WHERE select_id = 181 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -449,13 +434,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL;
+WHERE select_id = 180 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_decimal`) AS `LOCATE('-', ' - -ABC', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL);
+WHERE select_id = 180 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -463,13 +448,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL;
+WHERE select_id = 179 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_double`) AS `LOCATE('-', ' - -ABC', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL);
+WHERE select_id = 179 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -477,13 +462,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL;
+WHERE select_id = 178 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_bigint`) AS `LOCATE('-', ' - -ABC', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL);
+WHERE select_id = 178 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -491,13 +476,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL;
+WHERE select_id = 177 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varbinary_1000`,3) AS `LOCATE('-', my_varbinary_1000, 3)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL);
+WHERE select_id = 177 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -505,13 +490,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL;
+WHERE select_id = 176 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_binary_30`,3) AS `LOCATE('-', my_binary_30, 3)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL);
+WHERE select_id = 176 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -519,13 +504,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL;
+WHERE select_id = 175 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varchar_1000`,3) AS `LOCATE('-', my_varchar_1000, 3)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL);
+WHERE select_id = 175 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -533,13 +518,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL;
+WHERE select_id = 174 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_char_30`,3) AS `LOCATE('-', my_char_30, 3)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL);
+WHERE select_id = 174 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -547,13 +532,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL;
+WHERE select_id = 173 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varbinary_1000, my_binary_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL);
+WHERE select_id = 173 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -561,13 +546,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL;
+WHERE select_id = 172 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varbinary_1000, my_varchar_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL);
+WHERE select_id = 172 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -575,13 +560,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL;
+WHERE select_id = 171 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varbinary_1000, my_char_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL);
+WHERE select_id = 171 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -589,13 +574,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL;
+WHERE select_id = 170 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varbinary_1000, my_varbinary_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL);
+WHERE select_id = 170 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -603,13 +588,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL;
+WHERE select_id = 169 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_binary_30, my_varbinary_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL);
+WHERE select_id = 169 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -617,13 +602,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL;
+WHERE select_id = 168 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_binary_30, my_varchar_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL);
+WHERE select_id = 168 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -631,13 +616,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL;
+WHERE select_id = 167 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_binary_30, my_char_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL);
+WHERE select_id = 167 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -645,13 +630,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL;
+WHERE select_id = 166 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_binary_30, my_binary_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL);
+WHERE select_id = 166 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -659,13 +644,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL;
+WHERE select_id = 165 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varchar_1000, my_varbinary_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL);
+WHERE select_id = 165 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -673,13 +658,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL;
+WHERE select_id = 164 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varchar_1000, my_binary_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL);
+WHERE select_id = 164 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -687,13 +672,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL;
+WHERE select_id = 163 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varchar_1000, my_char_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL);
+WHERE select_id = 163 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -701,13 +686,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL;
+WHERE select_id = 162 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varchar_1000, my_varchar_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL);
+WHERE select_id = 162 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -715,13 +700,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL;
+WHERE select_id = 161 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_char_30, my_varbinary_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL);
+WHERE select_id = 161 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -729,13 +714,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL;
+WHERE select_id = 160 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_char_30, my_binary_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL);
+WHERE select_id = 160 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -743,13 +728,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL;
+WHERE select_id = 159 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_char_30, my_varchar_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL);
+WHERE select_id = 159 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -757,13 +742,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values;
 SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL;
+WHERE select_id = 158 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_char_30, my_char_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL);
+WHERE select_id = 158 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -771,13 +756,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL;
+WHERE select_id = 157 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varbinary_1000`) AS `LOCATE('char', my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL);
+WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -785,13 +770,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL;
+WHERE select_id = 156 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_binary_30`) AS `LOCATE('char', my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL);
+WHERE select_id = 156 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -799,13 +784,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL;
+WHERE select_id = 155 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varchar_1000`) AS `LOCATE('char', my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL);
+WHERE select_id = 155 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -813,46 +798,46 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL;
+WHERE select_id = 154 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `LOCATE('char', my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL);
+WHERE select_id = 154 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../log/current_test'), id FROM t1_values;
-SELECT LOAD_FILE('../log/current_test'), id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL;
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: innodb_func_view
+CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
+SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+WHERE select_id = 153 OR select_id IS NULL order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: innodb_func_view
+äÄ@
 	2
-CURRENT_TEST: innodb_func_view
+äÄ@
 	3
-CURRENT_TEST: innodb_func_view
+äÄ@
 	4
-CURRENT_TEST: innodb_func_view
+äÄ@
 	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../log/current_test') AS `LOAD_FILE('../log/current_test')`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL);
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: innodb_func_view
+WHERE select_id = 153 OR select_id IS NULL) order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: innodb_func_view
+äÄ@
 	2
-CURRENT_TEST: innodb_func_view
+äÄ@
 	3
-CURRENT_TEST: innodb_func_view
+äÄ@
 	4
-CURRENT_TEST: innodb_func_view
+äÄ@
 	5
 DROP VIEW v1;
 
@@ -861,13 +846,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL;
+WHERE select_id = 152 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varbinary_1000`) AS `LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL);
+WHERE select_id = 152 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -875,13 +860,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL;
+WHERE select_id = 151 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_binary_30`) AS `LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL);
+WHERE select_id = 151 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -889,13 +874,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL;
+WHERE select_id = 150 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varchar_1000`) AS `LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL);
+WHERE select_id = 150 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -903,19 +888,19 @@ CREATE VIEW v1 AS SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL;
+WHERE select_id = 149 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_char_30`) AS `LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL);
+WHERE select_id = 149 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values;
 SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL;
+WHERE select_id = 148 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -930,7 +915,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL);
+WHERE select_id = 148 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -945,7 +930,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values;
 SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL;
+WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -957,7 +942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varbinary_1000`,2) AS `LEFT(my_varbinary_1000, 2)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL);
+WHERE select_id = 147 OR select_id IS NULL) order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -969,7 +954,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values;
 SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL;
+WHERE select_id = 146 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -981,7 +966,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL);
+WHERE select_id = 146 OR select_id IS NULL) order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -993,7 +978,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values;
 SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL;
+WHERE select_id = 145 OR select_id IS NULL order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1005,7 +990,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varchar_1000`,2) AS `LEFT(my_varchar_1000, 2)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL);
+WHERE select_id = 145 OR select_id IS NULL) order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1017,7 +1002,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values;
 SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL;
+WHERE select_id = 144 OR select_id IS NULL order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1029,7 +1014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_char_30`,2) AS `LEFT(my_char_30, 2)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL);
+WHERE select_id = 144 OR select_id IS NULL) order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1043,13 +1028,13 @@ CREATE VIEW v1 AS SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL;
+WHERE select_id = 143 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LCASE(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL);
+WHERE select_id = 143 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1057,13 +1042,13 @@ CREATE VIEW v1 AS SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values;
 SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL;
+WHERE select_id = 142 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `INSTR(my_char_30, 'char')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL);
+WHERE select_id = 142 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1071,7 +1056,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL;
+WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1083,7 +1068,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varbinary_1000`) AS `BIT_LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL);
+WHERE select_id = 141 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1097,7 +1082,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL;
+WHERE select_id = 140 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1109,7 +1094,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL);
+WHERE select_id = 140 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1123,7 +1108,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL;
+WHERE select_id = 139 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1135,7 +1120,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varchar_1000`) AS `BIT_LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL);
+WHERE select_id = 139 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1149,7 +1134,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL;
+WHERE select_id = 138 OR select_id IS NULL order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1161,7 +1146,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_char_30`) AS `BIT_LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL);
+WHERE select_id = 138 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1175,7 +1160,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values;
 SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL;
+WHERE select_id = 137 OR select_id IS NULL order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1187,7 +1172,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_year`,_latin1'IS_NULL') AS `IFNULL(my_year,'IS_NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL);
+WHERE select_id = 137 OR select_id IS NULL) order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1201,7 +1186,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values;
 SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL;
+WHERE select_id = 136 OR select_id IS NULL order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1213,7 +1198,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_time`,_latin1'IS_NULL') AS `IFNULL(my_time,'IS_NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL);
+WHERE select_id = 136 OR select_id IS NULL) order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1227,7 +1212,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values;
 SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL;
+WHERE select_id = 135 OR select_id IS NULL order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1239,7 +1224,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_timestamp`,_latin1'IS_NULL') AS `IFNULL(my_timestamp,'IS_NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL);
+WHERE select_id = 135 OR select_id IS NULL) order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1253,7 +1238,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values;
 SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL;
+WHERE select_id = 134 OR select_id IS NULL order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1265,7 +1250,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_date`,_latin1'IS_NULL') AS `IFNULL(my_date,'IS_NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL);
+WHERE select_id = 134 OR select_id IS NULL) order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1279,7 +1264,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values;
 SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL;
+WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1291,7 +1276,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_datetime`,_latin1'IS_NULL') AS `IFNULL(my_datetime,'IS_NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL);
+WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1305,7 +1290,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values;
 SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL;
+WHERE select_id = 132 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1317,7 +1302,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_double`,_latin1'IS_NULL') AS `IFNULL(my_double,'IS_NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL);
+WHERE select_id = 132 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1331,7 +1316,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values;
 SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL;
+WHERE select_id = 131 OR select_id IS NULL order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1343,7 +1328,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_decimal`,_latin1'IS_NULL') AS `IFNULL(my_decimal,'IS_NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL);
+WHERE select_id = 131 OR select_id IS NULL) order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1357,7 +1342,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values;
 SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL;
+WHERE select_id = 130 OR select_id IS NULL order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1369,7 +1354,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_bigint`,_latin1'IS_NULL') AS `IFNULL(my_bigint,'IS_NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL);
+WHERE select_id = 130 OR select_id IS NULL) order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1383,7 +1368,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL;
+WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1395,7 +1380,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varbinary_1000`,_latin1'IS_NULL') AS `IFNULL(my_varbinary_1000,'IS_NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL);
+WHERE select_id = 129 OR select_id IS NULL) order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1409,7 +1394,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values;
 SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL;
+WHERE select_id = 128 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1421,7 +1406,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,_latin1'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL);
+WHERE select_id = 128 OR select_id IS NULL) order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1435,7 +1420,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values;
 SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL;
+WHERE select_id = 127 OR select_id IS NULL order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1447,7 +1432,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varchar_1000`,_latin1'IS_NULL') AS `IFNULL(my_varchar_1000,'IS_NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL);
+WHERE select_id = 127 OR select_id IS NULL) order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1461,7 +1446,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values;
 SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL;
+WHERE select_id = 126 OR select_id IS NULL order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1473,7 +1458,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_char_30`,_latin1'IS_NULL') AS `IFNULL(my_char_30,'IS_NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL);
+WHERE select_id = 126 OR select_id IS NULL) order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1487,7 +1472,7 @@ CREATE VIEW v1 AS SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values;
 SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL;
+WHERE select_id = 125 OR select_id IS NULL order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1501,7 +1486,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL);
+WHERE select_id = 125 OR select_id IS NULL) order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1516,7 +1501,7 @@ CREATE VIEW v1 AS SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values;
 SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL;
+WHERE select_id = 124 OR select_id IS NULL order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1530,7 +1515,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL);
+WHERE select_id = 124 OR select_id IS NULL) order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1545,7 +1530,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL;
+WHERE select_id = 123 OR select_id IS NULL order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1559,7 +1544,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL);
+WHERE select_id = 123 OR select_id IS NULL) order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1574,7 +1559,7 @@ CREATE VIEW v1 AS SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values;
 SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL;
+WHERE select_id = 122 OR select_id IS NULL order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1588,7 +1573,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL);
+WHERE select_id = 122 OR select_id IS NULL) order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1603,7 +1588,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values;
 SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL;
+WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1617,7 +1602,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL);
+WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1632,7 +1617,7 @@ CREATE VIEW v1 AS SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values;
 SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL;
+WHERE select_id = 120 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1646,7 +1631,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL);
+WHERE select_id = 120 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1661,7 +1646,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values;
 SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL;
+WHERE select_id = 119 OR select_id IS NULL order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1675,7 +1660,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL);
+WHERE select_id = 119 OR select_id IS NULL) order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1690,7 +1675,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values;
 SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL;
+WHERE select_id = 118 OR select_id IS NULL order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1704,7 +1689,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL);
+WHERE select_id = 118 OR select_id IS NULL) order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1719,7 +1704,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL;
+WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1733,7 +1718,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL);
+WHERE select_id = 117 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1748,7 +1733,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL;
+WHERE select_id = 116 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1762,7 +1747,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL);
+WHERE select_id = 116 OR select_id IS NULL) order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1777,7 +1762,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL;
+WHERE select_id = 115 OR select_id IS NULL order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1791,7 +1776,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL);
+WHERE select_id = 115 OR select_id IS NULL) order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1806,7 +1791,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values;
 SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL;
+WHERE select_id = 114 OR select_id IS NULL order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1820,7 +1805,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL);
+WHERE select_id = 114 OR select_id IS NULL) order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1835,7 +1820,7 @@ CREATE VIEW v1 AS SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values;
 SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL;
+WHERE select_id = 113 OR select_id IS NULL order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1847,7 +1832,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_year`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_year, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL);
+WHERE select_id = 113 OR select_id IS NULL) order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1861,7 +1846,7 @@ CREATE VIEW v1 AS SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values;
 SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL;
+WHERE select_id = 112 OR select_id IS NULL order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1873,7 +1858,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_time`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_time, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL);
+WHERE select_id = 112 OR select_id IS NULL) order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1887,7 +1872,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL;
+WHERE select_id = 111 OR select_id IS NULL order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1899,7 +1884,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_timestamp`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL);
+WHERE select_id = 111 OR select_id IS NULL) order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1913,7 +1898,7 @@ CREATE VIEW v1 AS SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values;
 SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL;
+WHERE select_id = 110 OR select_id IS NULL order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1925,7 +1910,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_date`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_date, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL);
+WHERE select_id = 110 OR select_id IS NULL) order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1939,7 +1924,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values;
 SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL;
+WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1951,7 +1936,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_datetime`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL);
+WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1965,7 +1950,7 @@ CREATE VIEW v1 AS SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values;
 SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL;
+WHERE select_id = 108 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1977,7 +1962,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_double`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_double, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL);
+WHERE select_id = 108 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1991,7 +1976,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values;
 SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL;
+WHERE select_id = 107 OR select_id IS NULL order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2003,7 +1988,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_decimal`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL);
+WHERE select_id = 107 OR select_id IS NULL) order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2017,7 +2002,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values;
 SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL;
+WHERE select_id = 106 OR select_id IS NULL order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2029,7 +2014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_bigint`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL);
+WHERE select_id = 106 OR select_id IS NULL) order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2043,7 +2028,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL;
+WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2055,7 +2040,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varbinary_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL);
+WHERE select_id = 105 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2069,7 +2054,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL;
+WHERE select_id = 104 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2086,7 +2071,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_binary_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL);
+WHERE select_id = 104 OR select_id IS NULL) order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2105,7 +2090,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL;
+WHERE select_id = 103 OR select_id IS NULL order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2117,7 +2102,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varchar_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL);
+WHERE select_id = 103 OR select_id IS NULL) order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2131,7 +2116,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values;
 SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL;
+WHERE select_id = 102 OR select_id IS NULL order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2146,7 +2131,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_char_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL);
+WHERE select_id = 102 OR select_id IS NULL) order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2163,7 +2148,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL;
+WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2175,7 +2160,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using koi8r) AS `CONVERT(my_varbinary_1000 USING koi8r)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL);
+WHERE select_id = 101 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2189,7 +2174,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING koi8r), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL;
+WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2201,7 +2186,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL);
+WHERE select_id = 100 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2215,7 +2200,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING koi8r), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL;
+WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2227,7 +2212,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL);
+WHERE select_id = 99 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2241,7 +2226,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING koi8r), 
 my_char_30, id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL;
+WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2253,7 +2238,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL);
+WHERE select_id = 98 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2267,7 +2252,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING utf8), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL;
+WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2279,7 +2264,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using utf8) AS `CONVERT(my_varbinary_1000 USING utf8)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL);
+WHERE select_id = 97 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2293,7 +2278,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING utf8), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL;
+WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2305,7 +2290,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL);
+WHERE select_id = 96 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2319,7 +2304,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING utf8), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL;
+WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2331,7 +2316,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using utf8) AS `CONVERT(my_varchar_1000 USING utf8)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL);
+WHERE select_id = 95 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2345,7 +2330,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL;
+WHERE select_id = 94 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2357,7 +2342,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using utf8) AS `CONVERT(my_char_30 USING utf8)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL);
+WHERE select_id = 94 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2371,7 +2356,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL;
+WHERE select_id = 93 OR select_id IS NULL order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2383,7 +2368,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as unsigned) AS `CAST(my_year AS UNSIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL);
+WHERE select_id = 93 OR select_id IS NULL) order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2397,7 +2382,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL;
+WHERE select_id = 92 OR select_id IS NULL order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2415,7 +2400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL);
+WHERE select_id = 92 OR select_id IS NULL) order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2435,7 +2420,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL;
+WHERE select_id = 91 OR select_id IS NULL order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2453,7 +2438,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL);
+WHERE select_id = 91 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2473,7 +2458,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL;
+WHERE select_id = 90 OR select_id IS NULL order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2490,7 +2475,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL);
+WHERE select_id = 90 OR select_id IS NULL) order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2509,7 +2494,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL;
+WHERE select_id = 89 OR select_id IS NULL order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2526,7 +2511,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL);
+WHERE select_id = 89 OR select_id IS NULL) order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2545,7 +2530,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL;
+WHERE select_id = 88 OR select_id IS NULL order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2561,7 +2546,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL);
+WHERE select_id = 88 OR select_id IS NULL) order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2579,7 +2564,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL;
+WHERE select_id = 87 OR select_id IS NULL order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2591,7 +2576,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL);
+WHERE select_id = 87 OR select_id IS NULL) order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2605,7 +2590,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL;
+WHERE select_id = 86 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2622,7 +2607,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL);
+WHERE select_id = 86 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2641,7 +2626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL;
+WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2659,7 +2644,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL);
+WHERE select_id = 85 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2679,7 +2664,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL;
+WHERE select_id = 84 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2696,7 +2681,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL);
+WHERE select_id = 84 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2715,7 +2700,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL;
+WHERE select_id = 83 OR select_id IS NULL order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2732,7 +2717,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL);
+WHERE select_id = 83 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2751,7 +2736,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL;
+WHERE select_id = 82 OR select_id IS NULL order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2763,7 +2748,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as signed) AS `CAST(my_year AS SIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL);
+WHERE select_id = 82 OR select_id IS NULL) order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2777,7 +2762,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL;
+WHERE select_id = 81 OR select_id IS NULL order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2794,7 +2779,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL);
+WHERE select_id = 81 OR select_id IS NULL) order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2813,7 +2798,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL;
+WHERE select_id = 80 OR select_id IS NULL order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2831,7 +2816,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL);
+WHERE select_id = 80 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2851,7 +2836,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL;
+WHERE select_id = 79 OR select_id IS NULL order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2868,7 +2853,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL);
+WHERE select_id = 79 OR select_id IS NULL) order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2887,7 +2872,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL;
+WHERE select_id = 78 OR select_id IS NULL order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2904,7 +2889,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL);
+WHERE select_id = 78 OR select_id IS NULL) order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2919,11 +2904,43 @@ Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL) order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL;
+WHERE select_id = 76 OR select_id IS NULL order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2938,7 +2955,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL);
+WHERE select_id = 76 OR select_id IS NULL) order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2955,7 +2972,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL;
+WHERE select_id = 75 OR select_id IS NULL order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2967,7 +2984,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as signed) AS `CAST(my_bigint AS SIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL);
+WHERE select_id = 75 OR select_id IS NULL) order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2981,7 +2998,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL;
+WHERE select_id = 74 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2997,7 +3014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL);
+WHERE select_id = 74 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3015,7 +3032,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL;
+WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3032,7 +3049,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL);
+WHERE select_id = 73 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3051,7 +3068,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL;
+WHERE select_id = 72 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3067,7 +3084,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL);
+WHERE select_id = 72 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3085,7 +3102,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL;
+WHERE select_id = 71 OR select_id IS NULL order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3101,7 +3118,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL);
+WHERE select_id = 71 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3119,25 +3136,25 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL;
+WHERE select_id = 70 OR select_id IS NULL order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL);
+WHERE select_id = 70 OR select_id IS NULL) order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 DROP VIEW v1;
 
 
@@ -3145,25 +3162,25 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL;
+WHERE select_id = 69 OR select_id IS NULL order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL);
+WHERE select_id = 69 OR select_id IS NULL) order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -3171,25 +3188,35 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL;
+WHERE select_id = 68 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL);
+WHERE select_id = 68 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3197,25 +3224,25 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL;
+WHERE select_id = 67 OR select_id IS NULL order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL);
+WHERE select_id = 67 OR select_id IS NULL) order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -3223,25 +3250,73 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL;
+WHERE select_id = 66 OR select_id IS NULL order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL);
+WHERE select_id = 66 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+DROP VIEW v1;
+
+
+CREATE VIEW v1 AS SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as decimal) AS `CAST(my_double AS DECIMAL)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL) order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3249,25 +3324,31 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL;
+WHERE select_id = 64 OR select_id IS NULL order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL);
+WHERE select_id = 64 OR select_id IS NULL) order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3275,25 +3356,31 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL;
+WHERE select_id = 63 OR select_id IS NULL order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL);
+WHERE select_id = 63 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3301,14 +3388,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL;
+WHERE select_id = 62 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3318,14 +3405,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL);
+WHERE select_id = 62 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3337,14 +3424,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL;
+WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	27
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3359,14 +3446,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL);
+WHERE select_id = 61 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	27
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3383,14 +3470,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL;
+WHERE select_id = 60 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3400,14 +3487,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL);
+WHERE select_id = 60 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3419,14 +3506,14 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL;
+WHERE select_id = 59 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3439,14 +3526,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL);
+WHERE select_id = 59 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3461,7 +3548,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL;
+WHERE select_id = 58 OR select_id IS NULL order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3473,7 +3560,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL);
+WHERE select_id = 58 OR select_id IS NULL) order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3487,7 +3574,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL;
+WHERE select_id = 57 OR select_id IS NULL order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3499,7 +3586,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as time) AS `CAST(my_time AS TIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL);
+WHERE select_id = 57 OR select_id IS NULL) order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3513,7 +3600,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL;
+WHERE select_id = 56 OR select_id IS NULL order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3525,7 +3612,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as time) AS `CAST(my_timestamp AS TIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL);
+WHERE select_id = 56 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3539,7 +3626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL;
+WHERE select_id = 55 OR select_id IS NULL order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3551,7 +3638,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as time) AS `CAST(my_date AS TIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL);
+WHERE select_id = 55 OR select_id IS NULL) order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3565,7 +3652,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL;
+WHERE select_id = 54 OR select_id IS NULL order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3577,7 +3664,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as time) AS `CAST(my_datetime AS TIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL);
+WHERE select_id = 54 OR select_id IS NULL) order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3587,11 +3674,45 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL) order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL;
+WHERE select_id = 52 OR select_id IS NULL order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3607,7 +3728,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL);
+WHERE select_id = 52 OR select_id IS NULL) order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3625,7 +3746,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL;
+WHERE select_id = 51 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3642,7 +3763,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as time) AS `CAST(my_varbinary_1000 AS TIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL);
+WHERE select_id = 51 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3661,7 +3782,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL;
+WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3680,7 +3801,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as time) AS `CAST(my_binary_30 AS TIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL);
+WHERE select_id = 50 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3701,7 +3822,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL;
+WHERE select_id = 49 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3718,7 +3839,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as time) AS `CAST(my_varchar_1000 AS TIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL);
+WHERE select_id = 49 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3737,7 +3858,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL;
+WHERE select_id = 48 OR select_id IS NULL order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3754,7 +3875,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as time) AS `CAST(my_char_30 AS TIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL);
+WHERE select_id = 48 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3773,7 +3894,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL;
+WHERE select_id = 47 OR select_id IS NULL order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3781,16 +3902,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL);
+WHERE select_id = 47 OR select_id IS NULL) order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3798,10 +3919,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -3809,35 +3930,31 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL;
+WHERE select_id = 46 OR select_id IS NULL order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL);
+WHERE select_id = 46 OR select_id IS NULL) order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 DROP VIEW v1;
 
 
@@ -3845,7 +3962,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL;
+WHERE select_id = 45 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3857,7 +3974,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as datetime) AS `CAST(my_timestamp AS DATETIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL);
+WHERE select_id = 45 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3871,7 +3988,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL;
+WHERE select_id = 44 OR select_id IS NULL order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3883,7 +4000,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as datetime) AS `CAST(my_date AS DATETIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL);
+WHERE select_id = 44 OR select_id IS NULL) order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3897,7 +4014,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL;
+WHERE select_id = 43 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3909,7 +4026,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as datetime) AS `CAST(my_datetime AS DATETIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL);
+WHERE select_id = 43 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3923,7 +4040,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL;
+WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3932,17 +4049,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL);
+WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3951,11 +4068,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -3963,7 +4080,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL;
+WHERE select_id = 41 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3972,17 +4089,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL);
+WHERE select_id = 41 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3991,11 +4108,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4003,7 +4120,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL;
+WHERE select_id = 40 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4012,16 +4129,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as datetime) AS `CAST(my_varbinary_1000 AS DATETIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL);
+WHERE select_id = 40 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4030,10 +4147,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4041,7 +4158,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL;
+WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4050,17 +4167,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as datetime) AS `CAST(my_binary_30 AS DATETIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL);
+WHERE select_id = 39 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4069,10 +4186,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 DROP VIEW v1;
 
@@ -4081,7 +4198,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL;
+WHERE select_id = 38 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4090,16 +4207,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as datetime) AS `CAST(my_varchar_1000 AS DATETIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL);
+WHERE select_id = 38 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4108,10 +4225,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4119,7 +4236,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL;
+WHERE select_id = 37 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4128,16 +4245,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as datetime) AS `CAST(my_char_30 AS DATETIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL);
+WHERE select_id = 37 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4146,10 +4263,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4157,7 +4274,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL;
+WHERE select_id = 36 OR select_id IS NULL order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4165,16 +4282,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL);
+WHERE select_id = 36 OR select_id IS NULL) order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4182,10 +4299,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -4193,7 +4310,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL;
+WHERE select_id = 35 OR select_id IS NULL order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4205,7 +4322,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL);
+WHERE select_id = 35 OR select_id IS NULL) order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4219,7 +4336,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL;
+WHERE select_id = 34 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4231,7 +4348,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as date) AS `CAST(my_timestamp AS DATE)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL);
+WHERE select_id = 34 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4245,7 +4362,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL;
+WHERE select_id = 33 OR select_id IS NULL order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4257,7 +4374,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as date) AS `CAST(my_date AS DATE)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL);
+WHERE select_id = 33 OR select_id IS NULL) order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4271,7 +4388,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL;
+WHERE select_id = 32 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4283,7 +4400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as date) AS `CAST(my_datetime AS DATE)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL);
+WHERE select_id = 32 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4297,7 +4414,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL;
+WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4306,16 +4423,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL);
+WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4324,10 +4441,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4335,7 +4452,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL;
+WHERE select_id = 30 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4344,16 +4461,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL);
+WHERE select_id = 30 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4362,10 +4479,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4373,7 +4490,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL;
+WHERE select_id = 29 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4382,16 +4499,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as date) AS `CAST(my_varbinary_1000 AS DATE)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL);
+WHERE select_id = 29 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4400,10 +4517,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4411,7 +4528,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL;
+WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4420,17 +4537,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as date) AS `CAST(my_binary_30 AS DATE)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL);
+WHERE select_id = 28 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4439,10 +4556,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 DROP VIEW v1;
 
@@ -4451,7 +4568,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL;
+WHERE select_id = 27 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4460,16 +4577,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as date) AS `CAST(my_varchar_1000 AS DATE)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL);
+WHERE select_id = 27 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4478,10 +4595,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4489,7 +4606,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL;
+WHERE select_id = 26 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4498,16 +4615,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as date) AS `CAST(my_char_30 AS DATE)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL);
+WHERE select_id = 26 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4516,10 +4633,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4527,7 +4644,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL;
+WHERE select_id = 25 OR select_id IS NULL order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4539,7 +4656,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset latin1) AS `CAST(my_year AS CHAR)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL);
+WHERE select_id = 25 OR select_id IS NULL) order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4553,7 +4670,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL;
+WHERE select_id = 24 OR select_id IS NULL order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4565,7 +4682,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset latin1) AS `CAST(my_time AS CHAR)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL);
+WHERE select_id = 24 OR select_id IS NULL) order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4579,7 +4696,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL;
+WHERE select_id = 23 OR select_id IS NULL order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4591,7 +4708,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset latin1) AS `CAST(my_timestamp AS CHAR)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL);
+WHERE select_id = 23 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4605,7 +4722,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL;
+WHERE select_id = 22 OR select_id IS NULL order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4617,7 +4734,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset latin1) AS `CAST(my_date AS CHAR)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL);
+WHERE select_id = 22 OR select_id IS NULL) order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4631,7 +4748,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL;
+WHERE select_id = 21 OR select_id IS NULL order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4643,7 +4760,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset latin1) AS `CAST(my_datetime AS CHAR)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL);
+WHERE select_id = 21 OR select_id IS NULL) order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4657,7 +4774,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL;
+WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4669,7 +4786,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset latin1) AS `CAST(my_double AS CHAR)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL);
+WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4683,7 +4800,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL;
+WHERE select_id = 19 OR select_id IS NULL order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4695,7 +4812,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset latin1) AS `CAST(my_decimal AS CHAR)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL);
+WHERE select_id = 19 OR select_id IS NULL) order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4709,7 +4826,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL;
+WHERE select_id = 18 OR select_id IS NULL order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4721,7 +4838,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset latin1) AS `CAST(my_bigint AS CHAR)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL);
+WHERE select_id = 18 OR select_id IS NULL) order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4735,7 +4852,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL;
+WHERE select_id = 17 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4747,7 +4864,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset latin1) AS `CAST(my_varbinary_1000 AS CHAR)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL);
+WHERE select_id = 17 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4761,7 +4878,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL;
+WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4773,7 +4890,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL);
+WHERE select_id = 16 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4787,7 +4904,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL;
+WHERE select_id = 15 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4799,7 +4916,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset latin1) AS `CAST(my_varchar_1000 AS CHAR)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL);
+WHERE select_id = 15 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4813,7 +4930,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL;
+WHERE select_id = 14 OR select_id IS NULL order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4825,7 +4942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset latin1) AS `CAST(my_char_30 AS CHAR)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL);
+WHERE select_id = 14 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4839,7 +4956,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL;
+WHERE select_id = 13 OR select_id IS NULL order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4851,7 +4968,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset binary) AS `CAST(my_year AS BINARY)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL);
+WHERE select_id = 13 OR select_id IS NULL) order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4865,7 +4982,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL;
+WHERE select_id = 12 OR select_id IS NULL order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4877,7 +4994,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset binary) AS `CAST(my_time AS BINARY)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL);
+WHERE select_id = 12 OR select_id IS NULL) order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4891,7 +5008,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL;
+WHERE select_id = 11 OR select_id IS NULL order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4903,7 +5020,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset binary) AS `CAST(my_timestamp AS BINARY)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL);
+WHERE select_id = 11 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4917,7 +5034,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL;
+WHERE select_id = 10 OR select_id IS NULL order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4929,7 +5046,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset binary) AS `CAST(my_date AS BINARY)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL);
+WHERE select_id = 10 OR select_id IS NULL) order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4943,7 +5060,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL;
+WHERE select_id = 9 OR select_id IS NULL order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4955,7 +5072,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset binary) AS `CAST(my_datetime AS BINARY)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL);
+WHERE select_id = 9 OR select_id IS NULL) order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4969,7 +5086,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL;
+WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4981,7 +5098,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset binary) AS `CAST(my_double AS BINARY)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL);
+WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4995,7 +5112,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL;
+WHERE select_id = 7 OR select_id IS NULL order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5007,7 +5124,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset binary) AS `CAST(my_decimal AS BINARY)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL);
+WHERE select_id = 7 OR select_id IS NULL) order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5021,7 +5138,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL;
+WHERE select_id = 6 OR select_id IS NULL order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5033,7 +5150,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset binary) AS `CAST(my_bigint AS BINARY)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL);
+WHERE select_id = 6 OR select_id IS NULL) order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5047,7 +5164,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL;
+WHERE select_id = 5 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5059,7 +5176,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset binary) AS `CAST(my_varbinary_1000 AS BINARY)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL);
+WHERE select_id = 5 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5073,7 +5190,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL;
+WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5085,7 +5202,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL);
+WHERE select_id = 4 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5099,7 +5216,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL;
+WHERE select_id = 3 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5111,7 +5228,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset binary) AS `CAST(my_varchar_1000 AS BINARY)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL);
+WHERE select_id = 3 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5125,7 +5242,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL;
+WHERE select_id = 2 OR select_id IS NULL order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5137,7 +5254,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset binary) AS `CAST(my_char_30 AS BINARY)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL);
+WHERE select_id = 2 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5149,7 +5266,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT sqrt(my_bigint), my_bigint, id FROM t1_values;
 SELECT sqrt(my_bigint), my_bigint, id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL;
+WHERE select_id = 1 OR select_id IS NULL order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -5163,7 +5280,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sqrt(`t1_values`.`my_bigint`) AS `sqrt(my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL);
+WHERE select_id = 1 OR select_id IS NULL) order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc.result b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
index f05c7ef73c4..fbc908b8ccf 100644
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
@@ -3,19 +3,16 @@
 .                         IMPORTANT NOTICE:
 .                         -----------------
 .
-.  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
-.         for correctness!
+.  FIXME: The .result files are still NOT CHECKED for correctness!
 .
 .  FIXME: Several tests are affected by known problems around DECIMAL
-.  FIXME: and NUMERIC that needs to be checked again after WL#2984
+.  FIXME: and NUMERIC that will be checked again after WL#2984 once
 .  FIXME: has been completed. Some of them are marked in the result.
 .
-.  This .result file has been checked OK with Linux 5.0.23-bk,
-.  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
-.
-. This file has been saved although it might contain failures / wrong
-. results to be able to detect _new_ differences in the behaviour.
-. Hopefully the remaining checks can be made soon.
+. Currently (Dec 06, 2005) this .result file is checked OK for Linux
+. with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
+. Using the available Windows version 5.0.16 there are differences
+. that can be ignored (e.g. WL#2984).
 .
 --------------------------------------------------------------------------------
 	FIXME: There are subtests that are switched off due to known bugs:
@@ -99,20 +96,21 @@ USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
+f1	f2	f3	f4	f5	f6
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
 set @v1 = f1;
 SELECT @v1, @v1;
 END//
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
+@v1	@v1
+abc	abc
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 binary ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -121,12 +119,12 @@ SELECT @v1;
 END//
 CALL sp1( 34 );
 @v1
-3
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+34
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 blob ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -139,6 +137,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 int )  language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -151,6 +151,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
@@ -159,19 +161,13 @@ BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(60, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
@@ -179,56 +175,51 @@ SELECT @v1;
 END//
 CALL sp1( 17976931340000 );
 @v1
-17976931340000.000000000000000000000000000000
+17976931340000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 set("value1", "value1") ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 CALL sp1( "value1, value1" );
 f1
-value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+value1, value1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) language sql SELECT f1;
 CALL sp1( 'abc' );
@@ -278,9 +269,7 @@ SHOW PROCEDURE status like 'sp1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 DROP PROCEDURE sp1;
 
 Testcase 4.1.2:
@@ -344,13 +333,11 @@ CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  lang
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SELECT fn1( "value1" );
 fn1( "value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
+Warning	1292	Truncated incorrect DECIMAL value: 'value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -359,14 +346,11 @@ CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) langua
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 SELECT fn1( "value1, value1" );
 fn1( "value1, value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+Warning	1292	Truncated incorrect DECIMAL value: 'value1, value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -457,7 +441,7 @@ CREATE PROCEDURE sp1 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(f1 char(20) )
+sp1		CREATE PROCEDURE `sp1`(f1 char(20) )
 SELECT * from t1 where f2 = f1
 DROP PROCEDURE sp1;
 
@@ -470,7 +454,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50)
 return concat('hello, ', s, '!');
 show CREATE FUNCTION fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50)
+fn1		CREATE FUNCTION `fn1`(s char(20)) RETURNS char(50)
 return concat('hello, ', s, '!')
 DROP FUNCTION fn1;
 
@@ -514,7 +498,7 @@ CREATE PROCEDURE sp7b (a char (20), out b char(20))
 SELECT f1 into b from t1 where t1.f2= a;
 CALL sp7b('xyz', @out_param);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -527,8 +511,8 @@ END//
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -2581,12 +2565,12 @@ alter procedure sp1 sql security definer;
 alter function sp1 sql security definer;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
+sp1		CREATE PROCEDURE `sp1`()
     COMMENT 'this is a procedure'
 set @x= 3
 show CREATE FUNCTION sp1;
 Function	sql_mode	Create Function
-sp1		CREATE DEFINER=`root`@`localhost` FUNCTION `sp1`() RETURNS int(11)
+sp1		CREATE FUNCTION `sp1`() RETURNS int(11)
     COMMENT 'this is a function'
 return 4
 USE db_storedproc;
@@ -4603,9 +4587,6 @@ END begin_label//
 CALL sp1();
 @v1	@v2
 1	2
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.7:
@@ -4640,9 +4621,6 @@ declare y char;
 SELECT f1, f2 into x, y from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.9:
@@ -4725,9 +4703,9 @@ fetch cur1 into e;
 SELECT x, y, z, a, b, c, d, e;
 close cur1;
 END//
-ERROR 42000: Too big scale 255 specified for column ''. Maximum is 30.
 CALL sp6();
-ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
+x	y	z	a	b	c	d	e
+a	1	1.1	value1	1200000000000	mediumtext	2005-02-02 12:12:12	a`
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -4759,7 +4737,7 @@ BEGIN
 declare x char, integer default '0';
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0';
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -4768,7 +4746,7 @@ BEGIN
 declare x1, x2 char, integer default '0', 1;
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0', 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0', 1;
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -6010,11 +5988,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-000	000	000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6023,7 +5997,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-001	001	001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6050,11 +6024,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000	00000	00000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6063,7 +6033,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00001	00001	00001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6090,11 +6060,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000	00000000	00000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6103,7 +6069,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001	00000001	00000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6130,11 +6096,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6143,7 +6105,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000001	0000000001	0000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6161,7 +6123,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-18446744073709551615	18446744073709551615	18446744073709551615
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6170,11 +6132,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000000	00000000000000000000	00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6183,7 +6141,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000001	00000000000000000001	00000000000000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6192,11 +6150,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--9999999999	-9999999999	-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6207,11 +6161,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6220,11 +6170,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6235,11 +6181,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6250,11 +6192,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6265,11 +6203,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6280,11 +6214,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6295,11 +6225,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6326,7 +6252,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6335,7 +6261,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6344,7 +6270,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6353,7 +6279,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6362,7 +6288,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6371,7 +6297,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6407,7 +6333,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-2005-02-02 12:20:12	2005-02-02 12:20:12	2005-02-02 12:20:12
+20050202122012	20050202122012	20050202122012
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -12458,13 +12384,10 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	a	3
-Warnings:
-Warning	1265	Data truncated for column 'y' at row 3
-Warning	1265	Data truncated for column 'y' at row 1
+NULL	abaa	3
 SELECT @v1, @v2;
 @v1	@v2
-4	a
+4	a`
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12531,7 +12454,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12558,11 +12481,9 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-t
+temp
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12580,7 +12501,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
+Warning	1292	Truncated incorrect DOUBLE value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12606,9 +12527,7 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-0000-00-00 00:00:00
-Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+asd
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12652,7 +12571,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12683,8 +12602,6 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12748,8 +12665,6 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12757,8 +12672,6 @@ declare x tinyint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12766,8 +12679,6 @@ declare x tinyint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12775,8 +12686,6 @@ declare x tinyint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12784,8 +12693,6 @@ declare x tinyint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12793,8 +12700,6 @@ declare x smallint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12802,8 +12707,6 @@ declare x smallint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12811,8 +12714,6 @@ declare x smallint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12820,8 +12721,6 @@ declare x smallint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12829,8 +12728,6 @@ declare x mediumint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12838,8 +12735,6 @@ declare x mediumint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12847,8 +12742,6 @@ declare x mediumint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12856,8 +12749,6 @@ declare x mediumint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12865,8 +12756,6 @@ declare x int;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12874,8 +12763,6 @@ declare x int unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12883,8 +12770,6 @@ declare x int zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12892,8 +12777,6 @@ declare x int unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12901,8 +12784,6 @@ declare x bigint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12910,8 +12791,6 @@ declare x bigint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12919,8 +12798,6 @@ declare x bigint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12928,8 +12805,6 @@ declare x bigint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12938,7 +12813,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12947,7 +12822,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12956,7 +12831,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12965,7 +12840,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12974,7 +12849,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12983,7 +12858,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12992,7 +12867,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13001,7 +12876,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13009,8 +12884,6 @@ declare x real;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13018,8 +12891,6 @@ declare x real unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13027,8 +12898,6 @@ declare x real zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13036,8 +12905,6 @@ declare x real unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13045,8 +12912,6 @@ declare x float;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13054,8 +12919,6 @@ declare x float unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13063,8 +12926,6 @@ declare x float zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13072,8 +12933,6 @@ declare x float unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13081,8 +12940,6 @@ declare x date;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13090,8 +12947,6 @@ declare x time;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13099,8 +12954,6 @@ declare x datetime;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13108,8 +12961,6 @@ declare x timestamp;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13117,8 +12968,6 @@ declare x year;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13126,8 +12975,6 @@ declare x year(3);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13135,8 +12982,6 @@ declare x year(4);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13144,8 +12989,6 @@ declare x enum("1enum", "2enum");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13153,8 +12996,6 @@ declare x set("1set", "2set");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.38:
@@ -13802,7 +13643,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13828,7 +13669,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -15085,7 +14926,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
--46744073709551616
+0
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -15104,8 +14945,6 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -15133,10 +14972,6 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -15145,9 +14980,7 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -15156,10 +14989,7 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15178,10 +15008,6 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15190,9 +15016,7 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15201,10 +15025,7 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15240,10 +15061,7 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15279,10 +15097,7 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000000000000000000000000000000000000000000000000000000001
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15291,10 +15106,7 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15303,10 +15115,7 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000001
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15315,10 +15124,7 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15336,9 +15142,7 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15347,9 +15151,7 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15358,9 +15160,7 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15378,9 +15178,7 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15389,9 +15187,7 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15400,9 +15196,7 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15420,9 +15214,7 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15431,9 +15223,7 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15442,9 +15232,7 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15462,9 +15250,7 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15473,9 +15259,7 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15484,9 +15268,7 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15504,9 +15286,7 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15515,9 +15295,7 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15526,9 +15304,7 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15546,9 +15322,7 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15557,9 +15331,7 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15568,9 +15340,7 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15579,10 +15349,7 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2147483648
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15618,9 +15385,7 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15647,11 +15412,7 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15660,9 +15421,7 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15671,9 +15430,7 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15683,9 +15440,6 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15694,9 +15448,7 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15705,10 +15457,7 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15717,9 +15466,7 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15729,9 +15476,6 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15740,9 +15484,7 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15751,10 +15493,7 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15763,12 +15502,7 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999999999999999999999999999.999999999999999999999999999999
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15778,10 +15512,6 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15791,10 +15521,6 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15803,10 +15529,7 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15854,9 +15577,7 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15865,9 +15586,7 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15876,10 +15595,7 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15897,9 +15613,7 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15908,9 +15622,7 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15919,9 +15631,7 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15957,11 +15667,7 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15997,11 +15703,7 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
@@ -16057,7 +15759,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-25:59:59
+26:00:00
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -16066,7 +15768,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:00
+1998-01-02 01:01:01
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -16076,8 +15778,6 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -16087,8 +15787,6 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
 CREATE FUNCTION fn96( f1 char binary) returns char binary
 BEGIN
@@ -16098,8 +15796,6 @@ END//
 SELECT fn96( 'h');
 fn96( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -16221,7 +15917,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
-18400000000000000000
+-9223372036854775808
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -16230,7 +15926,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-00184000000000000000
+184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -16239,9 +15935,7 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
-00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-9220000000000000
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
@@ -16253,7 +15947,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
@@ -16265,7 +15959,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -16274,11 +15968,7 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -16287,9 +15977,7 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
@@ -16301,10 +15989,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
@@ -16316,7 +16001,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
@@ -16328,11 +16013,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
@@ -16344,9 +16025,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
@@ -16358,10 +16037,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
@@ -16373,7 +16049,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000000000000000000000000
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
@@ -16385,7 +16061,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
@@ -16397,7 +16073,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-000000000000000010000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
@@ -16409,10 +16085,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
@@ -16421,7 +16094,7 @@ SELECT f1;
 END//
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000
+-1000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
@@ -16430,10 +16103,10 @@ SELECT f1;
 END//
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000
+100000000000000000000.000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
@@ -16445,10 +16118,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp20_duz( 100000000000000000000 );
 f1
-0000000000000000000000000000000000000000000100000000000000000000
+100000000000000000000.000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-0000000000000000000000000000000000000001000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
@@ -16460,10 +16133,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
@@ -16475,10 +16145,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
@@ -16490,10 +16157,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
@@ -16505,10 +16169,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16526,9 +16187,7 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16537,9 +16196,7 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16548,9 +16205,7 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16568,9 +16223,7 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16579,9 +16232,7 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16590,9 +16241,7 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16610,9 +16259,7 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16621,9 +16268,7 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16632,9 +16277,7 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16652,9 +16295,7 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16663,9 +16304,7 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16674,9 +16313,7 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16694,9 +16331,7 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16705,9 +16340,7 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16716,9 +16349,7 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16736,9 +16367,7 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16747,9 +16376,7 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16758,9 +16385,7 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16769,10 +16394,7 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2150000000
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16799,7 +16421,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-0215000000
+215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16808,9 +16430,7 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16837,11 +16457,7 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388602
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16850,9 +16466,7 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16861,9 +16475,7 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16872,10 +16484,7 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16884,9 +16493,7 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16895,10 +16502,7 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16907,9 +16511,7 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16918,10 +16520,7 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16930,9 +16529,7 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16941,10 +16538,7 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
@@ -16953,12 +16547,7 @@ SELECT f1;
 END//
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
@@ -16967,11 +16556,7 @@ SELECT f1;
 END//
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
@@ -16980,11 +16565,7 @@ SELECT f1;
 END//
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
@@ -16993,10 +16574,7 @@ SELECT f1;
 END//
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
@@ -17005,7 +16583,7 @@ SELECT f1;
 END//
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000
+-10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
@@ -17014,7 +16592,7 @@ SELECT f1;
 END//
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
@@ -17023,7 +16601,7 @@ SELECT f1;
 END//
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
@@ -17032,7 +16610,7 @@ SELECT f1;
 END//
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -17041,9 +16619,7 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -17052,9 +16628,7 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -17063,10 +16637,7 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -17075,7 +16646,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.1
+1.10000
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -17084,9 +16655,7 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -17095,9 +16664,7 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -17106,9 +16673,7 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -17144,11 +16709,7 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-32602
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -17184,11 +16745,7 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-102
 DROP PROCEDURE IF EXISTS sp89;
 DROP PROCEDURE IF EXISTS sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -17208,7 +16765,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-25:59:59
+26:00:00.999997
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -17217,7 +16774,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:00
+1998-01-02 01:01:01.000001
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -17226,9 +16783,7 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -17237,9 +16792,7 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -17248,9 +16801,7 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -17295,7 +16846,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-2061
+61
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -17350,8 +16901,6 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -17388,9 +16937,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
+61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2033	2084	2033	2084
+61	71	61	71	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17461,9 +17010,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
+ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17606,7 +17155,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-18400000000000000000	NULL
+9223372036854775807	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17614,7 +17163,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-18400000000000000000	18400000000000000000	NULL
+9223372036854775807	9223372036854775807	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17622,7 +17171,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
-18353255926290448384	18353255926290448384	18353255926290448384
+-2	-2	-2
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17630,7 +17179,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
-18353255926290448384	18353255926290448384
+-2	-2
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17688,9 +17237,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17742,9 +17291,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17788,9 +17337,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17823,9 +17372,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17858,9 +17407,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17893,9 +17442,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17928,9 +17477,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17996,9 +17545,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -18030,9 +17579,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -18064,9 +17613,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -18098,9 +17647,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -18132,9 +17681,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -18166,9 +17715,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -18234,9 +17783,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -18268,9 +17817,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -18302,9 +17851,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -18370,9 +17919,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -18404,9 +17953,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -18438,9 +17987,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18472,9 +18021,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18540,9 +18089,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18574,9 +18123,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18642,9 +18191,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18676,9 +18225,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18744,9 +18293,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18778,9 +18327,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18812,9 +18361,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18846,9 +18395,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18880,9 +18429,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18914,9 +18463,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18948,9 +18497,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18982,9 +18531,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -19016,9 +18565,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -19050,9 +18599,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -19084,9 +18633,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -19118,9 +18667,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -19152,9 +18701,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -19186,9 +18735,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -19220,9 +18769,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -19254,9 +18803,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -19288,9 +18837,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -19322,9 +18871,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -19356,9 +18905,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
+61	61	71	61	61	71	61	61	71	61	61	71
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2061	2071	2061	2071
+61	71	61	71	61	71	61	71
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19492,9 +19041,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	a	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	a	a	a
+ah	aah	ah	aah	ah	aah	ah	aah
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19526,9 +19075,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	NULL	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	NULL	a	a
+ah	aah	ah	aah	ah	NULL	ah	aah
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19628,9 +19177,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
+1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
+1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19662,9 +19211,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19696,9 +19245,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19730,9 +19279,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19764,9 +19313,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19798,9 +19347,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19832,9 +19381,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19866,9 +19415,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19900,9 +19449,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19934,9 +19483,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19968,9 +19517,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -20002,9 +19551,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -20036,9 +19585,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -20070,9 +19619,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -20104,9 +19653,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -20138,9 +19687,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -20172,9 +19721,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -20274,9 +19823,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -20308,9 +19857,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -20376,9 +19925,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -20410,9 +19959,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -20444,9 +19993,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20478,9 +20027,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20512,9 +20061,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20546,9 +20095,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20580,9 +20129,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20614,9 +20163,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20682,9 +20231,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20716,9 +20265,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20750,9 +20299,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20818,9 +20367,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20886,9 +20435,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20914,7 +20463,7 @@ insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
 Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
+sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
@@ -20950,7 +20499,7 @@ SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
 Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
+sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
@@ -20993,7 +20542,7 @@ show warnings;
 END//
 show CREATE PROCEDURE sp4;
 Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -21041,14 +20590,14 @@ set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
 Procedure	sql_mode	Create Procedure
-sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
 END
 show CREATE PROCEDURE sp6b;
 Procedure	sql_mode	Create Procedure
-sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
@@ -21056,7 +20605,7 @@ set @y=@x;
 END
 show CREATE PROCEDURE sp6c;
 Procedure	sql_mode	Create Procedure
-sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
@@ -21242,7 +20791,7 @@ END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
+fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
@@ -21274,7 +20823,7 @@ END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
 Procedure	sql_mode	Create Procedure
-sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
+sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
index 5560fb1fd73..60ea7393c73 100755
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
@@ -166,7 +166,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 limit 1;
+SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -209,7 +209,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 limit 1;
+SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -544,6 +544,9 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
+Warnings:
+Note	1051	Unknown table 'tqq'
+Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()
@@ -1084,7 +1087,8 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
+where f4 >=-5000 order by f4 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1167,7 +1171,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2;
+SELECT f1, f2, f4, f5 from t2 order by f4;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1187,21 +1191,21 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
 open cur1;
 open cur2;
 BEGIN
-declare continue handler for sqlstate '02000' set count = 1;
+declare continue handler for sqlstate '02000' set count=1;
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-1-', count, newf1, newf2, newf4, newf5;
 insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-set count = 4;
+set count= 4;
 BEGIN
-while count > 0 do
+while count> 0 do
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-2-', count, newf1, newf2, newf4, newf5;
-set count = count - 1;
+set count = count- 1;
 END while;
 SELECT '-3-', count, newf1, newf2, newf4, newf4;
 END;
@@ -1270,8 +1274,10 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1302,8 +1308,10 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
index ec2b4850d30..5bb5b3cbbc2 100755
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
@@ -80,7 +80,7 @@ connect(localhost,user_1,,db_storedproc,MYSQL_PORT,MYSQL_SOCK);
 user_1@localhost	db_storedproc
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-SELECT * FROM db_storedproc.t1 LIMIT 1;
+SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
 END//
 CREATE FUNCTION fn31105(n INT) RETURNS INT
 BEGIN
@@ -209,7 +209,7 @@ CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -226,7 +226,7 @@ CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -246,7 +246,7 @@ CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -279,7 +279,7 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
index a2bb203b294..02a82db0901 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
@@ -199,6 +199,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
+BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 insert into t1 (f2) values ('insert 3.5.1.7');
 select * from t1;
 f1	f2	f3
@@ -207,12 +210,14 @@ update t1 set f2='update 3.5.1.7';
 select * from t1;
 f1	f2	f3
 NULL	update 3.5.1.7	42
-select trigger_name from information_schema.triggers;
+select trigger_name from information_schema.triggers order by trigger_name;
 trigger_name
 trg5_1
 trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
 drop trigger trg5_1;
 drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 drop table t1;
 
 Testcase 3.5.1.8:
@@ -314,7 +319,7 @@ insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 select @test_var1, @test_var2, @test_var3;
 @test_var1	@test_var2	@test_var3
 trig1	trig2	trig3
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -324,7 +329,7 @@ trig2	3
 select * from trig_db3.t1;
 f1	f2
 trig3	4
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -349,10 +354,10 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1 
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-trig_db1	trig1_b	t1
 trig_db1	trig1_a	t1
+trig_db1	trig1_b	t1
 trig_db2	trig2	t1
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03.result b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
index 18300c6fc6b..c72a792a3a5 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
@@ -82,16 +82,16 @@ Testcase 3.5.3.2/6:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 grant ALL  on *.* to test_noprivs@localhost;
-revoke SUPER  on *.* from test_noprivs@localhost;
+revoke TRIGGER on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -104,10 +104,10 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 select current_user;
@@ -122,15 +122,12 @@ root@localhost
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
 ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1'
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-
-note: once 15166 is fixed a similar case for SELECT needs to be added
----------------------------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -139,10 +136,10 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -151,12 +148,12 @@ use priv_db;
 drop trigger trg1_2;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 drop trigger trg1_2;
 
 Testcase 3.5.3.7a:
@@ -166,12 +163,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke UPDATE  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
+grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -180,24 +177,24 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-select f1 from t1;
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
 use priv_db;
 select current_user;
@@ -205,236 +202,220 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 drop trigger trg4a_2;
 
 Testcase 3.5.3.7b:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs;
+grant TRIGGER on *.* to test_noprivs;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
 insert 3.5.3.7-1b
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2b';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
 insert 3.5.3.7-2b
-update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-select f1 from t1;
-f1
-insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
+update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
+select f1 from t1 order by f1;
+f1
+insert 3.5.3.2-no
+insert 3.5.3.6-no
+insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
 trig 3.5.3.7-2b
+update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
 -----------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
+update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2c';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
 trig 3.5.3.7-2c
+update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
-trig 3.5.3.7-2c
 insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
+trig 3.5.3.7-2c
+update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2d';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
-trig 3.5.3.7-2c
 insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
+trig 3.5.3.7-2c
 trig 3.5.3.7-2d
+update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -444,12 +425,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke SELECT  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, SELECT on *.* to test_yesprivs@localhost;
+grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -458,7 +439,7 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 
 Trigger create disabled - should fail - Bug 8887
 ------------------------------------------------
@@ -477,17 +458,13 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-2a
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2a');
 select @test_var;
 @test_var
@@ -497,26 +474,26 @@ drop trigger trg5a_2;
 Testcase: 3.5.3.8b
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke SELECT  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -533,7 +510,7 @@ before trig 3.5.3.8-1b
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -543,10 +520,6 @@ insert into t1 (f1) values ('insert 3.5.3.8-2b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-2b
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.* to test_yesprivs@localhost;
 update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 select @test_var;
 @test_var
@@ -556,26 +529,26 @@ drop trigger trg5b_2;
 Testcase 3.5.3.8c:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -588,16 +561,12 @@ before trig 3.5.3.8-1c
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2c';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2c');
 select @test_var;
 @test_var
@@ -607,24 +576,24 @@ drop trigger trg5c_2;
 Testcase: 3.5.3.8d:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
@@ -638,16 +607,12 @@ before trig 3.5.3.8-1d
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2d';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2d');
 select @test_var;
 @test_var
@@ -662,12 +627,12 @@ drop table if exists t2;
 create table t1 (f1 int) engine= innodb;
 create table t2 (f2 int) engine= innodb;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t2` TO 'test_yesprivs'@'localhost'
 GRANT SELECT, UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -683,10 +648,10 @@ ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 4
-select f2 from t2;
+select f2 from t2 order by f2;
 f2
 4
 use priv_db;
@@ -699,11 +664,11 @@ ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
 2
-select f2 from t2;
+4
+select f2 from t2 order by f2;
 f2
 1
 use priv_db;
@@ -716,12 +681,12 @@ ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 1
 select @aaa;
@@ -737,13 +702,13 @@ ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
+1
+1
 2
-1
-1
-select f2 from t2;
+4
+select f2 from t2 order by f2;
 f2
 drop database if exists priv_db;
 drop user test_yesprivs@localhost;
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
index ce7c51ec630..8a7ee3dc55d 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
@@ -93,18 +93,18 @@ Create trigger trg1 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.1';
 Use db_drop;
 Insert into t1 values ('Insert error 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
 Insert into t1 values ('Insert no trigger 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
-Trigger 3.5.4.1
 Insert no trigger 3.5.4.1
+Trigger 3.5.4.1
 drop trigger trg1;
 drop database if exists db_drop;
 revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -258,7 +258,7 @@ use dbtest_one;
 Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Select * from dbtest_two.t2;
+Select * from dbtest_two.t2 order by f1;
 f1
 1st Insert 3.5.
 2nd Insert 3.5.
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_08.result b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
index 0f2d54f01ba..44d53923241 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
@@ -139,10 +139,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -150,7 +150,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -162,14 +162,22 @@ select @test_var;
 3.5.8.4 - single SQL - insert
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
+BEGIN
 insert into db_test.t1_i 
 values (new.f120, new.f136, new.f144, new.f163);
+END//
+Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
+f120	f122	f136	f144	f163
+1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
+select * from db_test.t1_i order by i120;
+i120	i136	i144	i163
+1	00222	0000023456	1.050000000000000000000000000000
 update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 I	Test 3.5.8.4-Single Insert	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
 I	00222	0000023456	1.050000000000000000000000000000
@@ -186,14 +194,14 @@ update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 U	Test 3.5.8.4-Single Update	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 
 3.5.8.3/4 - single SQL - delete
 -------------------------------
@@ -206,7 +214,7 @@ f122='Test 3.5.8.4-Single Delete'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 D	Test 3.5.8.4-Single Delete	00444	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -253,29 +261,29 @@ END//
 set @test_var='Empty', @test_var2=0;
 Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	one	2nd else
 Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	two	2nd else
 D	Test 3.5.8.5-if	00102	two	2nd else
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd if
 D	Test 3.5.8.5-if	00101	three	2nd if
 D	Test 3.5.8.5-if	00102	three	2nd if
-d	Test 3.5.8.5-if	00010	three	2nd if
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00101	three	2nd else
 D	Test 3.5.8.5-if	00102	three	2nd else
-d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00103	three	2nd else
 create trigger trg3 before update on tb3 for each row
 BEGIN
@@ -335,20 +343,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -358,34 +366,34 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
 B	Test 3.5.8.5-case	00191	0000000016	1*0000099999
 C	Test 3.5.8.5-case	00200	0000000001	1*0000099999
-1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 Insert into tb3 (f120, f122, f136, f144) 
 values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 create trigger trg3a before update on tb3 for each row
 BEGIN
 CASE
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_09.result b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
index 54b191e401e..6ea93683847 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
@@ -120,7 +120,7 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
 Insert into tb3 (f122, f136, f163) 
 values ('Test 3.5.9.3', 7, 123.17);
 Update tb3 Set f136=8 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -136,7 +136,7 @@ a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 @tr_var_b4_136, @tr_var_b4_163;
@@ -176,7 +176,7 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
 Insert into tb3 (f122, f136, f151, f163) 
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%';
+where f122 like 'Test 3.5.9.4%' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -194,9 +194,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig';
+where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
index 182747e3153..6c9c1fb98c0 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
@@ -87,7 +87,7 @@ Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1);
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%';
+from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -101,7 +101,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -115,7 +115,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -146,7 +146,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
-Select * from tb_load limit 10;
+Select * from tb_load order by f1 limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -241,7 +241,7 @@ insert into t3 (f1) values (new.f1+1000);
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3;
+select * from t3 order by f1;
 f1
 12
 102
@@ -276,14 +276,14 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1;
+select * from t1 order by f1;
 f1
 0
-select * from t2;
+select * from t2 order by f2;
 f2
-select * from t3;
+select * from t3 order by f3;
 f3
-select * from t4;
+select * from t4 order by f4;
 f4
 drop trigger tr1;
 drop trigger tr2;
@@ -369,7 +369,7 @@ create table t4 (f4 tinyint) engine = innodb;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL
+  `f1` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 insert into t1 values (1);
 create trigger tr1 after insert on t1
@@ -381,14 +381,14 @@ for each row insert into t4 (f4) values (new.f3+1000);
 set autocommit=0;
 start transaction;
 insert into t1 values (1);
-ERROR 22003: Out of range value adjusted for column 'f4' at row 1
+ERROR 22003: Out of range value for column 'f4' at row 1
 commit;
-select * from t1;
+select * from t1 order by f1;
 f1
 1
-select * from t2;
+select * from t2 order by f2;
 f2
-select * from t3;
+select * from t3 order by f3;
 f3
 drop trigger tr1;
 drop trigger tr2;
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result b/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
index 56dd5d6740e..b8d2b768cb1 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
@@ -116,7 +116,7 @@ insert into t1 values (3,'Department C');
 insert into t2 values (1,2,'Emp 1');
 insert into t2 values (2,3,'Emp 2');
 insert into t2 values (3,4,'Emp 3');
-ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f_id`) REFERENCES `t1` (`id`) ON UPDATE CASCADE)
+ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f_id`) REFERENCES `t1` (`id`) ON UPDATE CASCADE)
 create trigger tr_t2 before insert on t2 for each row
 insert into t1 values(new.f_id, concat('New Department ', new.f_id));
 lock tables t1 write, t2 write;
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
index 63d1c8a3131..be0f36f49be 100644
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -1926,7 +1926,7 @@ f1	f2
 2	two
 4	four
 INSERT INTO v1 VALUES(2,'two');
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 INSERT INTO v1 VALUES(3,'three');
 affected rows: 1
 INSERT INTO v1 VALUES(6,'six');
@@ -1945,7 +1945,7 @@ f1	f2
 3	three
 4	four
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
@@ -1992,12 +1992,12 @@ DROP VIEW  IF EXISTS test.v1;
 CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
 ENGINE = innodb;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 A	1
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	1
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -2005,7 +2005,7 @@ affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 INSERT INTO v1 VALUES('B',2);
 affected rows: 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -2013,7 +2013,7 @@ UPDATE v1 SET f2 = 4;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 INSERT INTO v1 VALUES('B',3);
 ERROR HY000: CHECK OPTION failed 'test.v1'
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -10580,7 +10580,7 @@ f1	f2	f3	f4
 DELETE FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10649,7 +10649,7 @@ DROP VIEW v1;
 CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10984,11 +10984,11 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(5)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11008,12 +11008,12 @@ f4x	char(5)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4x	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(10);
@@ -11031,14 +11031,14 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(10)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
 2	NULL	<-- 10 -->	t1 2
 2	NULL	<-- 10 -->	v1 2
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11067,7 +11067,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(8)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11076,7 +11076,7 @@ f1	f2	f4	report
 2	NULL	<-- 10 -	v1 2
 3	NULL	<-- 10 -	t1 3
 3	NULL	<-- 10 -	v1 3
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11100,7 +11100,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11111,7 +11111,7 @@ f1	f2	f4	report
 3	NULL	<-- 10 -	v1 3
 4	NULL	<------ 20 -------->	t1 4
 4	NULL	<------ 20 -------->	v1 4
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11139,7 +11139,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11152,7 +11152,7 @@ f1	f2	f4	report
 4	NULL	<------ 20 -------->	v1 4
 <------------- 30 ----------->	NULL	<------ 20 -------->	t1 5
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11176,7 +11176,7 @@ f4	varchar(20)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report
 -1	ABC	t1 0
 -1	ABC	v1 0
@@ -11190,7 +11190,7 @@ f1	f4	report
 <------------- 30 ----------->	<------ 20 -------->	t1 5
 <------------- 30 ----------->	<------ 20 -------->	v1 5
 ABC	<------ 20 -------->	t1 6
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
 INSERT INTO t1 SET f1 = 'ABC', f2 = '1500-12-04',
@@ -11209,7 +11209,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11225,7 +11225,7 @@ f1	f4	report	f2
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	1500-12-04
 ABC	<------ 20 -------->	v1 7	1500-12-04
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11259,7 +11259,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11274,10 +11274,10 @@ f1	f4	report	f2
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	NULL
-ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033
+ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	v1 8	-0.00033
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11292,8 +11292,8 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
+ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	v1 8
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
 INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
@@ -11316,7 +11316,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2	f3
 -1	ABC	t1 0	NULL	NULL
 -1	ABC	v1 0	NULL	NULL
@@ -11331,12 +11331,12 @@ f1	f4	report	f2	f3
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL	NULL
 ABC	<------ 20 -------->	t1 6	NULL	NULL
 ABC	<------ 20 -------->	t1 7	NULL	NULL
-ABC	<------ 20 -------->	v1 7	NULL	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033	NULL
-ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
+ABC	<------ 20 -------->	v1 7	NULL	NULL
+ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	v1 9a	-0.00033	NULL
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11351,10 +11351,10 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
-ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	t1 9
+ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	v1 9a
 DROP TABLE t1;
 DROP VIEW  v1;
@@ -11369,10 +11369,10 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	1.7320508075689
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
@@ -11385,21 +11385,21 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
 ABC	DEF
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.7320508075689
 ABC	0
+ABC	1.7320508075689
 SELECT SQRT('DEF');
 SQRT('DEF')
 0
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2;
+SELECT * FROM v2 order by 1;
 SQRT('DEF')
 0
 Warnings:
@@ -11409,27 +11409,27 @@ DESCRIBE v2;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM v2;
+SELECT * FROM v2 order by 2;
 f1	my_sqrt
+ABC	0
 ABC	1.7320508075689
-ABC	0
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/memory__datadict.result b/mysql-test/suite/funcs_1/r/memory__datadict.result
index 1dea8a5f4a9..0ef00f0e553 100644
--- a/mysql-test/suite/funcs_1/r/memory__datadict.result
+++ b/mysql-test/suite/funcs_1/r/memory__datadict.result
@@ -433,10 +433,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -459,7 +470,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -480,7 +491,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -501,7 +512,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -522,7 +533,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -543,7 +554,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -561,10 +572,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -585,7 +785,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -606,7 +806,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -627,7 +827,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -645,10 +845,52 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -669,7 +911,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -690,7 +932,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -711,7 +953,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -732,7 +974,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -753,7 +995,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -774,7 +1016,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -899,6 +1141,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -920,6 +1183,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1025,6 +1309,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1067,6 +1393,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1532,6 +1900,8 @@ t.table_type, t.engine
 from schemata s inner join tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
@@ -1564,6 +1934,10 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -1576,6 +1950,17 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1583,6 +1968,8 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
@@ -1615,6 +2002,10 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -1627,6 +2018,17 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -1634,6 +2036,8 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
@@ -1666,6 +2070,10 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -1678,6 +2086,17 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -1685,6 +2104,8 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
@@ -1717,6 +2138,10 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -1729,6 +2154,17 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -1736,6 +2172,8 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
@@ -1768,6 +2206,10 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -1780,6 +2222,17 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -1787,6 +2240,8 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
@@ -1819,6 +2274,10 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -1831,6 +2290,17 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -1856,14 +2326,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -1878,6 +2348,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1890,6 +2429,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1920,6 +2513,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1940,20 +2537,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -2004,20 +2601,20 @@ NULL	db_datadict	v1	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_genera
 NULL	db_datadict	v1	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references	
-NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select,insert,update,references	
 NULL	db_datadict	vu	u	1		NO	varchar	81	243	NULL	NULL	utf8	utf8_general_ci	varchar(81)			select,insert,update,references	
@@ -2051,10 +2648,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
+NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
+NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
+NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
+NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
+NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
+NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
+NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -2088,6 +2711,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
+NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -2112,13 +2745,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
+NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -2163,14 +2816,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -2522,7 +3177,7 @@ cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
 eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
 select sum(id) from collations;
 sum(id)
-10741
+10840
 select collation_name, character_set_name into @x,@y
 from collation_character_set_applicability limit 1;
 select @x, @y;
@@ -2547,6 +3202,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -2558,6 +3215,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	1	NULL	NULL		BTREE	
@@ -2567,6 +3226,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -2597,6 +3257,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -2612,6 +3273,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -2622,6 +3284,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -2637,6 +3300,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -2647,6 +3311,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -2662,6 +3327,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -2679,6 +3345,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -2693,6 +3361,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 select * from table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 select * from column_privileges;
@@ -2701,6 +3371,7 @@ select * from table_constraints;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
@@ -2710,8 +3381,11 @@ NULL	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 NULL	mysql	name	mysql	help_topic	UNIQUE
 NULL	mysql	PRIMARY	mysql	host	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	ndb_binlog_index	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	proc	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	servers	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone_leap_second	PRIMARY KEY
@@ -2729,6 +3403,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_category	name	1	NULL	NULL	NULL	NULL
@@ -2740,6 +3416,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_topic	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -2748,6 +3426,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -2763,7 +3442,7 @@ NULL	mysql	PRIMARY	NULL	mysql	user	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	user	User	2	NULL	NULL	NULL	NULL
 select count(*) as max_recs from key_column_usage;
 max_recs
-40
+45
 select max(cardinality) from statistics;
 max(cardinality)
 393
@@ -2784,10 +3463,21 @@ Table or view 'COLLATIONS' is associated with the database 'information_schema'.
 Table or view 'COLLATION_CHARACTER_SET_APPLICABILITY' is associated with the database 'information_schema'.
 Table or view 'COLUMNS' is associated with the database 'information_schema'.
 Table or view 'COLUMN_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'ENGINES' is associated with the database 'information_schema'.
+Table or view 'EVENTS' is associated with the database 'information_schema'.
+Table or view 'FILES' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_STATUS' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_schema'.
+Table or view 'PARTITIONS' is associated with the database 'information_schema'.
+Table or view 'PLUGINS' is associated with the database 'information_schema'.
+Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
 Table or view 'SCHEMA_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'SESSION_STATUS' is associated with the database 'information_schema'.
+Table or view 'SESSION_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'STATISTICS' is associated with the database 'information_schema'.
 Table or view 'TABLES' is associated with the database 'information_schema'.
 Table or view 'TABLE_CONSTRAINTS' is associated with the database 'information_schema'.
@@ -2800,14 +3490,20 @@ Table or view 'vu' is associated with the database 'db_datadict'.
 Table or view 'vu1' is associated with the database 'db_datadict'.
 Table or view 'columns_priv' is associated with the database 'mysql'.
 Table or view 'db' is associated with the database 'mysql'.
+Table or view 'event' is associated with the database 'mysql'.
 Table or view 'func' is associated with the database 'mysql'.
+Table or view 'general_log' is associated with the database 'mysql'.
 Table or view 'help_category' is associated with the database 'mysql'.
 Table or view 'help_keyword' is associated with the database 'mysql'.
 Table or view 'help_relation' is associated with the database 'mysql'.
 Table or view 'help_topic' is associated with the database 'mysql'.
 Table or view 'host' is associated with the database 'mysql'.
+Table or view 'ndb_binlog_index' is associated with the database 'mysql'.
+Table or view 'plugin' is associated with the database 'mysql'.
 Table or view 'proc' is associated with the database 'mysql'.
 Table or view 'procs_priv' is associated with the database 'mysql'.
+Table or view 'servers' is associated with the database 'mysql'.
+Table or view 'slow_log' is associated with the database 'mysql'.
 Table or view 'tables_priv' is associated with the database 'mysql'.
 Table or view 'time_zone' is associated with the database 'mysql'.
 Table or view 'time_zone_leap_second' is associated with the database 'mysql'.
@@ -2854,12 +3550,12 @@ select * from table_constraints limit 0,5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select count(*) as max_recs from key_column_usage limit 0,5;
 max_recs
-40
+45
 select information_schema.tables.table_name as "table name",
 count(distinct(column_name)) as "no of columns in the table"
   from information_schema.tables left outer join information_schema.columns on
@@ -2872,19 +3568,36 @@ COLLATION_CHARACTER_SET_APPLICABILITY	2
 COLUMNS	19
 columns_priv	7
 COLUMN_PRIVILEGES	7
-db	20
+db	22
+ENGINES	6
+event	18
+EVENTS	21
+FILES	38
 func	4
+general_log	6
+GLOBAL_STATUS	2
+GLOBAL_VARIABLES	2
 help_category	4
 help_keyword	2
 help_relation	2
 help_topic	6
-host	19
+host	20
 KEY_COLUMN_USAGE	12
+ndb_binlog_index	7
+PARTITIONS	25
+plugin	2
+PLUGINS	10
 proc	16
+PROCESSLIST	8
 procs_priv	8
+REFERENTIAL_CONSTRAINTS	11
 ROUTINES	20
 SCHEMATA	5
 SCHEMA_PRIVILEGES	5
+servers	9
+SESSION_STATUS	2
+SESSION_VARIABLES	2
+slow_log	11
 STATISTICS	15
 t1	6
 t10	6
@@ -2910,7 +3623,7 @@ time_zone_name	2
 time_zone_transition	3
 time_zone_transition_type	5
 TRIGGERS	19
-user	37
+user	39
 USER_PRIVILEGES	4
 v1	21
 VIEWS	8
@@ -2924,7 +3637,7 @@ CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_P
 NULL	information_schema	utf8	utf8_general_ci	NULL
 SELECT * FROM tables                                LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
 SELECT * FROM columns                               LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2969,7 +3682,7 @@ TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATA
 SELECT * FROM parameters LIMIT 1;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT * FROM referential_constraints LIMIT 1;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	UNIQUE_CONSTRAINT_CATALOG	UNIQUE_CONSTRAINT_SCHEMA	UNIQUE_CONSTRAINT_NAME	MATCH_OPTION	UPDATE_RULE	DELETE_RULE	TABLE_NAME	REFERENCED_TABLE_NAME
 use db_datadict;
 select * from schemata;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
@@ -3059,7 +3772,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3080,7 +3793,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3101,7 +3814,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3122,7 +3835,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3143,7 +3856,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3161,10 +3874,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3185,7 +4087,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3206,7 +4108,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3227,7 +4129,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3245,10 +4147,52 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3269,7 +4213,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3290,7 +4234,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3311,7 +4255,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3332,7 +4276,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3353,7 +4297,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3374,7 +4318,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3499,6 +4443,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3520,6 +4485,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3625,6 +4611,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3667,6 +4695,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4132,6 +5202,8 @@ t.table_type, t.engine
 from information_schema.schemata s inner join information_schema.tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
@@ -4164,6 +5236,10 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -4176,6 +5252,17 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -4183,6 +5270,8 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
@@ -4215,6 +5304,10 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -4227,6 +5320,17 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -4234,6 +5338,8 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
@@ -4266,6 +5372,10 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -4278,6 +5388,17 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -4285,6 +5406,8 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
@@ -4317,6 +5440,10 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -4329,6 +5456,17 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -4336,6 +5474,8 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
@@ -4368,6 +5508,10 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -4380,6 +5524,17 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -4387,6 +5542,8 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
@@ -4419,6 +5576,10 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -4431,6 +5592,17 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -4505,9 +5677,9 @@ select * from information_schema.table_constraints limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select * from information_schema.key_column_usage limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Host	1	NULL	NULL	NULL	NULL
@@ -4517,7 +5689,7 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Table_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 select count(*) as max_recs from information_schema.key_column_usage limit 0, 5;
 max_recs
-40
+45
 
 root: check with db name
 ------------------------
@@ -4526,34 +5698,34 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-51
+68
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-642
+827
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
 SELECT COUNT(*) FROM information_schema. collations                            ;
 COUNT(*)
-126
+127
 SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ;
 COUNT(*)
-126
+128
 SELECT COUNT(*) FROM information_schema. routines                              ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM information_schema. statistics                            ;
 COUNT(*)
-43
+48
 SELECT COUNT(*) FROM information_schema. views                                 ;
 COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-75
+81
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
-28
+32
 SELECT COUNT(*) FROM information_schema. table_privileges                      ;
 COUNT(*)
 0
@@ -4562,17 +5734,18 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. table_constraints                     ;
 COUNT(*)
-20
+24
 SELECT COUNT(*) FROM information_schema. key_column_usage                      ;
 COUNT(*)
-40
+45
 SELECT COUNT(*) FROM information_schema. triggers                              ;
 COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. parameters ;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT COUNT(*) FROM information_schema. referential_constraints ;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+COUNT(*)
+0
 USE db_datadict;
 DROP VIEW v1, vu1, vu;
 DROP PROCEDURE db_datadict.sp_1;
@@ -4590,10 +5763,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-48
+65
 select count(*) as the_cols from columns;
 the_cols
-617
+802
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -4631,10 +5804,21 @@ information_schema, COLLATIONS
 information_schema, COLLATION_CHARACTER_SET_APPLICABILITY
 information_schema, COLUMNS
 information_schema, COLUMN_PRIVILEGES
+information_schema, ENGINES
+information_schema, EVENTS
+information_schema, FILES
+information_schema, GLOBAL_STATUS
+information_schema, GLOBAL_VARIABLES
 information_schema, KEY_COLUMN_USAGE
+information_schema, PARTITIONS
+information_schema, PLUGINS
+information_schema, PROCESSLIST
+information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
 information_schema, SCHEMA_PRIVILEGES
+information_schema, SESSION_STATUS
+information_schema, SESSION_VARIABLES
 information_schema, STATISTICS
 information_schema, TABLES
 information_schema, TABLE_CONSTRAINTS
@@ -4644,14 +5828,20 @@ information_schema, USER_PRIVILEGES
 information_schema, VIEWS
 mysql, columns_priv
 mysql, db
+mysql, event
 mysql, func
+mysql, general_log
 mysql, help_category
 mysql, help_keyword
 mysql, help_relation
 mysql, help_topic
 mysql, host
+mysql, ndb_binlog_index
+mysql, plugin
 mysql, proc
 mysql, procs_priv
+mysql, servers
+mysql, slow_log
 mysql, tables_priv
 mysql, time_zone
 mysql, time_zone_leap_second
@@ -4697,7 +5887,7 @@ NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
 select sum(ordinal_position) from key_column_usage;
 sum(ordinal_position)
-77
+83
 select * from schemata limit 0,5;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
 NULL	information_schema	utf8	utf8_general_ci	NULL
@@ -4744,6 +5934,8 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
+'root'@'127.0.0.1'
+'root'@'127.0.0.1'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -4769,6 +5961,10 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'localhost'
+'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
@@ -6277,6 +7473,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6292,6 +7489,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6302,6 +7500,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6317,6 +7516,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6327,6 +7527,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6342,6 +7543,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6422,6 +7624,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6437,6 +7640,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6447,6 +7651,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6462,6 +7667,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6472,6 +7678,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6487,6 +7694,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
@@ -6553,6 +7761,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6568,6 +7777,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6578,6 +7788,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6593,6 +7804,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6603,6 +7815,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6618,6 +7831,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6696,6 +7910,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6711,6 +7926,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6721,6 +7937,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6736,6 +7953,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6746,6 +7964,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6761,6 +7980,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6835,6 +8055,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6850,6 +8071,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6860,6 +8082,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6875,6 +8098,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6885,6 +8109,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6900,6 +8125,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6987,6 +8213,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7002,6 +8229,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7012,6 +8240,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7027,6 +8256,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7037,6 +8267,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7052,6 +8283,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
@@ -7117,6 +8349,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7132,6 +8365,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7142,6 +8376,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7157,6 +8392,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7167,6 +8403,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7182,6 +8419,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7223,10 +8461,21 @@ information_schema	COLLATIONS	MEMORY
 information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	MEMORY
 information_schema	COLUMNS	MyISAM
 information_schema	COLUMN_PRIVILEGES	MEMORY
+information_schema	ENGINES	MEMORY
+information_schema	EVENTS	MyISAM
+information_schema	FILES	MEMORY
+information_schema	GLOBAL_STATUS	MEMORY
+information_schema	GLOBAL_VARIABLES	MyISAM
 information_schema	KEY_COLUMN_USAGE	MEMORY
+information_schema	PARTITIONS	MyISAM
+information_schema	PLUGINS	MyISAM
+information_schema	PROCESSLIST	MyISAM
+information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
 information_schema	SCHEMA_PRIVILEGES	MEMORY
+information_schema	SESSION_STATUS	MEMORY
+information_schema	SESSION_VARIABLES	MyISAM
 information_schema	STATISTICS	MEMORY
 information_schema	TABLES	MEMORY
 information_schema	TABLE_CONSTRAINTS	MEMORY
@@ -7255,10 +8504,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7285,10 +8545,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7352,6 +8623,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -7366,6 +8638,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -7456,10 +8729,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7498,14 +8782,14 @@ COLUMNS	TABLE_CATALOG	varchar(4096)
 COLUMNS	TABLE_SCHEMA	varchar(64)
 COLUMNS	TABLE_NAME	varchar(64)
 COLUMNS	COLUMN_NAME	varchar(64)
-COLUMNS	ORDINAL_POSITION	bigint(21)
+COLUMNS	ORDINAL_POSITION	bigint(21) unsigned
 COLUMNS	COLUMN_DEFAULT	longtext
 COLUMNS	IS_NULLABLE	varchar(3)
 COLUMNS	DATA_TYPE	varchar(64)
-COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21)
-COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21)
-COLUMNS	NUMERIC_PRECISION	bigint(21)
-COLUMNS	NUMERIC_SCALE	bigint(21)
+COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned
+COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21) unsigned
+COLUMNS	NUMERIC_PRECISION	bigint(21) unsigned
+COLUMNS	NUMERIC_SCALE	bigint(21) unsigned
 COLUMNS	CHARACTER_SET_NAME	varchar(64)
 COLUMNS	COLLATION_NAME	varchar(64)
 COLUMNS	COLUMN_TYPE	longtext
@@ -7520,6 +8804,75 @@ COLUMN_PRIVILEGES	TABLE_NAME	varchar(64)
 COLUMN_PRIVILEGES	COLUMN_NAME	varchar(64)
 COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 COLUMN_PRIVILEGES	IS_GRANTABLE	varchar(3)
+ENGINES	ENGINE	varchar(64)
+ENGINES	SUPPORT	varchar(8)
+ENGINES	COMMENT	varchar(80)
+ENGINES	TRANSACTIONS	varchar(3)
+ENGINES	XA	varchar(3)
+ENGINES	SAVEPOINTS	varchar(3)
+EVENTS	EVENT_CATALOG	varchar(64)
+EVENTS	EVENT_SCHEMA	varchar(64)
+EVENTS	EVENT_NAME	varchar(64)
+EVENTS	DEFINER	varchar(77)
+EVENTS	TIME_ZONE	varchar(64)
+EVENTS	EVENT_BODY	varchar(8)
+EVENTS	EVENT_DEFINITION	longtext
+EVENTS	EVENT_TYPE	varchar(9)
+EVENTS	EXECUTE_AT	datetime
+EVENTS	INTERVAL_VALUE	varchar(256)
+EVENTS	INTERVAL_FIELD	varchar(18)
+EVENTS	SQL_MODE	longtext
+EVENTS	STARTS	datetime
+EVENTS	ENDS	datetime
+EVENTS	STATUS	varchar(18)
+EVENTS	ON_COMPLETION	varchar(12)
+EVENTS	CREATED	datetime
+EVENTS	LAST_ALTERED	datetime
+EVENTS	LAST_EXECUTED	datetime
+EVENTS	EVENT_COMMENT	varchar(64)
+EVENTS	ORIGINATOR	bigint(10)
+FILES	FILE_ID	bigint(4)
+FILES	FILE_NAME	varchar(64)
+FILES	FILE_TYPE	varchar(20)
+FILES	TABLESPACE_NAME	varchar(64)
+FILES	TABLE_CATALOG	varchar(64)
+FILES	TABLE_SCHEMA	varchar(64)
+FILES	TABLE_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NUMBER	bigint(4)
+FILES	ENGINE	varchar(64)
+FILES	FULLTEXT_KEYS	varchar(64)
+FILES	DELETED_ROWS	bigint(4)
+FILES	UPDATE_COUNT	bigint(4)
+FILES	FREE_EXTENTS	bigint(4)
+FILES	TOTAL_EXTENTS	bigint(4)
+FILES	EXTENT_SIZE	bigint(4)
+FILES	INITIAL_SIZE	bigint(21) unsigned
+FILES	MAXIMUM_SIZE	bigint(21) unsigned
+FILES	AUTOEXTEND_SIZE	bigint(21) unsigned
+FILES	CREATION_TIME	datetime
+FILES	LAST_UPDATE_TIME	datetime
+FILES	LAST_ACCESS_TIME	datetime
+FILES	RECOVER_TIME	bigint(4)
+FILES	TRANSACTION_COUNTER	bigint(4)
+FILES	VERSION	bigint(21) unsigned
+FILES	ROW_FORMAT	varchar(10)
+FILES	TABLE_ROWS	bigint(21) unsigned
+FILES	AVG_ROW_LENGTH	bigint(21) unsigned
+FILES	DATA_LENGTH	bigint(21) unsigned
+FILES	MAX_DATA_LENGTH	bigint(21) unsigned
+FILES	INDEX_LENGTH	bigint(21) unsigned
+FILES	DATA_FREE	bigint(21) unsigned
+FILES	CREATE_TIME	datetime
+FILES	UPDATE_TIME	datetime
+FILES	CHECK_TIME	datetime
+FILES	CHECKSUM	bigint(21) unsigned
+FILES	STATUS	varchar(20)
+FILES	EXTRA	varchar(255)
+GLOBAL_STATUS	VARIABLE_NAME	varchar(64)
+GLOBAL_STATUS	VARIABLE_VALUE	decimal(22,7)
+GLOBAL_VARIABLES	VARIABLE_NAME	varchar(64)
+GLOBAL_VARIABLES	VARIABLE_VALUE	longtext
 KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar(4096)
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar(64)
@@ -7532,6 +8885,60 @@ KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar(64)
+PARTITIONS	TABLE_CATALOG	varchar(4096)
+PARTITIONS	TABLE_SCHEMA	varchar(64)
+PARTITIONS	TABLE_NAME	varchar(64)
+PARTITIONS	PARTITION_NAME	varchar(64)
+PARTITIONS	SUBPARTITION_NAME	varchar(64)
+PARTITIONS	PARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	PARTITION_METHOD	varchar(12)
+PARTITIONS	SUBPARTITION_METHOD	varchar(12)
+PARTITIONS	PARTITION_EXPRESSION	longtext
+PARTITIONS	SUBPARTITION_EXPRESSION	longtext
+PARTITIONS	PARTITION_DESCRIPTION	longtext
+PARTITIONS	TABLE_ROWS	bigint(21) unsigned
+PARTITIONS	AVG_ROW_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	MAX_DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	INDEX_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_FREE	bigint(21) unsigned
+PARTITIONS	CREATE_TIME	datetime
+PARTITIONS	UPDATE_TIME	datetime
+PARTITIONS	CHECK_TIME	datetime
+PARTITIONS	CHECKSUM	bigint(21) unsigned
+PARTITIONS	PARTITION_COMMENT	varchar(80)
+PARTITIONS	NODEGROUP	varchar(12)
+PARTITIONS	TABLESPACE_NAME	varchar(64)
+PLUGINS	PLUGIN_NAME	varchar(64)
+PLUGINS	PLUGIN_VERSION	varchar(20)
+PLUGINS	PLUGIN_STATUS	varchar(10)
+PLUGINS	PLUGIN_TYPE	varchar(80)
+PLUGINS	PLUGIN_TYPE_VERSION	varchar(20)
+PLUGINS	PLUGIN_LIBRARY	varchar(64)
+PLUGINS	PLUGIN_LIBRARY_VERSION	varchar(20)
+PLUGINS	PLUGIN_AUTHOR	varchar(64)
+PLUGINS	PLUGIN_DESCRIPTION	longtext
+PLUGINS	PLUGIN_LICENSE	varchar(80)
+PROCESSLIST	ID	bigint(4)
+PROCESSLIST	USER	varchar(16)
+PROCESSLIST	HOST	varchar(64)
+PROCESSLIST	DB	varchar(64)
+PROCESSLIST	COMMAND	varchar(16)
+PROCESSLIST	TIME	bigint(7)
+PROCESSLIST	STATE	varchar(64)
+PROCESSLIST	INFO	longtext
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar(64)
+REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar(64)
 ROUTINES	SPECIFIC_NAME	varchar(64)
 ROUTINES	ROUTINE_CATALOG	varchar(4096)
 ROUTINES	ROUTINE_SCHEMA	varchar(64)
@@ -7562,6 +8969,10 @@ SCHEMA_PRIVILEGES	TABLE_CATALOG	varchar(4096)
 SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar(64)
 SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar(3)
+SESSION_STATUS	VARIABLE_NAME	varchar(64)
+SESSION_STATUS	VARIABLE_VALUE	decimal(22,7)
+SESSION_VARIABLES	VARIABLE_NAME	varchar(64)
+SESSION_VARIABLES	VARIABLE_VALUE	longtext
 STATISTICS	TABLE_CATALOG	varchar(4096)
 STATISTICS	TABLE_SCHEMA	varchar(64)
 STATISTICS	TABLE_NAME	varchar(64)
@@ -7582,20 +8993,20 @@ TABLES	TABLE_SCHEMA	varchar(64)
 TABLES	TABLE_NAME	varchar(64)
 TABLES	TABLE_TYPE	varchar(64)
 TABLES	ENGINE	varchar(64)
-TABLES	VERSION	bigint(21)
+TABLES	VERSION	bigint(21) unsigned
 TABLES	ROW_FORMAT	varchar(10)
-TABLES	TABLE_ROWS	bigint(21)
-TABLES	AVG_ROW_LENGTH	bigint(21)
-TABLES	DATA_LENGTH	bigint(21)
-TABLES	MAX_DATA_LENGTH	bigint(21)
-TABLES	INDEX_LENGTH	bigint(21)
-TABLES	DATA_FREE	bigint(21)
-TABLES	AUTO_INCREMENT	bigint(21)
+TABLES	TABLE_ROWS	bigint(21) unsigned
+TABLES	AVG_ROW_LENGTH	bigint(21) unsigned
+TABLES	DATA_LENGTH	bigint(21) unsigned
+TABLES	MAX_DATA_LENGTH	bigint(21) unsigned
+TABLES	INDEX_LENGTH	bigint(21) unsigned
+TABLES	DATA_FREE	bigint(21) unsigned
+TABLES	AUTO_INCREMENT	bigint(21) unsigned
 TABLES	CREATE_TIME	datetime
 TABLES	UPDATE_TIME	datetime
 TABLES	CHECK_TIME	datetime
 TABLES	TABLE_COLLATION	varchar(64)
-TABLES	CHECKSUM	bigint(21)
+TABLES	CHECKSUM	bigint(21) unsigned
 TABLES	CREATE_OPTIONS	varchar(255)
 TABLES	TABLE_COMMENT	varchar(80)
 TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
@@ -7982,6 +9393,7 @@ cp1250_general_ci
 cp1250_czech_cs
 cp1250_croatian_ci
 cp1250_bin
+cp1250_polish_ci
 gbk_chinese_ci
 gbk_bin
 latin5_turkish_ci
@@ -8189,10 +9601,10 @@ MAXLEN	bigint(3)	NO		0
 SHOW CREATE TABLE character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
-  `DESCRIPTION` varchar(60) NOT NULL default '',
-  `MAXLEN` bigint(3) NOT NULL default '0'
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
+  `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8270,12 +9682,12 @@ SORTLEN	bigint(3)	NO		0
 SHOW CREATE TABLE collations;
 Table	Create Table
 COLLATIONS	CREATE TEMPORARY TABLE `COLLATIONS` (
-  `COLLATION_NAME` varchar(64) NOT NULL default '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `ID` bigint(11) NOT NULL default '0',
-  `IS_DEFAULT` varchar(3) NOT NULL default '',
-  `IS_COMPILED` varchar(3) NOT NULL default '',
-  `SORTLEN` bigint(3) NOT NULL default '0'
+  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ID` bigint(11) NOT NULL DEFAULT '0',
+  `IS_DEFAULT` varchar(3) NOT NULL DEFAULT '',
+  `IS_COMPILED` varchar(3) NOT NULL DEFAULT '',
+  `SORTLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8346,6 +9758,7 @@ cp1250_general_ci	cp1250	26	Yes	Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_bin	cp1250	66		Yes	1
+cp1250_polish_ci	cp1250	99		Yes	1
 gbk_chinese_ci	gbk	28	Yes	Yes	1
 gbk_bin	gbk	87		Yes	1
 latin5_turkish_ci	latin5	30	Yes		0
@@ -8439,8 +9852,8 @@ CHARACTER_SET_NAME	varchar(64)	NO
 SHOW CREATE TABLE collation_character_set_applicability;
 Table	Create Table
 COLLATION_CHARACTER_SET_APPLICABILITY	CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
-  `COLLATION_NAME` varchar(64) NOT NULL default '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default ''
+  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8493,6 +9906,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -8507,6 +9921,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -8605,13 +10020,13 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE column_privileges;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8717,6 +10132,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_3'@'localhost'	NULL	db_datadict	SHOW VIEW	NO
 'user_3'@'localhost'	NULL	db_datadict	CREATE ROUTINE	NO
 'user_3'@'localhost'	NULL	db_datadict	ALTER ROUTINE	NO
+'user_3'@'localhost'	NULL	db_datadict	EVENT	NO
+'user_3'@'localhost'	NULL	db_datadict	TRIGGER	NO
 SELECT * FROM information_schema.column_privileges
 WHERE grantee LIKE "'user%"
  ORDER BY grantee, table_name, column_name, privilege_type;
@@ -8757,14 +10174,14 @@ TABLE_CATALOG	varchar(4096)	YES		NULL
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
 COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(21)	NO		0	
+ORDINAL_POSITION	bigint(21) unsigned	NO		0	
 COLUMN_DEFAULT	longtext	YES		NULL	
 IS_NULLABLE	varchar(3)	NO			
 DATA_TYPE	varchar(64)	NO			
-CHARACTER_MAXIMUM_LENGTH	bigint(21)	YES		NULL	
-CHARACTER_OCTET_LENGTH	bigint(21)	YES		NULL	
-NUMERIC_PRECISION	bigint(21)	YES		NULL	
-NUMERIC_SCALE	bigint(21)	YES		NULL	
+CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL	
+CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
+NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
+NUMERIC_SCALE	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 COLUMN_TYPE	longtext	NO			
@@ -8775,25 +10192,25 @@ COLUMN_COMMENT	varchar(255)	NO
 SHOW CREATE TABLE columns;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `ORDINAL_POSITION` bigint(21) NOT NULL default '0',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ORDINAL_POSITION` bigint(21) unsigned NOT NULL DEFAULT '0',
   `COLUMN_DEFAULT` longtext,
-  `IS_NULLABLE` varchar(3) NOT NULL default '',
-  `DATA_TYPE` varchar(64) NOT NULL default '',
-  `CHARACTER_MAXIMUM_LENGTH` bigint(21) default NULL,
-  `CHARACTER_OCTET_LENGTH` bigint(21) default NULL,
-  `NUMERIC_PRECISION` bigint(21) default NULL,
-  `NUMERIC_SCALE` bigint(21) default NULL,
-  `CHARACTER_SET_NAME` varchar(64) default NULL,
-  `COLLATION_NAME` varchar(64) default NULL,
+  `IS_NULLABLE` varchar(3) NOT NULL DEFAULT '',
+  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
+  `NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
+  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
+  `COLLATION_NAME` varchar(64) DEFAULT NULL,
   `COLUMN_TYPE` longtext NOT NULL,
-  `COLUMN_KEY` varchar(3) NOT NULL default '',
-  `EXTRA` varchar(20) NOT NULL default '',
-  `PRIVILEGES` varchar(80) NOT NULL default '',
-  `COLUMN_COMMENT` varchar(255) NOT NULL default ''
+  `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
+  `EXTRA` varchar(20) NOT NULL DEFAULT '',
+  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
+  `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8810,14 +10227,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8865,14 +10282,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8887,6 +10304,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8899,6 +10385,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8929,6 +10469,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8949,20 +10493,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -9035,10 +10579,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
+NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
+NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
+NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
+NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
+NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
+NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
+NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -9072,6 +10642,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
+NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -9096,13 +10676,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
+NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -9147,14 +10747,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -9488,14 +11090,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -9510,6 +11112,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9522,6 +11193,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9552,6 +11277,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9572,20 +11301,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -9907,14 +11636,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -9929,6 +11658,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9941,6 +11739,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9971,6 +11823,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9991,20 +11847,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10327,7 +12183,9 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	enum	latin1	latin1_swedish_ci
 1.0000	set	latin1	latin1_swedish_ci
 1.0000	text	latin1	latin1_swedish_ci
+1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	longtext	utf8	utf8_general_ci
+1.0000	mediumtext	utf8	utf8_general_ci
 1.0000	text	utf8	utf8_general_ci
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
@@ -10412,14 +12270,14 @@ NULL	information_schema	COLLATIONS	SORTLEN	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	COLUMNS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 1.0000	information_schema	COLUMNS	COLUMN_DEFAULT	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	COLUMNS	IS_NULLABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	COLUMNS	DATA_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	COLUMNS	CHARACTER_SET_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLLATION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	COLUMNS	COLUMN_TYPE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
@@ -10434,6 +12292,75 @@ NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(
 3.0000	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	ENGINES	SUPPORT	varchar	8	24	utf8	utf8_general_ci	varchar(8)
+3.0000	information_schema	ENGINES	COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	ENGINES	TRANSACTIONS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	XA	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	SAVEPOINTS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	EVENTS	EVENT_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)
+3.0000	information_schema	EVENTS	TIME_ZONE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_BODY	varchar	8	24	utf8	utf8_general_ci	varchar(8)
+1.0000	information_schema	EVENTS	EVENT_DEFINITION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	EVENTS	EVENT_TYPE	varchar	9	27	utf8	utf8_general_ci	varchar(9)
+NULL	information_schema	EVENTS	EXECUTE_AT	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	INTERVAL_VALUE	varchar	256	768	utf8	utf8_general_ci	varchar(256)
+3.0000	information_schema	EVENTS	INTERVAL_FIELD	varchar	18	54	utf8	utf8_general_ci	varchar(18)
+1.0000	information_schema	EVENTS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	EVENTS	STARTS	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	ENDS	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	STATUS	varchar	18	54	utf8	utf8_general_ci	varchar(18)
+3.0000	information_schema	EVENTS	ON_COMPLETION	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+NULL	information_schema	EVENTS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	LAST_EXECUTED	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	EVENT_COMMENT	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	EVENTS	ORIGINATOR	bigint	NULL	NULL	NULL	NULL	bigint(10)
+NULL	information_schema	FILES	FILE_ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	FILES	FILE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	FILE_TYPE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	FILES	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	LOGFILE_GROUP_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	FILES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	FULLTEXT_KEYS	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	FILES	DELETED_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	UPDATE_COUNT	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	FREE_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	TOTAL_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	EXTENT_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	INITIAL_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	MAXIMUM_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	CREATION_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	LAST_UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	LAST_ACCESS_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	RECOVER_TIME	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	TRANSACTION_COUNTER	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	FILES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
+NULL	information_schema	FILES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	FILES	STATUS	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	FILES	EXTRA	varchar	255	765	utf8	utf8_general_ci	varchar(255)
+3.0000	information_schema	GLOBAL_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10446,6 +12373,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint	NU
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+3.0000	information_schema	PARTITIONS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	PARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	SUBPARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	PARTITIONS	PARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+3.0000	information_schema	PARTITIONS	SUBPARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+1.0000	information_schema	PARTITIONS	PARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+1.0000	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+1.0000	information_schema	PARTITIONS	PARTITION_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	PARTITIONS	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	PARTITIONS	PARTITION_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	PARTITIONS	NODEGROUP	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+3.0000	information_schema	PARTITIONS	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_STATUS	varchar	10	30	utf8	utf8_general_ci	varchar(10)
+3.0000	information_schema	PLUGINS	PLUGIN_TYPE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_AUTHOR	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	PLUGINS	PLUGIN_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	PLUGINS	PLUGIN_LICENSE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	PROCESSLIST	USER	varchar	16	48	utf8	utf8_general_ci	varchar(16)
+3.0000	information_schema	PROCESSLIST	HOST	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PROCESSLIST	DB	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PROCESSLIST	COMMAND	varchar	16	48	utf8	utf8_general_ci	varchar(16)
+NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
+3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	SPECIFIC_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	ROUTINE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10476,6 +12457,10 @@ NULL	information_schema	ROUTINES	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datet
 3.0000	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	SESSION_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10496,20 +12481,20 @@ NULL	information_schema	STATISTICS	SUB_PART	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	TABLES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	TABLE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	TABLES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 NULL	information_schema	TABLES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 3.0000	information_schema	TABLES	TABLE_COLLATION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	TABLES	CREATE_OPTIONS	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 3.0000	information_schema	TABLES	TABLE_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
 3.0000	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
@@ -10582,10 +12567,36 @@ NULL	mysql	columns_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	db	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	db	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	db	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	event	db	char	64	192	utf8	utf8_bin	char(64)
+3.0000	mysql	event	name	char	64	192	utf8	utf8_general_ci	char(64)
+1.0000	mysql	event	body	longblob	4294967295	4294967295	NULL	NULL	longblob
+3.0000	mysql	event	definer	char	77	231	utf8	utf8_bin	char(77)
+NULL	mysql	event	execute_at	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	interval_value	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	event	interval_field	enum	18	54	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')
+NULL	mysql	event	created	timestamp	NULL	NULL	NULL	NULL	timestamp
+NULL	mysql	event	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
+NULL	mysql	event	last_executed	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	starts	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	ends	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	mysql	event	status	enum	18	54	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')
+3.0000	mysql	event	on_completion	enum	8	24	utf8	utf8_general_ci	enum('DROP','PRESERVE')
+3.0000	mysql	event	sql_mode	set	431	1293	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')
+3.0000	mysql	event	comment	char	64	192	utf8	utf8_bin	char(64)
+NULL	mysql	event	originator	int	NULL	NULL	NULL	NULL	int(10)
+1.0000	mysql	event	time_zone	char	64	64	latin1	latin1_swedish_ci	char(64)
 3.0000	mysql	func	name	char	64	192	utf8	utf8_bin	char(64)
 NULL	mysql	func	ret	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 3.0000	mysql	func	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	func	type	enum	9	27	utf8	utf8_general_ci	enum('function','aggregate')
+NULL	mysql	general_log	event_time	timestamp	NULL	NULL	NULL	NULL	timestamp
+1.0000	mysql	general_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
+NULL	mysql	general_log	thread_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	general_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	general_log	command_type	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	mysql	general_log	argument	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_category	parent_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
@@ -10619,6 +12630,16 @@ NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5)
 3.0000	mysql	host	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	host	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+NULL	mysql	ndb_binlog_index	Position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+1.0000	mysql	ndb_binlog_index	File	varchar	255	255	latin1	latin1_swedish_ci	varchar(255)
+NULL	mysql	ndb_binlog_index	epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	inserts	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	updates	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	deletes	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	schemaops	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+3.0000	mysql	plugin	name	char	64	192	utf8	utf8_bin	char(64)
+3.0000	mysql	plugin	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	proc	db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	proc	name	char	64	192	utf8	utf8_general_ci	char(64)
 3.0000	mysql	proc	type	enum	9	27	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')
@@ -10643,13 +12664,33 @@ NULL	mysql	proc	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	procs_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 3.0000	mysql	procs_priv	Proc_priv	set	27	81	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')
 NULL	mysql	procs_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
+3.0000	mysql	servers	Server_name	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Host	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Db	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Username	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Password	char	64	192	utf8	utf8_general_ci	char(64)
+NULL	mysql	servers	Port	int	NULL	NULL	NULL	NULL	int(4)
+3.0000	mysql	servers	Socket	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Wrapper	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Owner	char	64	192	utf8	utf8_general_ci	char(64)
+NULL	mysql	slow_log	start_time	timestamp	NULL	NULL	NULL	NULL	timestamp
+1.0000	mysql	slow_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
+NULL	mysql	slow_log	query_time	time	NULL	NULL	NULL	NULL	time
+NULL	mysql	slow_log	lock_time	time	NULL	NULL	NULL	NULL	time
+NULL	mysql	slow_log	rows_sent	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	rows_examined	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	slow_log	db	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+NULL	mysql	slow_log	last_insert_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	insert_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
+1.0000	mysql	slow_log	sql_text	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 3.0000	mysql	tables_priv	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	tables_priv	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	User	char	16	48	utf8	utf8_bin	char(16)
 3.0000	mysql	tables_priv	Table_name	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 NULL	mysql	tables_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	tables_priv	Table_priv	set	90	270	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')
+3.0000	mysql	tables_priv	Table_priv	set	98	294	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')
 3.0000	mysql	tables_priv	Column_priv	set	31	93	utf8	utf8_general_ci	set('Select','Insert','Update','References')
 NULL	mysql	time_zone	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	time_zone	Use_leap_seconds	enum	1	3	utf8	utf8_general_ci	enum('Y','N')
@@ -10694,6 +12735,8 @@ NULL	mysql	time_zone_transition_type	Is_DST	tinyint	NULL	NULL	NULL	NULL	tinyint(
 3.0000	mysql	user	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Create_user_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	user	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	user	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	ssl_type	enum	9	27	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')
 1.0000	mysql	user	ssl_cipher	blob	65535	65535	NULL	NULL	blob
 1.0000	mysql	user	x509_issuer	blob	65535	65535	NULL	NULL	blob
@@ -11039,18 +13082,18 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE key_column_usage;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `ORDINAL_POSITION` bigint(10) NOT NULL default '0',
-  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) default NULL,
-  `REFERENCED_TABLE_SCHEMA` varchar(64) default NULL,
-  `REFERENCED_TABLE_NAME` varchar(64) default NULL,
-  `REFERENCED_COLUMN_NAME` varchar(64) default NULL
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT '0',
+  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL,
+  `REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL,
+  `REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL,
+  `REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11111,6 +13154,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_keyword	help_keyword_id	1	NULL	NULL	NULL	NULL
@@ -11119,6 +13164,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_relation	help_topic_id	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -11127,6 +13174,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -11188,26 +13236,26 @@ DEFINER	varchar(77)	NO
 SHOW CREATE TABLE routines;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_CATALOG` varchar(4096) default NULL,
-  `ROUTINE_SCHEMA` varchar(64) NOT NULL default '',
-  `ROUTINE_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_TYPE` varchar(9) NOT NULL default '',
-  `DTD_IDENTIFIER` varchar(64) default NULL,
-  `ROUTINE_BODY` varchar(8) NOT NULL default '',
+  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_CATALOG` varchar(4096) DEFAULT NULL,
+  `ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT '',
+  `DTD_IDENTIFIER` varchar(64) DEFAULT NULL,
+  `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
   `ROUTINE_DEFINITION` longtext,
-  `EXTERNAL_NAME` varchar(64) default NULL,
-  `EXTERNAL_LANGUAGE` varchar(64) default NULL,
-  `PARAMETER_STYLE` varchar(8) NOT NULL default '',
-  `IS_DETERMINISTIC` varchar(3) NOT NULL default '',
-  `SQL_DATA_ACCESS` varchar(64) NOT NULL default '',
-  `SQL_PATH` varchar(64) default NULL,
-  `SECURITY_TYPE` varchar(7) NOT NULL default '',
-  `CREATED` datetime NOT NULL default '0000-00-00 00:00:00',
-  `LAST_ALTERED` datetime NOT NULL default '0000-00-00 00:00:00',
+  `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
+  `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
+  `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
+  `IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
+  `SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
+  `SQL_PATH` varchar(64) DEFAULT NULL,
+  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
+  `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `SQL_MODE` longtext NOT NULL,
-  `ROUTINE_COMMENT` varchar(64) NOT NULL default '',
-  `DEFINER` varchar(77) NOT NULL default ''
+  `ROUTINE_COMMENT` varchar(64) NOT NULL DEFAULT '',
+  `DEFINER` varchar(77) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11532,11 +13580,11 @@ SQL_PATH	varchar(4096)	YES		NULL
 SHOW CREATE TABLE schemata;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(4096) default NULL,
-  `SCHEMA_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL default '',
-  `SQL_PATH` varchar(4096) default NULL
+  `CATALOG_NAME` varchar(4096) DEFAULT NULL,
+  `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `SQL_PATH` varchar(4096) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11615,12 +13663,12 @@ CONSTRAINT_TYPE	varchar(64)	NO
 SHOW CREATE TABLE table_constraints;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `CONSTRAINT_TYPE` varchar(64) NOT NULL default ''
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_TYPE` varchar(64) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11695,12 +13743,12 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE table_privileges;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11754,6 +13802,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = USER();
@@ -11763,7 +13812,7 @@ SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = "'user_2'@'localhost'";
 USER()	COUNT(*)
-user_2@localhost	11
+user_2@localhost	12
 connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -11783,6 +13832,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'user_1'@'localhost'	NULL	db_datadict	tb1	SELECT	NO
 'user_3'@'localhost'	NULL	db_datadict	tb3	SELECT	NO
 	
@@ -11805,46 +13855,46 @@ TABLE_SCHEMA	varchar(64)	NO
 TABLE_NAME	varchar(64)	NO			
 TABLE_TYPE	varchar(64)	NO			
 ENGINE	varchar(64)	YES		NULL	
-VERSION	bigint(21)	YES		NULL	
+VERSION	bigint(21) unsigned	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
-TABLE_ROWS	bigint(21)	YES		NULL	
-AVG_ROW_LENGTH	bigint(21)	YES		NULL	
-DATA_LENGTH	bigint(21)	YES		NULL	
-MAX_DATA_LENGTH	bigint(21)	YES		NULL	
-INDEX_LENGTH	bigint(21)	YES		NULL	
-DATA_FREE	bigint(21)	YES		NULL	
-AUTO_INCREMENT	bigint(21)	YES		NULL	
+TABLE_ROWS	bigint(21) unsigned	YES		NULL	
+AVG_ROW_LENGTH	bigint(21) unsigned	YES		NULL	
+DATA_LENGTH	bigint(21) unsigned	YES		NULL	
+MAX_DATA_LENGTH	bigint(21) unsigned	YES		NULL	
+INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
+DATA_FREE	bigint(21) unsigned	YES		NULL	
+AUTO_INCREMENT	bigint(21) unsigned	YES		NULL	
 CREATE_TIME	datetime	YES		NULL	
 UPDATE_TIME	datetime	YES		NULL	
 CHECK_TIME	datetime	YES		NULL	
 TABLE_COLLATION	varchar(64)	YES		NULL	
-CHECKSUM	bigint(21)	YES		NULL	
+CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(255)	YES		NULL	
 TABLE_COMMENT	varchar(80)	NO			
 SHOW CREATE TABLE tables;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `TABLE_TYPE` varchar(64) NOT NULL default '',
-  `ENGINE` varchar(64) default NULL,
-  `VERSION` bigint(21) default NULL,
-  `ROW_FORMAT` varchar(10) default NULL,
-  `TABLE_ROWS` bigint(21) default NULL,
-  `AVG_ROW_LENGTH` bigint(21) default NULL,
-  `DATA_LENGTH` bigint(21) default NULL,
-  `MAX_DATA_LENGTH` bigint(21) default NULL,
-  `INDEX_LENGTH` bigint(21) default NULL,
-  `DATA_FREE` bigint(21) default NULL,
-  `AUTO_INCREMENT` bigint(21) default NULL,
-  `CREATE_TIME` datetime default NULL,
-  `UPDATE_TIME` datetime default NULL,
-  `CHECK_TIME` datetime default NULL,
-  `TABLE_COLLATION` varchar(64) default NULL,
-  `CHECKSUM` bigint(21) default NULL,
-  `CREATE_OPTIONS` varchar(255) default NULL,
-  `TABLE_COMMENT` varchar(80) NOT NULL default ''
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `ENGINE` varchar(64) DEFAULT NULL,
+  `VERSION` bigint(21) unsigned DEFAULT NULL,
+  `ROW_FORMAT` varchar(10) DEFAULT NULL,
+  `TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
+  `AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `DATA_FREE` bigint(21) unsigned DEFAULT NULL,
+  `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
+  `CREATE_TIME` datetime DEFAULT NULL,
+  `UPDATE_TIME` datetime DEFAULT NULL,
+  `CHECK_TIME` datetime DEFAULT NULL,
+  `TABLE_COLLATION` varchar(64) DEFAULT NULL,
+  `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
+  `CREATE_OPTIONS` varchar(255) DEFAULT NULL,
+  `TABLE_COMMENT` varchar(80) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11862,20 +13912,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 
@@ -11903,22 +13953,33 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -11943,22 +14004,33 @@ connect(localhost,user_2,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -11981,22 +14053,33 @@ connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12020,22 +14103,33 @@ root@localhost	db_datadict
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12045,14 +14139,20 @@ NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	N
 NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
 NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Column privileges
 NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Database privileges
+NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Events
 NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		User defined functions
+NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		General log
 NULL	mysql	help_category	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help categories
 NULL	mysql	help_keyword	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help keywords
 NULL	mysql	help_relation	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		keyword-topic relation
 NULL	mysql	help_topic	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help topics
 NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Host privileges;  Merged with database privileges
+NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
+NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		MySQL plugins
 NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Stored Procedures
 NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Procedure privileges
+NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		MySQL Foreign Servers table
+NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Slow log
 NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Table privileges
 NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zones
 NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Leap seconds information for time zones
@@ -12100,14 +14200,14 @@ SECURITY_TYPE	varchar(7)	NO
 SHOW CREATE TABLE views;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
   `VIEW_DEFINITION` longtext NOT NULL,
-  `CHECK_OPTION` varchar(8) NOT NULL default '',
-  `IS_UPDATABLE` varchar(3) NOT NULL default '',
-  `DEFINER` varchar(77) NOT NULL default '',
-  `SECURITY_TYPE` varchar(7) NOT NULL default ''
+  `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
+  `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
+  `DEFINER` varchar(77) NOT NULL DEFAULT '',
+  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12195,21 +14295,21 @@ COMMENT	varchar(16)	YES		NULL
 SHOW CREATE TABLE statistics;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `NON_UNIQUE` bigint(1) NOT NULL default '0',
-  `INDEX_SCHEMA` varchar(64) NOT NULL default '',
-  `INDEX_NAME` varchar(64) NOT NULL default '',
-  `SEQ_IN_INDEX` bigint(2) NOT NULL default '0',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `COLLATION` varchar(1) default NULL,
-  `CARDINALITY` bigint(21) default NULL,
-  `SUB_PART` bigint(3) default NULL,
-  `PACKED` varchar(10) default NULL,
-  `NULLABLE` varchar(3) NOT NULL default '',
-  `INDEX_TYPE` varchar(16) NOT NULL default '',
-  `COMMENT` varchar(16) default NULL
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `NON_UNIQUE` bigint(1) NOT NULL DEFAULT '0',
+  `INDEX_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `INDEX_NAME` varchar(64) NOT NULL DEFAULT '',
+  `SEQ_IN_INDEX` bigint(2) NOT NULL DEFAULT '0',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLLATION` varchar(1) DEFAULT NULL,
+  `CARDINALITY` bigint(21) DEFAULT NULL,
+  `SUB_PART` bigint(3) DEFAULT NULL,
+  `PACKED` varchar(10) DEFAULT NULL,
+  `NULLABLE` varchar(3) NOT NULL DEFAULT '',
+  `INDEX_TYPE` varchar(16) NOT NULL DEFAULT '',
+  `COMMENT` varchar(16) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12287,6 +14387,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -12298,6 +14400,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	0	NULL	NULL		BTREE	
@@ -12307,6 +14411,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -12356,11 +14461,11 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE schema_privileges;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12407,6 +14512,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12421,6 +14528,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401502,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12468,6 +14577,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12482,6 +14593,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401503_1,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12518,10 +14631,10 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE user_privileges;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12563,10 +14676,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12586,10 +14699,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12601,10 +14714,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12628,10 +14741,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12648,10 +14761,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12665,10 +14778,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12680,10 +14793,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT SELECT ON *.* TO 'user_1'@'localhost' WITH GRANT OPTION
@@ -12727,10 +14840,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12780,10 +14893,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12795,10 +14908,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12815,10 +14928,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12841,10 +14954,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12901,23 +15014,23 @@ DEFINER	longtext	NO
 SHOW CREATE TABLE triggers;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(4096) default NULL,
-  `TRIGGER_SCHEMA` varchar(64) NOT NULL default '',
-  `TRIGGER_NAME` varchar(64) NOT NULL default '',
-  `EVENT_MANIPULATION` varchar(6) NOT NULL default '',
-  `EVENT_OBJECT_CATALOG` varchar(4096) default NULL,
-  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL default '',
-  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL default '',
-  `ACTION_ORDER` bigint(4) NOT NULL default '0',
+  `TRIGGER_CATALOG` varchar(4096) DEFAULT NULL,
+  `TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '',
+  `EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '',
+  `EVENT_OBJECT_CATALOG` varchar(4096) DEFAULT NULL,
+  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '',
+  `ACTION_ORDER` bigint(4) NOT NULL DEFAULT '0',
   `ACTION_CONDITION` longtext,
   `ACTION_STATEMENT` longtext NOT NULL,
-  `ACTION_ORIENTATION` varchar(9) NOT NULL default '',
-  `ACTION_TIMING` varchar(6) NOT NULL default '',
-  `ACTION_REFERENCE_OLD_TABLE` varchar(64) default NULL,
-  `ACTION_REFERENCE_NEW_TABLE` varchar(64) default NULL,
-  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL default '',
-  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL default '',
-  `CREATED` datetime default NULL,
+  `ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '',
+  `ACTION_TIMING` varchar(6) NOT NULL DEFAULT '',
+  `ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL,
+  `ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL,
+  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '',
+  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '',
+  `CREATED` datetime DEFAULT NULL,
   `SQL_MODE` longtext NOT NULL,
   `DEFINER` longtext NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -12965,11 +15078,70 @@ ERROR 42S02: Unknown table 'parameters' in information_schema
 
 Testcase 3.2.20.1:
 --------------------------------------------------------------------------------
-
-checking a table that will be implemented later
------------------------------------------------
 DESC referential_constraints;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+USE information_schema;
+DESC referential_constraints;
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+SHOW CREATE TABLE referential_constraints;
+Table	Create Table
+REFERENTIAL_CONSTRAINTS	CREATE TEMPORARY TABLE `REFERENTIAL_CONSTRAINTS` (
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `UNIQUE_CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `MATCH_OPTION` varchar(64) NOT NULL DEFAULT '',
+  `UPDATE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `DELETE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `REFERENCED_TABLE_NAME` varchar(64) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
+SELECT COUNT(*) FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+COUNT(*)
+11
+SELECT * FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 
 *** End of Data Dictionary Tests ***
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result
index 50caa20e8c7..ab4508fb302 100644
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -9,7 +9,7 @@ CREATE TABLE t1_values
 id BIGINT AUTO_INCREMENT,
 select_id BIGINT,
 PRIMARY KEY(id)
-) ENGINE = 'MEMORY' ;
+) ENGINE = <engine_to_be_tested>;
 ALTER TABLE t1_values ADD my_char_30        CHAR(30);
 ALTER TABLE t1_values ADD my_varchar_1000   VARCHAR(1000);
 ALTER TABLE t1_values ADD my_binary_30      BINARY(30);
@@ -123,10 +123,8 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = 1758;
-
-some statements disabled because of
-Bug#12440: CAST(data type DOUBLE AS TIME) strange results
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = +1.758E+3;
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -135,29 +133,20 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_binary_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '-3333.3333';
-
-some statements disabled because of
-Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = -0.33333333E+4;
 
 "Attention: CAST --> SIGNED INTEGER
-            The file with expected results suffers from
-            Bug#5083 Big integer values are inserted as negative into 
-                     decimal/string columns
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Both have the status: To be fixed later"
---------------------------------------------------------------------------------
-
-some statements disabled because of
-Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result
+            Status: To be fixed later"
 --------------------------------------------------------------------------------
 
 "Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5083 5913 9809"
+            The file with expected results suffers from Bug 5913"
 --------------------------------------------------------------------------------
 
 some statements disabled because of
-Bugs#8663: cant use bgint unsigned as input to cast
+Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
 SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values';
@@ -175,11 +164,6 @@ SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values';
-
-"Attention: IF(my_year IS NULL, ...
-            The file with expected results suffers from 
-            Bug#11689. successful CREATE VIEW but SELECT on view fails."
---------------------------------------------------------------------------------
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_varchar_1000),
@@ -202,7 +186,7 @@ SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
 
 "Attention: LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', <numeric column>)
-            The file with expected results suffers from Bug 10963 11728"
+            The file with expected results suffers from Bug 10963"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
 because there are 32/64 Bit differences
 --------------------------------------------------------------------------------
@@ -216,8 +200,9 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
+SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select = 
-'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
+'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -299,19 +284,19 @@ SET sql_mode = '';
 --------------------------------------------------------------------------------
 CREATE VIEW v1 AS SELECT my_char_30, id FROM t1_values;
 SELECT my_char_30, id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL;
+WHERE select_id = 190 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL);
+WHERE select_id = 190 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values;
 SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL;
+WHERE select_id = 189 OR select_id IS NULL order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -323,7 +308,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select concat(_latin1'A',`t1_values`.`my_char_30`) AS `CONCAT('A',my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL);
+WHERE select_id = 189 OR select_id IS NULL) order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -337,13 +322,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL;
+WHERE select_id = 188 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varbinary_1000`) AS `LTRIM(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL);
+WHERE select_id = 188 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -351,13 +336,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL;
+WHERE select_id = 187 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_binary_30`) AS `LTRIM(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL);
+WHERE select_id = 187 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -365,13 +350,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL;
+WHERE select_id = 186 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varchar_1000`) AS `LTRIM(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL);
+WHERE select_id = 186 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -379,13 +364,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL;
+WHERE select_id = 185 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_char_30`) AS `LTRIM(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL);
+WHERE select_id = 185 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -393,13 +378,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL;
+WHERE select_id = 184 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varbinary_1000`) AS `LOWER(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL);
+WHERE select_id = 184 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -407,13 +392,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL;
+WHERE select_id = 183 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_binary_30`) AS `LOWER(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL);
+WHERE select_id = 183 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -421,13 +406,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL;
+WHERE select_id = 182 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LOWER(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL);
+WHERE select_id = 182 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -435,13 +420,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL;
+WHERE select_id = 181 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_char_30`) AS `LOWER(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL);
+WHERE select_id = 181 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -449,13 +434,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL;
+WHERE select_id = 180 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_decimal`) AS `LOCATE('-', ' - -ABC', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL);
+WHERE select_id = 180 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -463,13 +448,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL;
+WHERE select_id = 179 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_double`) AS `LOCATE('-', ' - -ABC', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL);
+WHERE select_id = 179 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -477,13 +462,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL;
+WHERE select_id = 178 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_bigint`) AS `LOCATE('-', ' - -ABC', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL);
+WHERE select_id = 178 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -491,13 +476,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL;
+WHERE select_id = 177 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varbinary_1000`,3) AS `LOCATE('-', my_varbinary_1000, 3)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL);
+WHERE select_id = 177 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -505,13 +490,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL;
+WHERE select_id = 176 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_binary_30`,3) AS `LOCATE('-', my_binary_30, 3)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL);
+WHERE select_id = 176 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -519,13 +504,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL;
+WHERE select_id = 175 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varchar_1000`,3) AS `LOCATE('-', my_varchar_1000, 3)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL);
+WHERE select_id = 175 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -533,13 +518,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL;
+WHERE select_id = 174 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_char_30`,3) AS `LOCATE('-', my_char_30, 3)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL);
+WHERE select_id = 174 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -547,13 +532,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL;
+WHERE select_id = 173 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varbinary_1000, my_binary_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL);
+WHERE select_id = 173 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -561,13 +546,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL;
+WHERE select_id = 172 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varbinary_1000, my_varchar_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL);
+WHERE select_id = 172 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -575,13 +560,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL;
+WHERE select_id = 171 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varbinary_1000, my_char_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL);
+WHERE select_id = 171 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -589,13 +574,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL;
+WHERE select_id = 170 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varbinary_1000, my_varbinary_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL);
+WHERE select_id = 170 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -603,13 +588,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL;
+WHERE select_id = 169 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_binary_30, my_varbinary_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL);
+WHERE select_id = 169 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -617,13 +602,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL;
+WHERE select_id = 168 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_binary_30, my_varchar_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL);
+WHERE select_id = 168 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -631,13 +616,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL;
+WHERE select_id = 167 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_binary_30, my_char_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL);
+WHERE select_id = 167 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -645,13 +630,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL;
+WHERE select_id = 166 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_binary_30, my_binary_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL);
+WHERE select_id = 166 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -659,13 +644,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL;
+WHERE select_id = 165 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varchar_1000, my_varbinary_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL);
+WHERE select_id = 165 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -673,13 +658,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL;
+WHERE select_id = 164 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varchar_1000, my_binary_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL);
+WHERE select_id = 164 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -687,13 +672,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL;
+WHERE select_id = 163 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varchar_1000, my_char_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL);
+WHERE select_id = 163 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -701,13 +686,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL;
+WHERE select_id = 162 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varchar_1000, my_varchar_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL);
+WHERE select_id = 162 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -715,13 +700,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL;
+WHERE select_id = 161 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_char_30, my_varbinary_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL);
+WHERE select_id = 161 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -729,13 +714,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL;
+WHERE select_id = 160 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_char_30, my_binary_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL);
+WHERE select_id = 160 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -743,13 +728,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL;
+WHERE select_id = 159 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_char_30, my_varchar_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL);
+WHERE select_id = 159 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -757,13 +742,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values;
 SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL;
+WHERE select_id = 158 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_char_30, my_char_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL);
+WHERE select_id = 158 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -771,13 +756,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL;
+WHERE select_id = 157 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varbinary_1000`) AS `LOCATE('char', my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL);
+WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -785,13 +770,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL;
+WHERE select_id = 156 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_binary_30`) AS `LOCATE('char', my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL);
+WHERE select_id = 156 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -799,13 +784,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL;
+WHERE select_id = 155 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varchar_1000`) AS `LOCATE('char', my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL);
+WHERE select_id = 155 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -813,46 +798,46 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL;
+WHERE select_id = 154 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `LOCATE('char', my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL);
+WHERE select_id = 154 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../log/current_test'), id FROM t1_values;
-SELECT LOAD_FILE('../log/current_test'), id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL;
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: memory_func_view
+CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
+SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+WHERE select_id = 153 OR select_id IS NULL order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: memory_func_view
+äÄ@
 	2
-CURRENT_TEST: memory_func_view
+äÄ@
 	3
-CURRENT_TEST: memory_func_view
+äÄ@
 	4
-CURRENT_TEST: memory_func_view
+äÄ@
 	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../log/current_test') AS `LOAD_FILE('../log/current_test')`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL);
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: memory_func_view
+WHERE select_id = 153 OR select_id IS NULL) order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: memory_func_view
+äÄ@
 	2
-CURRENT_TEST: memory_func_view
+äÄ@
 	3
-CURRENT_TEST: memory_func_view
+äÄ@
 	4
-CURRENT_TEST: memory_func_view
+äÄ@
 	5
 DROP VIEW v1;
 
@@ -861,13 +846,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL;
+WHERE select_id = 152 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varbinary_1000`) AS `LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL);
+WHERE select_id = 152 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -875,13 +860,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL;
+WHERE select_id = 151 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_binary_30`) AS `LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL);
+WHERE select_id = 151 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -889,13 +874,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL;
+WHERE select_id = 150 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varchar_1000`) AS `LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL);
+WHERE select_id = 150 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -903,19 +888,19 @@ CREATE VIEW v1 AS SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL;
+WHERE select_id = 149 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_char_30`) AS `LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL);
+WHERE select_id = 149 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values;
 SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL;
+WHERE select_id = 148 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -930,7 +915,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL);
+WHERE select_id = 148 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -945,7 +930,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values;
 SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL;
+WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -957,7 +942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varbinary_1000`,2) AS `LEFT(my_varbinary_1000, 2)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL);
+WHERE select_id = 147 OR select_id IS NULL) order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -969,7 +954,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values;
 SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL;
+WHERE select_id = 146 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -981,7 +966,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL);
+WHERE select_id = 146 OR select_id IS NULL) order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -993,7 +978,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values;
 SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL;
+WHERE select_id = 145 OR select_id IS NULL order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1005,7 +990,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varchar_1000`,2) AS `LEFT(my_varchar_1000, 2)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL);
+WHERE select_id = 145 OR select_id IS NULL) order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1017,7 +1002,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values;
 SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL;
+WHERE select_id = 144 OR select_id IS NULL order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1029,7 +1014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_char_30`,2) AS `LEFT(my_char_30, 2)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL);
+WHERE select_id = 144 OR select_id IS NULL) order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1043,13 +1028,13 @@ CREATE VIEW v1 AS SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL;
+WHERE select_id = 143 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LCASE(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL);
+WHERE select_id = 143 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1057,13 +1042,13 @@ CREATE VIEW v1 AS SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values;
 SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL;
+WHERE select_id = 142 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `INSTR(my_char_30, 'char')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL);
+WHERE select_id = 142 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1071,7 +1056,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL;
+WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1083,7 +1068,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varbinary_1000`) AS `BIT_LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL);
+WHERE select_id = 141 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1097,7 +1082,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL;
+WHERE select_id = 140 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1109,7 +1094,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL);
+WHERE select_id = 140 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1123,7 +1108,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL;
+WHERE select_id = 139 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1135,7 +1120,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varchar_1000`) AS `BIT_LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL);
+WHERE select_id = 139 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1149,7 +1134,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL;
+WHERE select_id = 138 OR select_id IS NULL order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1161,7 +1146,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_char_30`) AS `BIT_LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL);
+WHERE select_id = 138 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1175,7 +1160,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values;
 SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL;
+WHERE select_id = 137 OR select_id IS NULL order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1187,7 +1172,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_year`,_latin1'IS_NULL') AS `IFNULL(my_year,'IS_NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL);
+WHERE select_id = 137 OR select_id IS NULL) order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1201,7 +1186,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values;
 SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL;
+WHERE select_id = 136 OR select_id IS NULL order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1213,7 +1198,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_time`,_latin1'IS_NULL') AS `IFNULL(my_time,'IS_NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL);
+WHERE select_id = 136 OR select_id IS NULL) order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1227,7 +1212,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values;
 SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL;
+WHERE select_id = 135 OR select_id IS NULL order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1239,7 +1224,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_timestamp`,_latin1'IS_NULL') AS `IFNULL(my_timestamp,'IS_NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL);
+WHERE select_id = 135 OR select_id IS NULL) order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1253,7 +1238,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values;
 SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL;
+WHERE select_id = 134 OR select_id IS NULL order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1265,7 +1250,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_date`,_latin1'IS_NULL') AS `IFNULL(my_date,'IS_NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL);
+WHERE select_id = 134 OR select_id IS NULL) order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1279,7 +1264,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values;
 SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL;
+WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1291,7 +1276,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_datetime`,_latin1'IS_NULL') AS `IFNULL(my_datetime,'IS_NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL);
+WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1305,7 +1290,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values;
 SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL;
+WHERE select_id = 132 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1317,7 +1302,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_double`,_latin1'IS_NULL') AS `IFNULL(my_double,'IS_NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL);
+WHERE select_id = 132 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1331,7 +1316,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values;
 SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL;
+WHERE select_id = 131 OR select_id IS NULL order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1343,7 +1328,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_decimal`,_latin1'IS_NULL') AS `IFNULL(my_decimal,'IS_NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL);
+WHERE select_id = 131 OR select_id IS NULL) order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1357,7 +1342,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values;
 SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL;
+WHERE select_id = 130 OR select_id IS NULL order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1369,7 +1354,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_bigint`,_latin1'IS_NULL') AS `IFNULL(my_bigint,'IS_NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL);
+WHERE select_id = 130 OR select_id IS NULL) order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1383,7 +1368,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL;
+WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1395,7 +1380,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varbinary_1000`,_latin1'IS_NULL') AS `IFNULL(my_varbinary_1000,'IS_NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL);
+WHERE select_id = 129 OR select_id IS NULL) order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1409,7 +1394,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values;
 SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL;
+WHERE select_id = 128 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1421,7 +1406,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,_latin1'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL);
+WHERE select_id = 128 OR select_id IS NULL) order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1435,7 +1420,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values;
 SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL;
+WHERE select_id = 127 OR select_id IS NULL order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1447,7 +1432,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varchar_1000`,_latin1'IS_NULL') AS `IFNULL(my_varchar_1000,'IS_NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL);
+WHERE select_id = 127 OR select_id IS NULL) order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1461,7 +1446,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values;
 SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL;
+WHERE select_id = 126 OR select_id IS NULL order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1473,7 +1458,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_char_30`,_latin1'IS_NULL') AS `IFNULL(my_char_30,'IS_NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL);
+WHERE select_id = 126 OR select_id IS NULL) order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1487,7 +1472,7 @@ CREATE VIEW v1 AS SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values;
 SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL;
+WHERE select_id = 125 OR select_id IS NULL order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1501,7 +1486,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL);
+WHERE select_id = 125 OR select_id IS NULL) order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1516,7 +1501,7 @@ CREATE VIEW v1 AS SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values;
 SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL;
+WHERE select_id = 124 OR select_id IS NULL order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1530,7 +1515,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL);
+WHERE select_id = 124 OR select_id IS NULL) order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1545,7 +1530,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL;
+WHERE select_id = 123 OR select_id IS NULL order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1559,7 +1544,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL);
+WHERE select_id = 123 OR select_id IS NULL) order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1574,7 +1559,7 @@ CREATE VIEW v1 AS SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values;
 SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL;
+WHERE select_id = 122 OR select_id IS NULL order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1588,7 +1573,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL);
+WHERE select_id = 122 OR select_id IS NULL) order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1603,7 +1588,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values;
 SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL;
+WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1617,7 +1602,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL);
+WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1632,7 +1617,7 @@ CREATE VIEW v1 AS SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values;
 SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL;
+WHERE select_id = 120 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1646,7 +1631,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL);
+WHERE select_id = 120 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1661,7 +1646,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values;
 SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL;
+WHERE select_id = 119 OR select_id IS NULL order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1675,7 +1660,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL);
+WHERE select_id = 119 OR select_id IS NULL) order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1690,7 +1675,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values;
 SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL;
+WHERE select_id = 118 OR select_id IS NULL order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1704,7 +1689,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL);
+WHERE select_id = 118 OR select_id IS NULL) order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1719,7 +1704,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL;
+WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1733,7 +1718,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL);
+WHERE select_id = 117 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1748,7 +1733,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL;
+WHERE select_id = 116 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1762,7 +1747,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL);
+WHERE select_id = 116 OR select_id IS NULL) order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1777,7 +1762,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL;
+WHERE select_id = 115 OR select_id IS NULL order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1791,7 +1776,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL);
+WHERE select_id = 115 OR select_id IS NULL) order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1806,7 +1791,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values;
 SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL;
+WHERE select_id = 114 OR select_id IS NULL order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1820,7 +1805,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL);
+WHERE select_id = 114 OR select_id IS NULL) order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1835,7 +1820,7 @@ CREATE VIEW v1 AS SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values;
 SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL;
+WHERE select_id = 113 OR select_id IS NULL order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1847,7 +1832,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_year`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_year, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL);
+WHERE select_id = 113 OR select_id IS NULL) order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1861,7 +1846,7 @@ CREATE VIEW v1 AS SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values;
 SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL;
+WHERE select_id = 112 OR select_id IS NULL order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1873,7 +1858,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_time`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_time, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL);
+WHERE select_id = 112 OR select_id IS NULL) order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1887,7 +1872,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL;
+WHERE select_id = 111 OR select_id IS NULL order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1899,7 +1884,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_timestamp`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL);
+WHERE select_id = 111 OR select_id IS NULL) order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1913,7 +1898,7 @@ CREATE VIEW v1 AS SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values;
 SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL;
+WHERE select_id = 110 OR select_id IS NULL order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1925,7 +1910,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_date`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_date, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL);
+WHERE select_id = 110 OR select_id IS NULL) order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1939,7 +1924,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values;
 SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL;
+WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1951,7 +1936,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_datetime`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL);
+WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1965,7 +1950,7 @@ CREATE VIEW v1 AS SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values;
 SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL;
+WHERE select_id = 108 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1977,7 +1962,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_double`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_double, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL);
+WHERE select_id = 108 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1991,7 +1976,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values;
 SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL;
+WHERE select_id = 107 OR select_id IS NULL order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2003,7 +1988,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_decimal`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL);
+WHERE select_id = 107 OR select_id IS NULL) order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2017,7 +2002,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values;
 SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL;
+WHERE select_id = 106 OR select_id IS NULL order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2029,7 +2014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_bigint`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL);
+WHERE select_id = 106 OR select_id IS NULL) order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2043,7 +2028,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL;
+WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2055,7 +2040,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varbinary_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL);
+WHERE select_id = 105 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2069,7 +2054,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL;
+WHERE select_id = 104 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2086,7 +2071,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_binary_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL);
+WHERE select_id = 104 OR select_id IS NULL) order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2105,7 +2090,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL;
+WHERE select_id = 103 OR select_id IS NULL order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2117,7 +2102,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varchar_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL);
+WHERE select_id = 103 OR select_id IS NULL) order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2131,7 +2116,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values;
 SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL;
+WHERE select_id = 102 OR select_id IS NULL order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2146,7 +2131,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_char_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL);
+WHERE select_id = 102 OR select_id IS NULL) order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2163,7 +2148,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL;
+WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2175,7 +2160,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using koi8r) AS `CONVERT(my_varbinary_1000 USING koi8r)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL);
+WHERE select_id = 101 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2189,7 +2174,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING koi8r), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL;
+WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2201,7 +2186,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL);
+WHERE select_id = 100 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2215,7 +2200,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING koi8r), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL;
+WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2227,7 +2212,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL);
+WHERE select_id = 99 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2241,7 +2226,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING koi8r), 
 my_char_30, id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL;
+WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2253,7 +2238,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL);
+WHERE select_id = 98 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2267,7 +2252,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING utf8), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL;
+WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2279,7 +2264,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using utf8) AS `CONVERT(my_varbinary_1000 USING utf8)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL);
+WHERE select_id = 97 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2293,7 +2278,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING utf8), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL;
+WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2305,7 +2290,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL);
+WHERE select_id = 96 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2319,7 +2304,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING utf8), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL;
+WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2331,7 +2316,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using utf8) AS `CONVERT(my_varchar_1000 USING utf8)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL);
+WHERE select_id = 95 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2345,7 +2330,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL;
+WHERE select_id = 94 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2357,7 +2342,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using utf8) AS `CONVERT(my_char_30 USING utf8)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL);
+WHERE select_id = 94 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2371,7 +2356,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL;
+WHERE select_id = 93 OR select_id IS NULL order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2383,7 +2368,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as unsigned) AS `CAST(my_year AS UNSIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL);
+WHERE select_id = 93 OR select_id IS NULL) order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2397,7 +2382,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL;
+WHERE select_id = 92 OR select_id IS NULL order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2415,7 +2400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL);
+WHERE select_id = 92 OR select_id IS NULL) order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2435,7 +2420,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL;
+WHERE select_id = 91 OR select_id IS NULL order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2453,7 +2438,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL);
+WHERE select_id = 91 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2473,7 +2458,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL;
+WHERE select_id = 90 OR select_id IS NULL order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2490,7 +2475,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL);
+WHERE select_id = 90 OR select_id IS NULL) order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2509,7 +2494,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL;
+WHERE select_id = 89 OR select_id IS NULL order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2526,7 +2511,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL);
+WHERE select_id = 89 OR select_id IS NULL) order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2545,7 +2530,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL;
+WHERE select_id = 88 OR select_id IS NULL order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2561,7 +2546,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL);
+WHERE select_id = 88 OR select_id IS NULL) order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2579,7 +2564,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL;
+WHERE select_id = 87 OR select_id IS NULL order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2591,7 +2576,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL);
+WHERE select_id = 87 OR select_id IS NULL) order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2605,7 +2590,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL;
+WHERE select_id = 86 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2622,7 +2607,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL);
+WHERE select_id = 86 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2641,7 +2626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL;
+WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2659,7 +2644,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL);
+WHERE select_id = 85 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2679,7 +2664,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL;
+WHERE select_id = 84 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2696,7 +2681,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL);
+WHERE select_id = 84 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2715,7 +2700,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL;
+WHERE select_id = 83 OR select_id IS NULL order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2732,7 +2717,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL);
+WHERE select_id = 83 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2751,7 +2736,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL;
+WHERE select_id = 82 OR select_id IS NULL order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2763,7 +2748,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as signed) AS `CAST(my_year AS SIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL);
+WHERE select_id = 82 OR select_id IS NULL) order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2777,7 +2762,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL;
+WHERE select_id = 81 OR select_id IS NULL order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2794,7 +2779,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL);
+WHERE select_id = 81 OR select_id IS NULL) order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2813,7 +2798,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL;
+WHERE select_id = 80 OR select_id IS NULL order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2831,7 +2816,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL);
+WHERE select_id = 80 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2851,7 +2836,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL;
+WHERE select_id = 79 OR select_id IS NULL order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2868,7 +2853,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL);
+WHERE select_id = 79 OR select_id IS NULL) order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2887,7 +2872,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL;
+WHERE select_id = 78 OR select_id IS NULL order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2904,7 +2889,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL);
+WHERE select_id = 78 OR select_id IS NULL) order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2919,11 +2904,43 @@ Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL) order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL;
+WHERE select_id = 76 OR select_id IS NULL order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2938,7 +2955,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL);
+WHERE select_id = 76 OR select_id IS NULL) order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2955,7 +2972,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL;
+WHERE select_id = 75 OR select_id IS NULL order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2967,7 +2984,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as signed) AS `CAST(my_bigint AS SIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL);
+WHERE select_id = 75 OR select_id IS NULL) order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2981,7 +2998,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL;
+WHERE select_id = 74 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2997,7 +3014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL);
+WHERE select_id = 74 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3015,7 +3032,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL;
+WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3032,7 +3049,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL);
+WHERE select_id = 73 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3051,7 +3068,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL;
+WHERE select_id = 72 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3067,7 +3084,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL);
+WHERE select_id = 72 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3085,7 +3102,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL;
+WHERE select_id = 71 OR select_id IS NULL order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3101,7 +3118,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL);
+WHERE select_id = 71 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3119,25 +3136,25 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL;
+WHERE select_id = 70 OR select_id IS NULL order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL);
+WHERE select_id = 70 OR select_id IS NULL) order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 DROP VIEW v1;
 
 
@@ -3145,25 +3162,25 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL;
+WHERE select_id = 69 OR select_id IS NULL order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL);
+WHERE select_id = 69 OR select_id IS NULL) order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -3171,25 +3188,35 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL;
+WHERE select_id = 68 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL);
+WHERE select_id = 68 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3197,25 +3224,25 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL;
+WHERE select_id = 67 OR select_id IS NULL order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL);
+WHERE select_id = 67 OR select_id IS NULL) order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -3223,25 +3250,73 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL;
+WHERE select_id = 66 OR select_id IS NULL order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL);
+WHERE select_id = 66 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+DROP VIEW v1;
+
+
+CREATE VIEW v1 AS SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as decimal) AS `CAST(my_double AS DECIMAL)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL) order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3249,25 +3324,31 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL;
+WHERE select_id = 64 OR select_id IS NULL order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL);
+WHERE select_id = 64 OR select_id IS NULL) order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3275,25 +3356,31 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL;
+WHERE select_id = 63 OR select_id IS NULL order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL);
+WHERE select_id = 63 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3301,14 +3388,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL;
+WHERE select_id = 62 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3318,14 +3405,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL);
+WHERE select_id = 62 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3337,14 +3424,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL;
+WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	27
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3359,14 +3446,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL);
+WHERE select_id = 61 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	27
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3383,14 +3470,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL;
+WHERE select_id = 60 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3400,14 +3487,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL);
+WHERE select_id = 60 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3419,14 +3506,14 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL;
+WHERE select_id = 59 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3439,14 +3526,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL);
+WHERE select_id = 59 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3461,7 +3548,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL;
+WHERE select_id = 58 OR select_id IS NULL order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3473,7 +3560,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL);
+WHERE select_id = 58 OR select_id IS NULL) order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3487,7 +3574,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL;
+WHERE select_id = 57 OR select_id IS NULL order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3499,7 +3586,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as time) AS `CAST(my_time AS TIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL);
+WHERE select_id = 57 OR select_id IS NULL) order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3513,7 +3600,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL;
+WHERE select_id = 56 OR select_id IS NULL order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3525,7 +3612,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as time) AS `CAST(my_timestamp AS TIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL);
+WHERE select_id = 56 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3539,7 +3626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL;
+WHERE select_id = 55 OR select_id IS NULL order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3551,7 +3638,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as time) AS `CAST(my_date AS TIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL);
+WHERE select_id = 55 OR select_id IS NULL) order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3565,7 +3652,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL;
+WHERE select_id = 54 OR select_id IS NULL order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3577,7 +3664,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as time) AS `CAST(my_datetime AS TIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL);
+WHERE select_id = 54 OR select_id IS NULL) order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3587,11 +3674,45 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL) order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL;
+WHERE select_id = 52 OR select_id IS NULL order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3607,7 +3728,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL);
+WHERE select_id = 52 OR select_id IS NULL) order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3625,7 +3746,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL;
+WHERE select_id = 51 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3642,7 +3763,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as time) AS `CAST(my_varbinary_1000 AS TIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL);
+WHERE select_id = 51 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3661,7 +3782,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL;
+WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3680,7 +3801,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as time) AS `CAST(my_binary_30 AS TIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL);
+WHERE select_id = 50 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3701,7 +3822,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL;
+WHERE select_id = 49 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3718,7 +3839,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as time) AS `CAST(my_varchar_1000 AS TIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL);
+WHERE select_id = 49 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3737,7 +3858,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL;
+WHERE select_id = 48 OR select_id IS NULL order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3754,7 +3875,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as time) AS `CAST(my_char_30 AS TIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL);
+WHERE select_id = 48 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3773,7 +3894,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL;
+WHERE select_id = 47 OR select_id IS NULL order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3781,16 +3902,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL);
+WHERE select_id = 47 OR select_id IS NULL) order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3798,10 +3919,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -3809,35 +3930,31 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL;
+WHERE select_id = 46 OR select_id IS NULL order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL);
+WHERE select_id = 46 OR select_id IS NULL) order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 DROP VIEW v1;
 
 
@@ -3845,7 +3962,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL;
+WHERE select_id = 45 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3857,7 +3974,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as datetime) AS `CAST(my_timestamp AS DATETIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL);
+WHERE select_id = 45 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3871,7 +3988,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL;
+WHERE select_id = 44 OR select_id IS NULL order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3883,7 +4000,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as datetime) AS `CAST(my_date AS DATETIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL);
+WHERE select_id = 44 OR select_id IS NULL) order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3897,7 +4014,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL;
+WHERE select_id = 43 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3909,7 +4026,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as datetime) AS `CAST(my_datetime AS DATETIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL);
+WHERE select_id = 43 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3923,7 +4040,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL;
+WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3932,17 +4049,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL);
+WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3951,11 +4068,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -3963,7 +4080,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL;
+WHERE select_id = 41 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3972,17 +4089,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL);
+WHERE select_id = 41 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3991,11 +4108,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4003,7 +4120,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL;
+WHERE select_id = 40 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4012,16 +4129,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as datetime) AS `CAST(my_varbinary_1000 AS DATETIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL);
+WHERE select_id = 40 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4030,10 +4147,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4041,7 +4158,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL;
+WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4050,17 +4167,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as datetime) AS `CAST(my_binary_30 AS DATETIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL);
+WHERE select_id = 39 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4069,10 +4186,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 DROP VIEW v1;
 
@@ -4081,7 +4198,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL;
+WHERE select_id = 38 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4090,16 +4207,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as datetime) AS `CAST(my_varchar_1000 AS DATETIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL);
+WHERE select_id = 38 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4108,10 +4225,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4119,7 +4236,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL;
+WHERE select_id = 37 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4128,16 +4245,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as datetime) AS `CAST(my_char_30 AS DATETIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL);
+WHERE select_id = 37 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4146,10 +4263,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4157,7 +4274,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL;
+WHERE select_id = 36 OR select_id IS NULL order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4165,16 +4282,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL);
+WHERE select_id = 36 OR select_id IS NULL) order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4182,10 +4299,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -4193,7 +4310,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL;
+WHERE select_id = 35 OR select_id IS NULL order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4205,7 +4322,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL);
+WHERE select_id = 35 OR select_id IS NULL) order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4219,7 +4336,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL;
+WHERE select_id = 34 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4231,7 +4348,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as date) AS `CAST(my_timestamp AS DATE)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL);
+WHERE select_id = 34 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4245,7 +4362,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL;
+WHERE select_id = 33 OR select_id IS NULL order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4257,7 +4374,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as date) AS `CAST(my_date AS DATE)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL);
+WHERE select_id = 33 OR select_id IS NULL) order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4271,7 +4388,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL;
+WHERE select_id = 32 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4283,7 +4400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as date) AS `CAST(my_datetime AS DATE)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL);
+WHERE select_id = 32 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4297,7 +4414,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL;
+WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4306,16 +4423,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL);
+WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4324,10 +4441,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4335,7 +4452,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL;
+WHERE select_id = 30 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4344,16 +4461,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL);
+WHERE select_id = 30 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4362,10 +4479,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4373,7 +4490,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL;
+WHERE select_id = 29 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4382,16 +4499,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as date) AS `CAST(my_varbinary_1000 AS DATE)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL);
+WHERE select_id = 29 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4400,10 +4517,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4411,7 +4528,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL;
+WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4420,17 +4537,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as date) AS `CAST(my_binary_30 AS DATE)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL);
+WHERE select_id = 28 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4439,10 +4556,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 DROP VIEW v1;
 
@@ -4451,7 +4568,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL;
+WHERE select_id = 27 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4460,16 +4577,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as date) AS `CAST(my_varchar_1000 AS DATE)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL);
+WHERE select_id = 27 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4478,10 +4595,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4489,7 +4606,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL;
+WHERE select_id = 26 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4498,16 +4615,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as date) AS `CAST(my_char_30 AS DATE)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL);
+WHERE select_id = 26 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4516,10 +4633,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4527,7 +4644,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL;
+WHERE select_id = 25 OR select_id IS NULL order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4539,7 +4656,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset latin1) AS `CAST(my_year AS CHAR)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL);
+WHERE select_id = 25 OR select_id IS NULL) order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4553,7 +4670,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL;
+WHERE select_id = 24 OR select_id IS NULL order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4565,7 +4682,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset latin1) AS `CAST(my_time AS CHAR)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL);
+WHERE select_id = 24 OR select_id IS NULL) order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4579,7 +4696,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL;
+WHERE select_id = 23 OR select_id IS NULL order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4591,7 +4708,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset latin1) AS `CAST(my_timestamp AS CHAR)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL);
+WHERE select_id = 23 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4605,7 +4722,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL;
+WHERE select_id = 22 OR select_id IS NULL order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4617,7 +4734,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset latin1) AS `CAST(my_date AS CHAR)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL);
+WHERE select_id = 22 OR select_id IS NULL) order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4631,7 +4748,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL;
+WHERE select_id = 21 OR select_id IS NULL order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4643,7 +4760,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset latin1) AS `CAST(my_datetime AS CHAR)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL);
+WHERE select_id = 21 OR select_id IS NULL) order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4657,7 +4774,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL;
+WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4669,7 +4786,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset latin1) AS `CAST(my_double AS CHAR)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL);
+WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4683,7 +4800,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL;
+WHERE select_id = 19 OR select_id IS NULL order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4695,7 +4812,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset latin1) AS `CAST(my_decimal AS CHAR)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL);
+WHERE select_id = 19 OR select_id IS NULL) order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4709,7 +4826,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL;
+WHERE select_id = 18 OR select_id IS NULL order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4721,7 +4838,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset latin1) AS `CAST(my_bigint AS CHAR)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL);
+WHERE select_id = 18 OR select_id IS NULL) order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4735,7 +4852,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL;
+WHERE select_id = 17 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4747,7 +4864,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset latin1) AS `CAST(my_varbinary_1000 AS CHAR)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL);
+WHERE select_id = 17 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4761,7 +4878,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL;
+WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4773,7 +4890,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL);
+WHERE select_id = 16 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4787,7 +4904,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL;
+WHERE select_id = 15 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4799,7 +4916,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset latin1) AS `CAST(my_varchar_1000 AS CHAR)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL);
+WHERE select_id = 15 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4813,7 +4930,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL;
+WHERE select_id = 14 OR select_id IS NULL order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4825,7 +4942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset latin1) AS `CAST(my_char_30 AS CHAR)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL);
+WHERE select_id = 14 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4839,7 +4956,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL;
+WHERE select_id = 13 OR select_id IS NULL order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4851,7 +4968,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset binary) AS `CAST(my_year AS BINARY)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL);
+WHERE select_id = 13 OR select_id IS NULL) order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4865,7 +4982,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL;
+WHERE select_id = 12 OR select_id IS NULL order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4877,7 +4994,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset binary) AS `CAST(my_time AS BINARY)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL);
+WHERE select_id = 12 OR select_id IS NULL) order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4891,7 +5008,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL;
+WHERE select_id = 11 OR select_id IS NULL order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4903,7 +5020,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset binary) AS `CAST(my_timestamp AS BINARY)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL);
+WHERE select_id = 11 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4917,7 +5034,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL;
+WHERE select_id = 10 OR select_id IS NULL order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4929,7 +5046,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset binary) AS `CAST(my_date AS BINARY)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL);
+WHERE select_id = 10 OR select_id IS NULL) order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4943,7 +5060,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL;
+WHERE select_id = 9 OR select_id IS NULL order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4955,7 +5072,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset binary) AS `CAST(my_datetime AS BINARY)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL);
+WHERE select_id = 9 OR select_id IS NULL) order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4969,7 +5086,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL;
+WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4981,7 +5098,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset binary) AS `CAST(my_double AS BINARY)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL);
+WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4995,7 +5112,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL;
+WHERE select_id = 7 OR select_id IS NULL order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5007,7 +5124,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset binary) AS `CAST(my_decimal AS BINARY)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL);
+WHERE select_id = 7 OR select_id IS NULL) order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5021,7 +5138,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL;
+WHERE select_id = 6 OR select_id IS NULL order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5033,7 +5150,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset binary) AS `CAST(my_bigint AS BINARY)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL);
+WHERE select_id = 6 OR select_id IS NULL) order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5047,7 +5164,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL;
+WHERE select_id = 5 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5059,7 +5176,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset binary) AS `CAST(my_varbinary_1000 AS BINARY)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL);
+WHERE select_id = 5 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5073,7 +5190,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL;
+WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5085,7 +5202,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL);
+WHERE select_id = 4 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5099,7 +5216,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL;
+WHERE select_id = 3 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5111,7 +5228,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset binary) AS `CAST(my_varchar_1000 AS BINARY)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL);
+WHERE select_id = 3 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5125,7 +5242,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL;
+WHERE select_id = 2 OR select_id IS NULL order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5137,7 +5254,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset binary) AS `CAST(my_char_30 AS BINARY)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL);
+WHERE select_id = 2 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5149,7 +5266,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT sqrt(my_bigint), my_bigint, id FROM t1_values;
 SELECT sqrt(my_bigint), my_bigint, id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL;
+WHERE select_id = 1 OR select_id IS NULL order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -5163,7 +5280,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sqrt(`t1_values`.`my_bigint`) AS `sqrt(my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL);
+WHERE select_id = 1 OR select_id IS NULL) order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc.result b/mysql-test/suite/funcs_1/r/memory_storedproc.result
index 94d776c9879..402b527241f 100644
--- a/mysql-test/suite/funcs_1/r/memory_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc.result
@@ -3,19 +3,16 @@
 .                         IMPORTANT NOTICE:
 .                         -----------------
 .
-.  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
-.         for correctness!
+.  FIXME: The .result files are still NOT CHECKED for correctness!
 .
 .  FIXME: Several tests are affected by known problems around DECIMAL
-.  FIXME: and NUMERIC that needs to be checked again after WL#2984
+.  FIXME: and NUMERIC that will be checked again after WL#2984 once
 .  FIXME: has been completed. Some of them are marked in the result.
 .
-.  This .result file has been checked OK with Linux 5.0.23-bk,
-.  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
-.
-. This file has been saved although it might contain failures / wrong
-. results to be able to detect _new_ differences in the behaviour.
-. Hopefully the remaining checks can be made soon.
+. Currently (Dec 06, 2005) this .result file is checked OK for Linux
+. with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
+. Using the available Windows version 5.0.16 there are differences
+. that can be ignored (e.g. WL#2984).
 .
 --------------------------------------------------------------------------------
 	FIXME: There are subtests that are switched off due to known bugs:
@@ -99,20 +96,21 @@ USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
+f1	f2	f3	f4	f5	f6
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
 set @v1 = f1;
 SELECT @v1, @v1;
 END//
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
+@v1	@v1
+abc	abc
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 binary ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -121,12 +119,12 @@ SELECT @v1;
 END//
 CALL sp1( 34 );
 @v1
-3
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+34
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 blob ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -139,6 +137,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 int )  language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -151,6 +151,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
@@ -159,19 +161,13 @@ BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(60, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
@@ -179,56 +175,51 @@ SELECT @v1;
 END//
 CALL sp1( 17976931340000 );
 @v1
-17976931340000.000000000000000000000000000000
+17976931340000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 set("value1", "value1") ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 CALL sp1( "value1, value1" );
 f1
-value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+value1, value1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) language sql SELECT f1;
 CALL sp1( 'abc' );
@@ -278,9 +269,7 @@ SHOW PROCEDURE status like 'sp1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 DROP PROCEDURE sp1;
 
 Testcase 4.1.2:
@@ -344,13 +333,11 @@ CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  lang
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SELECT fn1( "value1" );
 fn1( "value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
+Warning	1292	Truncated incorrect DECIMAL value: 'value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -359,14 +346,11 @@ CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) langua
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 SELECT fn1( "value1, value1" );
 fn1( "value1, value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+Warning	1292	Truncated incorrect DECIMAL value: 'value1, value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -457,7 +441,7 @@ CREATE PROCEDURE sp1 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(f1 char(20) )
+sp1		CREATE PROCEDURE `sp1`(f1 char(20) )
 SELECT * from t1 where f2 = f1
 DROP PROCEDURE sp1;
 
@@ -470,7 +454,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50)
 return concat('hello, ', s, '!');
 show CREATE FUNCTION fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50)
+fn1		CREATE FUNCTION `fn1`(s char(20)) RETURNS char(50)
 return concat('hello, ', s, '!')
 DROP FUNCTION fn1;
 
@@ -514,7 +498,7 @@ CREATE PROCEDURE sp7b (a char (20), out b char(20))
 SELECT f1 into b from t1 where t1.f2= a;
 CALL sp7b('xyz', @out_param);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -527,8 +511,8 @@ END//
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -2581,12 +2565,12 @@ alter procedure sp1 sql security definer;
 alter function sp1 sql security definer;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
+sp1		CREATE PROCEDURE `sp1`()
     COMMENT 'this is a procedure'
 set @x= 3
 show CREATE FUNCTION sp1;
 Function	sql_mode	Create Function
-sp1		CREATE DEFINER=`root`@`localhost` FUNCTION `sp1`() RETURNS int(11)
+sp1		CREATE FUNCTION `sp1`() RETURNS int(11)
     COMMENT 'this is a function'
 return 4
 USE db_storedproc;
@@ -4603,9 +4587,6 @@ END begin_label//
 CALL sp1();
 @v1	@v2
 1	2
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.7:
@@ -4640,9 +4621,6 @@ declare y char;
 SELECT f1, f2 into x, y from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.9:
@@ -4725,9 +4703,9 @@ fetch cur1 into e;
 SELECT x, y, z, a, b, c, d, e;
 close cur1;
 END//
-ERROR 42000: Too big scale 255 specified for column ''. Maximum is 30.
 CALL sp6();
-ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
+x	y	z	a	b	c	d	e
+a	1	1.1	value1	1200000000000	mediumtext	2005-02-02 12:12:12	a`
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -4759,7 +4737,7 @@ BEGIN
 declare x char, integer default '0';
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0';
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -4768,7 +4746,7 @@ BEGIN
 declare x1, x2 char, integer default '0', 1;
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0', 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0', 1;
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -6010,11 +5988,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-000	000	000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6023,7 +5997,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-001	001	001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6050,11 +6024,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000	00000	00000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6063,7 +6033,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00001	00001	00001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6090,11 +6060,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000	00000000	00000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6103,7 +6069,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001	00000001	00000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6130,11 +6096,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6143,7 +6105,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000001	0000000001	0000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6161,7 +6123,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-18446744073709551615	18446744073709551615	18446744073709551615
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6170,11 +6132,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000000	00000000000000000000	00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6183,7 +6141,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000001	00000000000000000001	00000000000000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6192,11 +6150,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--9999999999	-9999999999	-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6207,11 +6161,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6220,11 +6170,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6235,11 +6181,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6250,11 +6192,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6265,11 +6203,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6280,11 +6214,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6295,11 +6225,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6326,7 +6252,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6335,7 +6261,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6344,7 +6270,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6353,7 +6279,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6362,7 +6288,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6371,7 +6297,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6407,7 +6333,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-2005-02-02 12:20:12	2005-02-02 12:20:12	2005-02-02 12:20:12
+20050202122012	20050202122012	20050202122012
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -12458,13 +12384,10 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	a	3
-Warnings:
-Warning	1265	Data truncated for column 'y' at row 3
-Warning	1265	Data truncated for column 'y' at row 1
+NULL	abaa	3
 SELECT @v1, @v2;
 @v1	@v2
-4	a
+4	a`
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12531,7 +12454,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12558,11 +12481,9 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-t
+temp
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12580,7 +12501,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
+Warning	1292	Truncated incorrect DOUBLE value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12606,9 +12527,7 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-0000-00-00 00:00:00
-Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+asd
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12652,7 +12571,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12683,8 +12602,6 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12748,8 +12665,6 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12757,8 +12672,6 @@ declare x tinyint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12766,8 +12679,6 @@ declare x tinyint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12775,8 +12686,6 @@ declare x tinyint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12784,8 +12693,6 @@ declare x tinyint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12793,8 +12700,6 @@ declare x smallint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12802,8 +12707,6 @@ declare x smallint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12811,8 +12714,6 @@ declare x smallint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12820,8 +12721,6 @@ declare x smallint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12829,8 +12728,6 @@ declare x mediumint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12838,8 +12735,6 @@ declare x mediumint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12847,8 +12742,6 @@ declare x mediumint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12856,8 +12749,6 @@ declare x mediumint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12865,8 +12756,6 @@ declare x int;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12874,8 +12763,6 @@ declare x int unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12883,8 +12770,6 @@ declare x int zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12892,8 +12777,6 @@ declare x int unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12901,8 +12784,6 @@ declare x bigint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12910,8 +12791,6 @@ declare x bigint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12919,8 +12798,6 @@ declare x bigint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12928,8 +12805,6 @@ declare x bigint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12938,7 +12813,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12947,7 +12822,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12956,7 +12831,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12965,7 +12840,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12974,7 +12849,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12983,7 +12858,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12992,7 +12867,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13001,7 +12876,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13009,8 +12884,6 @@ declare x real;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13018,8 +12891,6 @@ declare x real unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13027,8 +12898,6 @@ declare x real zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13036,8 +12905,6 @@ declare x real unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13045,8 +12912,6 @@ declare x float;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13054,8 +12919,6 @@ declare x float unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13063,8 +12926,6 @@ declare x float zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13072,8 +12933,6 @@ declare x float unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13081,8 +12940,6 @@ declare x date;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13090,8 +12947,6 @@ declare x time;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13099,8 +12954,6 @@ declare x datetime;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13108,8 +12961,6 @@ declare x timestamp;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13117,8 +12968,6 @@ declare x year;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13126,8 +12975,6 @@ declare x year(3);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13135,8 +12982,6 @@ declare x year(4);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13144,8 +12989,6 @@ declare x enum("1enum", "2enum");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13153,8 +12996,6 @@ declare x set("1set", "2set");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.38:
@@ -13802,7 +13643,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13828,7 +13669,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -15085,7 +14926,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
--46744073709551616
+0
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -15104,8 +14945,6 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -15133,10 +14972,6 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -15145,9 +14980,7 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -15156,10 +14989,7 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15178,10 +15008,6 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15190,9 +15016,7 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15201,10 +15025,7 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15240,10 +15061,7 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15279,10 +15097,7 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000000000000000000000000000000000000000000000000000000001
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15291,10 +15106,7 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15303,10 +15115,7 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000001
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15315,10 +15124,7 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15336,9 +15142,7 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15347,9 +15151,7 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15358,9 +15160,7 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15378,9 +15178,7 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15389,9 +15187,7 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15400,9 +15196,7 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15420,9 +15214,7 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15431,9 +15223,7 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15442,9 +15232,7 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15462,9 +15250,7 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15473,9 +15259,7 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15484,9 +15268,7 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15504,9 +15286,7 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15515,9 +15295,7 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15526,9 +15304,7 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15546,9 +15322,7 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15557,9 +15331,7 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15568,9 +15340,7 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15579,10 +15349,7 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2147483648
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15618,9 +15385,7 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15647,11 +15412,7 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15660,9 +15421,7 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15671,9 +15430,7 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15683,9 +15440,6 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15694,9 +15448,7 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15705,10 +15457,7 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15717,9 +15466,7 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15729,9 +15476,6 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15740,9 +15484,7 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15751,10 +15493,7 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15763,12 +15502,7 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999999999999999999999999999.999999999999999999999999999999
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15778,10 +15512,6 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15791,10 +15521,6 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15803,10 +15529,7 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15854,9 +15577,7 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15865,9 +15586,7 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15876,10 +15595,7 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15897,9 +15613,7 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15908,9 +15622,7 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15919,9 +15631,7 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15957,11 +15667,7 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15997,11 +15703,7 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
@@ -16057,7 +15759,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-25:59:59
+26:00:00
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -16066,7 +15768,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:00
+1998-01-02 01:01:01
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -16076,8 +15778,6 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -16087,8 +15787,6 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
 CREATE FUNCTION fn96( f1 char binary) returns char binary
 BEGIN
@@ -16098,8 +15796,6 @@ END//
 SELECT fn96( 'h');
 fn96( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -16221,7 +15917,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
-18400000000000000000
+-9223372036854775808
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -16230,7 +15926,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-00184000000000000000
+184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -16239,9 +15935,7 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
-00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-9220000000000000
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
@@ -16253,7 +15947,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
@@ -16265,7 +15959,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -16274,11 +15968,7 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -16287,9 +15977,7 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
@@ -16301,10 +15989,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
@@ -16316,7 +16001,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
@@ -16328,11 +16013,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
@@ -16344,9 +16025,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
@@ -16358,10 +16037,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
@@ -16373,7 +16049,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000000000000000000000000
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
@@ -16385,7 +16061,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
@@ -16397,7 +16073,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-000000000000000010000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
@@ -16409,10 +16085,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
@@ -16421,7 +16094,7 @@ SELECT f1;
 END//
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000
+-1000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
@@ -16430,10 +16103,10 @@ SELECT f1;
 END//
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000
+100000000000000000000.000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
@@ -16445,10 +16118,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp20_duz( 100000000000000000000 );
 f1
-0000000000000000000000000000000000000000000100000000000000000000
+100000000000000000000.000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-0000000000000000000000000000000000000001000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
@@ -16460,10 +16133,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
@@ -16475,10 +16145,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
@@ -16490,10 +16157,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
@@ -16505,10 +16169,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16526,9 +16187,7 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16537,9 +16196,7 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16548,9 +16205,7 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16568,9 +16223,7 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16579,9 +16232,7 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16590,9 +16241,7 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16610,9 +16259,7 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16621,9 +16268,7 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16632,9 +16277,7 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16652,9 +16295,7 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16663,9 +16304,7 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16674,9 +16313,7 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16694,9 +16331,7 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16705,9 +16340,7 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16716,9 +16349,7 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16736,9 +16367,7 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16747,9 +16376,7 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16758,9 +16385,7 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16769,10 +16394,7 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2150000000
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16799,7 +16421,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-0215000000
+215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16808,9 +16430,7 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16837,11 +16457,7 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388602
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16850,9 +16466,7 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16861,9 +16475,7 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16872,10 +16484,7 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16884,9 +16493,7 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16895,10 +16502,7 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16907,9 +16511,7 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16918,10 +16520,7 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16930,9 +16529,7 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16941,10 +16538,7 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
@@ -16953,12 +16547,7 @@ SELECT f1;
 END//
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
@@ -16967,11 +16556,7 @@ SELECT f1;
 END//
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
@@ -16980,11 +16565,7 @@ SELECT f1;
 END//
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
@@ -16993,10 +16574,7 @@ SELECT f1;
 END//
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
@@ -17005,7 +16583,7 @@ SELECT f1;
 END//
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000
+-10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
@@ -17014,7 +16592,7 @@ SELECT f1;
 END//
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
@@ -17023,7 +16601,7 @@ SELECT f1;
 END//
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
@@ -17032,7 +16610,7 @@ SELECT f1;
 END//
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -17041,9 +16619,7 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -17052,9 +16628,7 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -17063,10 +16637,7 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -17075,7 +16646,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.1
+1.10000
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -17084,9 +16655,7 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -17095,9 +16664,7 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -17106,9 +16673,7 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -17144,11 +16709,7 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-32602
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -17184,11 +16745,7 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-102
 DROP PROCEDURE IF EXISTS sp89;
 DROP PROCEDURE IF EXISTS sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -17208,7 +16765,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-25:59:59
+26:00:00.999997
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -17217,7 +16774,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:00
+1998-01-02 01:01:01.000001
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -17226,9 +16783,7 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -17237,9 +16792,7 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -17248,9 +16801,7 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -17295,7 +16846,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-2061
+61
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -17350,8 +16901,6 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -17388,9 +16937,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
+61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2033	2084	2033	2084
+61	71	61	71	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17461,9 +17010,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
+ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17606,7 +17155,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-18400000000000000000	NULL
+9223372036854775807	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17614,7 +17163,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-18400000000000000000	18400000000000000000	NULL
+9223372036854775807	9223372036854775807	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17622,7 +17171,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
-18353255926290448384	18353255926290448384	18353255926290448384
+-2	-2	-2
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17630,7 +17179,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
-18353255926290448384	18353255926290448384
+-2	-2
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17688,9 +17237,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17742,9 +17291,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17788,9 +17337,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17823,9 +17372,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17858,9 +17407,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17893,9 +17442,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17928,9 +17477,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17996,9 +17545,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -18030,9 +17579,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -18064,9 +17613,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -18098,9 +17647,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -18132,9 +17681,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -18166,9 +17715,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -18234,9 +17783,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -18268,9 +17817,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -18302,9 +17851,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -18370,9 +17919,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -18404,9 +17953,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -18438,9 +17987,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18472,9 +18021,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18540,9 +18089,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18574,9 +18123,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18642,9 +18191,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18676,9 +18225,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18744,9 +18293,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18778,9 +18327,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18812,9 +18361,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18846,9 +18395,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18880,9 +18429,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18914,9 +18463,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18948,9 +18497,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18982,9 +18531,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -19016,9 +18565,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -19050,9 +18599,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -19084,9 +18633,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -19118,9 +18667,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -19152,9 +18701,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -19186,9 +18735,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -19220,9 +18769,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -19254,9 +18803,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -19288,9 +18837,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -19322,9 +18871,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -19356,9 +18905,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
+61	61	71	61	61	71	61	61	71	61	61	71
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2061	2071	2061	2071
+61	71	61	71	61	71	61	71
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19492,9 +19041,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	a	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	a	a	a
+ah	aah	ah	aah	ah	aah	ah	aah
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19526,9 +19075,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	NULL	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	NULL	a	a
+ah	aah	ah	aah	ah	NULL	ah	aah
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19628,9 +19177,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
+1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
+1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19662,9 +19211,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19696,9 +19245,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19730,9 +19279,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19764,9 +19313,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19798,9 +19347,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19832,9 +19381,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19866,9 +19415,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19900,9 +19449,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19934,9 +19483,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19968,9 +19517,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -20002,9 +19551,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -20036,9 +19585,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -20070,9 +19619,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -20104,9 +19653,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -20138,9 +19687,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -20172,9 +19721,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -20274,9 +19823,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -20308,9 +19857,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -20376,9 +19925,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -20410,9 +19959,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -20444,9 +19993,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20478,9 +20027,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20512,9 +20061,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20546,9 +20095,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20580,9 +20129,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20614,9 +20163,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20682,9 +20231,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20716,9 +20265,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20750,9 +20299,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20818,9 +20367,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20886,9 +20435,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20914,7 +20463,7 @@ insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
 Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
+sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
@@ -20950,7 +20499,7 @@ SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
 Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
+sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
@@ -20993,7 +20542,7 @@ show warnings;
 END//
 show CREATE PROCEDURE sp4;
 Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -21041,14 +20590,14 @@ set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
 Procedure	sql_mode	Create Procedure
-sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
 END
 show CREATE PROCEDURE sp6b;
 Procedure	sql_mode	Create Procedure
-sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
@@ -21056,7 +20605,7 @@ set @y=@x;
 END
 show CREATE PROCEDURE sp6c;
 Procedure	sql_mode	Create Procedure
-sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
@@ -21242,7 +20791,7 @@ END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
+fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
@@ -21274,7 +20823,7 @@ END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
 Procedure	sql_mode	Create Procedure
-sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
+sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
index 731d5c4a8cf..903f2b3d01f 100755
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
@@ -166,7 +166,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 limit 1;
+SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -209,7 +209,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 limit 1;
+SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -544,6 +544,9 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
+Warnings:
+Note	1051	Unknown table 'tqq'
+Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()
@@ -1084,7 +1087,8 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
+where f4 >=-5000 order by f4 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1167,7 +1171,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2;
+SELECT f1, f2, f4, f5 from t2 order by f4;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1187,21 +1191,21 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
 open cur1;
 open cur2;
 BEGIN
-declare continue handler for sqlstate '02000' set count = 1;
+declare continue handler for sqlstate '02000' set count=1;
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-1-', count, newf1, newf2, newf4, newf5;
 insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-set count = 4;
+set count= 4;
 BEGIN
-while count > 0 do
+while count> 0 do
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-2-', count, newf1, newf2, newf4, newf5;
-set count = count - 1;
+set count = count- 1;
 END while;
 SELECT '-3-', count, newf1, newf2, newf4, newf4;
 END;
@@ -1270,8 +1274,10 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1302,8 +1308,10 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_10.result b/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
index 89c2fb736eb..e924cf0731a 100755
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
@@ -80,7 +80,7 @@ connect(localhost,user_1,,db_storedproc,MYSQL_PORT,MYSQL_SOCK);
 user_1@localhost	db_storedproc
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-SELECT * FROM db_storedproc.t1 LIMIT 1;
+SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
 END//
 CREATE FUNCTION fn31105(n INT) RETURNS INT
 BEGIN
@@ -209,7 +209,7 @@ CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -226,7 +226,7 @@ CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -246,7 +246,7 @@ CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -279,7 +279,7 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0102.result b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
index 0a640201d76..1319fc3e361 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
@@ -195,6 +195,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
+BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 insert into t1 (f2) values ('insert 3.5.1.7');
 select * from t1;
 f1	f2	f3
@@ -203,12 +206,14 @@ update t1 set f2='update 3.5.1.7';
 select * from t1;
 f1	f2	f3
 NULL	update 3.5.1.7	42
-select trigger_name from information_schema.triggers;
+select trigger_name from information_schema.triggers order by trigger_name;
 trigger_name
 trg5_1
 trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
 drop trigger trg5_1;
 drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 drop table t1;
 
 Testcase 3.5.1.8:
@@ -310,7 +315,7 @@ insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 select @test_var1, @test_var2, @test_var3;
 @test_var1	@test_var2	@test_var3
 trig1	trig2	trig3
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -320,7 +325,7 @@ trig2	3
 select * from trig_db3.t1;
 f1	f2
 trig3	4
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -345,10 +350,10 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1 
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-trig_db1	trig1_b	t1
 trig_db1	trig1_a	t1
+trig_db1	trig1_b	t1
 trig_db2	trig2	t1
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03.result b/mysql-test/suite/funcs_1/r/memory_trig_03.result
index 7309e403cff..ae7b83f820d 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03.result
@@ -78,16 +78,16 @@ Testcase 3.5.3.2/6:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 grant ALL  on *.* to test_noprivs@localhost;
-revoke SUPER  on *.* from test_noprivs@localhost;
+revoke TRIGGER on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -100,10 +100,10 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 select current_user;
@@ -118,15 +118,12 @@ root@localhost
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
 ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1'
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-
-note: once 15166 is fixed a similar case for SELECT needs to be added
----------------------------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -135,10 +132,10 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -147,12 +144,12 @@ use priv_db;
 drop trigger trg1_2;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 drop trigger trg1_2;
 
 Testcase 3.5.3.7a:
@@ -162,12 +159,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke UPDATE  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
+grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -176,24 +173,24 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-select f1 from t1;
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
 use priv_db;
 select current_user;
@@ -201,236 +198,220 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 drop trigger trg4a_2;
 
 Testcase 3.5.3.7b:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs;
+grant TRIGGER on *.* to test_noprivs;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
 insert 3.5.3.7-1b
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2b';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
 insert 3.5.3.7-2b
-update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-select f1 from t1;
-f1
-insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
+update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
+select f1 from t1 order by f1;
+f1
+insert 3.5.3.2-no
+insert 3.5.3.6-no
+insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
 trig 3.5.3.7-2b
+update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
 -----------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
+update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2c';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
 trig 3.5.3.7-2c
+update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
-trig 3.5.3.7-2c
 insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
+trig 3.5.3.7-2c
+update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2d';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
-trig 3.5.3.7-2c
 insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
+trig 3.5.3.7-2c
 trig 3.5.3.7-2d
+update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -440,12 +421,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke SELECT  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, SELECT on *.* to test_yesprivs@localhost;
+grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -454,7 +435,7 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 
 Trigger create disabled - should fail - Bug 8887
 ------------------------------------------------
@@ -473,17 +454,13 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-2a
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2a');
 select @test_var;
 @test_var
@@ -493,26 +470,26 @@ drop trigger trg5a_2;
 Testcase: 3.5.3.8b
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke SELECT  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -529,7 +506,7 @@ before trig 3.5.3.8-1b
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -539,10 +516,6 @@ insert into t1 (f1) values ('insert 3.5.3.8-2b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-2b
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.* to test_yesprivs@localhost;
 update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 select @test_var;
 @test_var
@@ -552,26 +525,26 @@ drop trigger trg5b_2;
 Testcase 3.5.3.8c:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -584,16 +557,12 @@ before trig 3.5.3.8-1c
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2c';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2c');
 select @test_var;
 @test_var
@@ -603,24 +572,24 @@ drop trigger trg5c_2;
 Testcase: 3.5.3.8d:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
@@ -634,16 +603,12 @@ before trig 3.5.3.8-1d
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2d';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2d');
 select @test_var;
 @test_var
@@ -658,12 +623,12 @@ drop table if exists t2;
 create table t1 (f1 int) engine= memory;
 create table t2 (f2 int) engine= memory;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t2` TO 'test_yesprivs'@'localhost'
 GRANT SELECT, UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -679,10 +644,10 @@ ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 4
-select f2 from t2;
+select f2 from t2 order by f2;
 f2
 4
 use priv_db;
@@ -695,11 +660,11 @@ ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
 2
-select f2 from t2;
+4
+select f2 from t2 order by f2;
 f2
 1
 use priv_db;
@@ -712,12 +677,12 @@ ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 1
 select @aaa;
@@ -733,13 +698,13 @@ ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
+1
+1
 2
-1
-1
-select f2 from t2;
+4
+select f2 from t2 order by f2;
 f2
 drop database if exists priv_db;
 drop user test_yesprivs@localhost;
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0407.result b/mysql-test/suite/funcs_1/r/memory_trig_0407.result
index 588039983e2..005fd43fb5b 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0407.result
@@ -89,18 +89,18 @@ Create trigger trg1 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.1';
 Use db_drop;
 Insert into t1 values ('Insert error 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
 Insert into t1 values ('Insert no trigger 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
-Trigger 3.5.4.1
 Insert no trigger 3.5.4.1
+Trigger 3.5.4.1
 drop trigger trg1;
 drop database if exists db_drop;
 revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -254,7 +254,7 @@ use dbtest_one;
 Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Select * from dbtest_two.t2;
+Select * from dbtest_two.t2 order by f1;
 f1
 1st Insert 3.5.
 2nd Insert 3.5.
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_08.result b/mysql-test/suite/funcs_1/r/memory_trig_08.result
index 9a14845d0eb..ddc990d1919 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result
@@ -135,10 +135,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -146,7 +146,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -158,14 +158,22 @@ select @test_var;
 3.5.8.4 - single SQL - insert
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
+BEGIN
 insert into db_test.t1_i 
 values (new.f120, new.f136, new.f144, new.f163);
+END//
+Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
+f120	f122	f136	f144	f163
+1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
+select * from db_test.t1_i order by i120;
+i120	i136	i144	i163
+1	00222	0000023456	1.050000000000000000000000000000
 update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 I	Test 3.5.8.4-Single Insert	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
 I	00222	0000023456	1.050000000000000000000000000000
@@ -182,14 +190,14 @@ update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 U	Test 3.5.8.4-Single Update	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 
 3.5.8.3/4 - single SQL - delete
 -------------------------------
@@ -202,7 +210,7 @@ f122='Test 3.5.8.4-Single Delete'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 D	Test 3.5.8.4-Single Delete	00444	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -249,29 +257,29 @@ END//
 set @test_var='Empty', @test_var2=0;
 Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	one	2nd else
 Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	two	2nd else
 D	Test 3.5.8.5-if	00102	two	2nd else
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd if
 D	Test 3.5.8.5-if	00101	three	2nd if
 D	Test 3.5.8.5-if	00102	three	2nd if
-d	Test 3.5.8.5-if	00010	three	2nd if
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00101	three	2nd else
 D	Test 3.5.8.5-if	00102	three	2nd else
-d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00103	three	2nd else
 create trigger trg3 before update on tb3 for each row
 BEGIN
@@ -331,20 +339,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -354,34 +362,34 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
 B	Test 3.5.8.5-case	00191	0000000016	1*0000099999
 C	Test 3.5.8.5-case	00200	0000000001	1*0000099999
-1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 Insert into tb3 (f120, f122, f136, f144) 
 values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 create trigger trg3a before update on tb3 for each row
 BEGIN
 CASE
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_09.result b/mysql-test/suite/funcs_1/r/memory_trig_09.result
index c1b9ec6d33f..0a25dbfc1ca 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result
@@ -116,7 +116,7 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
 Insert into tb3 (f122, f136, f163) 
 values ('Test 3.5.9.3', 7, 123.17);
 Update tb3 Set f136=8 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -132,7 +132,7 @@ a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 @tr_var_b4_136, @tr_var_b4_163;
@@ -172,7 +172,7 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
 Insert into tb3 (f122, f136, f151, f163) 
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%';
+where f122 like 'Test 3.5.9.4%' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -190,9 +190,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig';
+where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
index b93c67e894b..451041575af 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
@@ -83,7 +83,7 @@ Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1);
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%';
+from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -97,7 +97,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -111,7 +111,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -142,7 +142,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
-Select * from tb_load limit 10;
+Select * from tb_load order by f1 limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -237,7 +237,7 @@ insert into t3 (f1) values (new.f1+1000);
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3;
+select * from t3 order by f1;
 f1
 12
 102
@@ -272,17 +272,17 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1;
+select * from t1 order by f1;
 f1
 0
 1
-select * from t2;
+select * from t2 order by f2;
 f2
 2
-select * from t3;
+select * from t3 order by f3;
 f3
 3
-select * from t4;
+select * from t4 order by f4;
 f4
 4
 drop trigger tr1;
@@ -369,7 +369,7 @@ create table t4 (f4 tinyint) engine = memory;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL
+  `f1` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values (1);
 create trigger tr1 after insert on t1
@@ -381,16 +381,16 @@ for each row insert into t4 (f4) values (new.f3+1000);
 set autocommit=0;
 start transaction;
 insert into t1 values (1);
-ERROR 22003: Out of range value adjusted for column 'f4' at row 1
+ERROR 22003: Out of range value for column 'f4' at row 1
 commit;
-select * from t1;
+select * from t1 order by f1;
 f1
 1
 1
-select * from t2;
+select * from t2 order by f2;
 f2
 2
-select * from t3;
+select * from t3 order by f3;
 f3
 3
 drop trigger tr1;
diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
index 516eef24439..9267cc5a98b 100644
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -1930,7 +1930,7 @@ f1	f2
 2	two
 4	four
 INSERT INTO v1 VALUES(2,'two');
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 INSERT INTO v1 VALUES(3,'three');
 affected rows: 1
 INSERT INTO v1 VALUES(6,'six');
@@ -1949,7 +1949,7 @@ f1	f2
 3	three
 4	four
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
@@ -1997,12 +1997,12 @@ DROP VIEW  IF EXISTS test.v1;
 CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
 ENGINE = memory;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 A	1
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	1
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -2010,7 +2010,7 @@ affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 INSERT INTO v1 VALUES('B',2);
 affected rows: 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -2018,7 +2018,7 @@ UPDATE v1 SET f2 = 4;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 INSERT INTO v1 VALUES('B',3);
 ERROR HY000: CHECK OPTION failed 'test.v1'
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -10585,7 +10585,7 @@ f1	f2	f3	f4
 DELETE FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10654,7 +10654,7 @@ DROP VIEW v1;
 CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10989,11 +10989,11 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(5)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11013,12 +11013,12 @@ f4x	char(5)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4x	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(10);
@@ -11036,14 +11036,14 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(10)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
 2	NULL	<-- 10 -->	t1 2
 2	NULL	<-- 10 -->	v1 2
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11072,7 +11072,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(8)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11081,7 +11081,7 @@ f1	f2	f4	report
 2	NULL	<-- 10 -	v1 2
 3	NULL	<-- 10 -	t1 3
 3	NULL	<-- 10 -	v1 3
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11105,7 +11105,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11116,7 +11116,7 @@ f1	f2	f4	report
 3	NULL	<-- 10 -	v1 3
 4	NULL	<------ 20 -------->	t1 4
 4	NULL	<------ 20 -------->	v1 4
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11144,7 +11144,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11157,7 +11157,7 @@ f1	f2	f4	report
 4	NULL	<------ 20 -------->	v1 4
 <------------- 30 ----------->	NULL	<------ 20 -------->	t1 5
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11181,7 +11181,7 @@ f4	varchar(20)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report
 -1	ABC	t1 0
 -1	ABC	v1 0
@@ -11195,7 +11195,7 @@ f1	f4	report
 <------------- 30 ----------->	<------ 20 -------->	t1 5
 <------------- 30 ----------->	<------ 20 -------->	v1 5
 ABC	<------ 20 -------->	t1 6
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
 INSERT INTO t1 SET f1 = 'ABC', f2 = '1500-12-04',
@@ -11214,7 +11214,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11230,7 +11230,7 @@ f1	f4	report	f2
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	1500-12-04
 ABC	<------ 20 -------->	v1 7	1500-12-04
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11264,7 +11264,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11279,10 +11279,10 @@ f1	f4	report	f2
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	NULL
-ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033
+ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	v1 8	-0.00033
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11297,8 +11297,8 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
+ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	v1 8
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
 INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
@@ -11321,7 +11321,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2	f3
 -1	ABC	t1 0	NULL	NULL
 -1	ABC	v1 0	NULL	NULL
@@ -11336,12 +11336,12 @@ f1	f4	report	f2	f3
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL	NULL
 ABC	<------ 20 -------->	t1 6	NULL	NULL
 ABC	<------ 20 -------->	t1 7	NULL	NULL
-ABC	<------ 20 -------->	v1 7	NULL	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033	NULL
-ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
+ABC	<------ 20 -------->	v1 7	NULL	NULL
+ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	v1 9a	-0.00033	NULL
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11356,10 +11356,10 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
-ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	t1 9
+ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	v1 9a
 DROP TABLE t1;
 DROP VIEW  v1;
@@ -11374,10 +11374,10 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	1.7320508075689
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
@@ -11390,21 +11390,21 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
 ABC	DEF
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.7320508075689
 ABC	0
+ABC	1.7320508075689
 SELECT SQRT('DEF');
 SQRT('DEF')
 0
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2;
+SELECT * FROM v2 order by 1;
 SQRT('DEF')
 0
 Warnings:
@@ -11414,27 +11414,27 @@ DESCRIBE v2;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM v2;
+SELECT * FROM v2 order by 2;
 f1	my_sqrt
+ABC	0
 ABC	1.7320508075689
-ABC	0
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/myisam__datadict.result b/mysql-test/suite/funcs_1/r/myisam__datadict.result
index e9082e7aee7..36662ad9259 100644
--- a/mysql-test/suite/funcs_1/r/myisam__datadict.result
+++ b/mysql-test/suite/funcs_1/r/myisam__datadict.result
@@ -463,10 +463,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -489,7 +500,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -510,7 +521,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -531,7 +542,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -552,7 +563,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -573,7 +584,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -591,10 +602,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -615,7 +815,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -636,7 +836,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -657,7 +857,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -675,10 +875,52 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -699,7 +941,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -720,7 +962,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -741,7 +983,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -762,7 +1004,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -783,7 +1025,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -804,7 +1046,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -929,6 +1171,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -950,6 +1213,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1055,6 +1339,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1097,6 +1423,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1562,6 +1930,12 @@ t.table_type, t.engine
 from schemata s inner join tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
@@ -1606,6 +1980,17 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1613,6 +1998,12 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
@@ -1657,6 +2048,17 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -1664,6 +2066,12 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
@@ -1708,6 +2116,17 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -1715,6 +2134,12 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
@@ -1759,6 +2184,17 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -1766,6 +2202,12 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
@@ -1810,6 +2252,17 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -1817,6 +2270,12 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
@@ -1861,6 +2320,17 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -1886,14 +2356,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -1908,6 +2378,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1920,6 +2459,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1950,6 +2543,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1970,20 +2567,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -2034,20 +2631,20 @@ NULL	db_datadict	v1	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_genera
 NULL	db_datadict	v1	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references	
-NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select,insert,update,references	
 NULL	db_datadict	vu	u	1		NO	varchar	81	243	NULL	NULL	utf8	utf8_general_ci	varchar(81)			select,insert,update,references	
@@ -2081,10 +2678,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
+NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
+NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
+NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
+NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
+NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
+NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
+NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -2118,6 +2741,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
+NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -2142,13 +2775,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
+NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -2193,14 +2846,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -2592,7 +3247,7 @@ cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
 eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
 select sum(id) from collations;
 sum(id)
-10741
+10840
 select collation_name, character_set_name into @x,@y
 from collation_character_set_applicability limit 1;
 select @x, @y;
@@ -2617,6 +3272,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -2628,6 +3285,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	1	NULL	NULL		BTREE	
@@ -2637,6 +3296,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -2667,6 +3327,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -2682,6 +3343,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -2692,6 +3354,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -2707,6 +3370,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -2717,6 +3381,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -2732,6 +3397,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -2749,6 +3415,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -2763,6 +3431,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 select * from table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 select * from column_privileges;
@@ -2771,6 +3441,7 @@ select * from table_constraints;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
@@ -2780,8 +3451,11 @@ NULL	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 NULL	mysql	name	mysql	help_topic	UNIQUE
 NULL	mysql	PRIMARY	mysql	host	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	ndb_binlog_index	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	proc	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	servers	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone_leap_second	PRIMARY KEY
@@ -2799,6 +3473,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_category	name	1	NULL	NULL	NULL	NULL
@@ -2810,6 +3486,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_topic	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -2818,6 +3496,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -2833,7 +3512,7 @@ NULL	mysql	PRIMARY	NULL	mysql	user	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	user	User	2	NULL	NULL	NULL	NULL
 select count(*) as max_recs from key_column_usage;
 max_recs
-40
+45
 select max(cardinality) from statistics;
 max(cardinality)
 393
@@ -2854,10 +3533,21 @@ Table or view 'COLLATIONS' is associated with the database 'information_schema'.
 Table or view 'COLLATION_CHARACTER_SET_APPLICABILITY' is associated with the database 'information_schema'.
 Table or view 'COLUMNS' is associated with the database 'information_schema'.
 Table or view 'COLUMN_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'ENGINES' is associated with the database 'information_schema'.
+Table or view 'EVENTS' is associated with the database 'information_schema'.
+Table or view 'FILES' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_STATUS' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_schema'.
+Table or view 'PARTITIONS' is associated with the database 'information_schema'.
+Table or view 'PLUGINS' is associated with the database 'information_schema'.
+Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
 Table or view 'SCHEMA_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'SESSION_STATUS' is associated with the database 'information_schema'.
+Table or view 'SESSION_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'STATISTICS' is associated with the database 'information_schema'.
 Table or view 'TABLES' is associated with the database 'information_schema'.
 Table or view 'TABLE_CONSTRAINTS' is associated with the database 'information_schema'.
@@ -2870,14 +3560,20 @@ Table or view 'vu' is associated with the database 'db_datadict'.
 Table or view 'vu1' is associated with the database 'db_datadict'.
 Table or view 'columns_priv' is associated with the database 'mysql'.
 Table or view 'db' is associated with the database 'mysql'.
+Table or view 'event' is associated with the database 'mysql'.
 Table or view 'func' is associated with the database 'mysql'.
+Table or view 'general_log' is associated with the database 'mysql'.
 Table or view 'help_category' is associated with the database 'mysql'.
 Table or view 'help_keyword' is associated with the database 'mysql'.
 Table or view 'help_relation' is associated with the database 'mysql'.
 Table or view 'help_topic' is associated with the database 'mysql'.
 Table or view 'host' is associated with the database 'mysql'.
+Table or view 'ndb_binlog_index' is associated with the database 'mysql'.
+Table or view 'plugin' is associated with the database 'mysql'.
 Table or view 'proc' is associated with the database 'mysql'.
 Table or view 'procs_priv' is associated with the database 'mysql'.
+Table or view 'servers' is associated with the database 'mysql'.
+Table or view 'slow_log' is associated with the database 'mysql'.
 Table or view 'tables_priv' is associated with the database 'mysql'.
 Table or view 'time_zone' is associated with the database 'mysql'.
 Table or view 'time_zone_leap_second' is associated with the database 'mysql'.
@@ -2924,12 +3620,12 @@ select * from table_constraints limit 0,5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select count(*) as max_recs from key_column_usage limit 0,5;
 max_recs
-40
+45
 select information_schema.tables.table_name as "table name",
 count(distinct(column_name)) as "no of columns in the table"
   from information_schema.tables left outer join information_schema.columns on
@@ -2942,19 +3638,36 @@ COLLATION_CHARACTER_SET_APPLICABILITY	2
 COLUMNS	19
 columns_priv	7
 COLUMN_PRIVILEGES	7
-db	20
+db	22
+ENGINES	6
+event	18
+EVENTS	21
+FILES	38
 func	4
+general_log	6
+GLOBAL_STATUS	2
+GLOBAL_VARIABLES	2
 help_category	4
 help_keyword	2
 help_relation	2
 help_topic	6
-host	19
+host	20
 KEY_COLUMN_USAGE	12
+ndb_binlog_index	7
+PARTITIONS	25
+plugin	2
+PLUGINS	10
 proc	16
+PROCESSLIST	8
 procs_priv	8
+REFERENTIAL_CONSTRAINTS	11
 ROUTINES	20
 SCHEMATA	5
 SCHEMA_PRIVILEGES	5
+servers	9
+SESSION_STATUS	2
+SESSION_VARIABLES	2
+slow_log	11
 STATISTICS	15
 t1	6
 t10	6
@@ -2980,7 +3693,7 @@ time_zone_name	2
 time_zone_transition	3
 time_zone_transition_type	5
 TRIGGERS	19
-user	37
+user	39
 USER_PRIVILEGES	4
 v1	21
 VIEWS	8
@@ -2994,7 +3707,7 @@ CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_P
 NULL	information_schema	utf8	utf8_general_ci	NULL
 SELECT * FROM tables                                LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
 SELECT * FROM columns                               LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3039,7 +3752,7 @@ TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATA
 SELECT * FROM parameters LIMIT 1;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT * FROM referential_constraints LIMIT 1;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	UNIQUE_CONSTRAINT_CATALOG	UNIQUE_CONSTRAINT_SCHEMA	UNIQUE_CONSTRAINT_NAME	MATCH_OPTION	UPDATE_RULE	DELETE_RULE	TABLE_NAME	REFERENCED_TABLE_NAME
 use db_datadict;
 select * from schemata;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
@@ -3129,7 +3842,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3150,7 +3863,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3171,7 +3884,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3192,7 +3905,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3213,7 +3926,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3231,10 +3944,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3255,7 +4157,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3276,7 +4178,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3297,7 +4199,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3315,10 +4217,52 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3339,7 +4283,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3360,7 +4304,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3381,7 +4325,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3402,7 +4346,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3423,7 +4367,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3444,7 +4388,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3569,6 +4513,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3590,6 +4555,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3695,6 +4681,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3737,6 +4765,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4202,6 +5272,12 @@ t.table_type, t.engine
 from information_schema.schemata s inner join information_schema.tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
@@ -4246,6 +5322,17 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -4253,6 +5340,12 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
@@ -4297,6 +5390,17 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -4304,6 +5408,12 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
@@ -4348,6 +5458,17 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -4355,6 +5476,12 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
@@ -4399,6 +5526,17 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -4406,6 +5544,12 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
@@ -4450,6 +5594,17 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -4457,6 +5612,12 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
@@ -4501,6 +5662,17 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -4575,9 +5747,9 @@ select * from information_schema.table_constraints limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select * from information_schema.key_column_usage limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Host	1	NULL	NULL	NULL	NULL
@@ -4587,7 +5759,7 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Table_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 select count(*) as max_recs from information_schema.key_column_usage limit 0, 5;
 max_recs
-40
+45
 
 root: check with db name
 ------------------------
@@ -4596,34 +5768,34 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-51
+68
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-682
+867
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
 SELECT COUNT(*) FROM information_schema. collations                            ;
 COUNT(*)
-126
+127
 SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ;
 COUNT(*)
-126
+128
 SELECT COUNT(*) FROM information_schema. routines                              ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM information_schema. statistics                            ;
 COUNT(*)
-43
+48
 SELECT COUNT(*) FROM information_schema. views                                 ;
 COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-75
+81
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
-28
+32
 SELECT COUNT(*) FROM information_schema. table_privileges                      ;
 COUNT(*)
 0
@@ -4632,17 +5804,18 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. table_constraints                     ;
 COUNT(*)
-20
+24
 SELECT COUNT(*) FROM information_schema. key_column_usage                      ;
 COUNT(*)
-40
+45
 SELECT COUNT(*) FROM information_schema. triggers                              ;
 COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. parameters ;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT COUNT(*) FROM information_schema. referential_constraints ;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+COUNT(*)
+0
 USE db_datadict;
 DROP VIEW v1, vu1, vu;
 DROP PROCEDURE db_datadict.sp_1;
@@ -4660,10 +5833,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-48
+65
 select count(*) as the_cols from columns;
 the_cols
-657
+842
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -4701,10 +5874,21 @@ information_schema, COLLATIONS
 information_schema, COLLATION_CHARACTER_SET_APPLICABILITY
 information_schema, COLUMNS
 information_schema, COLUMN_PRIVILEGES
+information_schema, ENGINES
+information_schema, EVENTS
+information_schema, FILES
+information_schema, GLOBAL_STATUS
+information_schema, GLOBAL_VARIABLES
 information_schema, KEY_COLUMN_USAGE
+information_schema, PARTITIONS
+information_schema, PLUGINS
+information_schema, PROCESSLIST
+information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
 information_schema, SCHEMA_PRIVILEGES
+information_schema, SESSION_STATUS
+information_schema, SESSION_VARIABLES
 information_schema, STATISTICS
 information_schema, TABLES
 information_schema, TABLE_CONSTRAINTS
@@ -4714,14 +5898,20 @@ information_schema, USER_PRIVILEGES
 information_schema, VIEWS
 mysql, columns_priv
 mysql, db
+mysql, event
 mysql, func
+mysql, general_log
 mysql, help_category
 mysql, help_keyword
 mysql, help_relation
 mysql, help_topic
 mysql, host
+mysql, ndb_binlog_index
+mysql, plugin
 mysql, proc
 mysql, procs_priv
+mysql, servers
+mysql, slow_log
 mysql, tables_priv
 mysql, time_zone
 mysql, time_zone_leap_second
@@ -4767,7 +5957,7 @@ NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
 select sum(ordinal_position) from key_column_usage;
 sum(ordinal_position)
-77
+83
 select * from schemata limit 0,5;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
 NULL	information_schema	utf8	utf8_general_ci	NULL
@@ -4814,6 +6004,8 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
+'root'@'127.0.0.1'
+'root'@'127.0.0.1'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -4839,6 +6031,10 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'localhost'
+'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
@@ -6347,6 +7543,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6362,6 +7559,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6372,6 +7570,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6387,6 +7586,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6397,6 +7597,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6412,6 +7613,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6492,6 +7694,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6507,6 +7710,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6517,6 +7721,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6532,6 +7737,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6542,6 +7748,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6557,6 +7764,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
@@ -6623,6 +7831,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6638,6 +7847,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6648,6 +7858,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6663,6 +7874,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6673,6 +7885,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6688,6 +7901,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6766,6 +7980,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6781,6 +7996,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6791,6 +8007,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6806,6 +8023,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6816,6 +8034,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6831,6 +8050,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6905,6 +8125,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6920,6 +8141,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6930,6 +8152,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6945,6 +8168,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6955,6 +8179,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6970,6 +8195,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7057,6 +8283,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7072,6 +8299,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7082,6 +8310,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7097,6 +8326,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7107,6 +8337,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7122,6 +8353,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
@@ -7187,6 +8419,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7202,6 +8435,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7212,6 +8446,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7227,6 +8462,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7237,6 +8473,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7252,6 +8489,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7293,10 +8531,21 @@ information_schema	COLLATIONS	MEMORY
 information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	MEMORY
 information_schema	COLUMNS	MyISAM
 information_schema	COLUMN_PRIVILEGES	MEMORY
+information_schema	ENGINES	MEMORY
+information_schema	EVENTS	MyISAM
+information_schema	FILES	MEMORY
+information_schema	GLOBAL_STATUS	MEMORY
+information_schema	GLOBAL_VARIABLES	MyISAM
 information_schema	KEY_COLUMN_USAGE	MEMORY
+information_schema	PARTITIONS	MyISAM
+information_schema	PLUGINS	MyISAM
+information_schema	PROCESSLIST	MyISAM
+information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
 information_schema	SCHEMA_PRIVILEGES	MEMORY
+information_schema	SESSION_STATUS	MEMORY
+information_schema	SESSION_VARIABLES	MyISAM
 information_schema	STATISTICS	MEMORY
 information_schema	TABLES	MEMORY
 information_schema	TABLE_CONSTRAINTS	MEMORY
@@ -7325,10 +8574,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7355,10 +8615,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7422,6 +8693,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -7436,6 +8708,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -7526,10 +8799,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7568,14 +8852,14 @@ COLUMNS	TABLE_CATALOG	varchar(4096)
 COLUMNS	TABLE_SCHEMA	varchar(64)
 COLUMNS	TABLE_NAME	varchar(64)
 COLUMNS	COLUMN_NAME	varchar(64)
-COLUMNS	ORDINAL_POSITION	bigint(21)
+COLUMNS	ORDINAL_POSITION	bigint(21) unsigned
 COLUMNS	COLUMN_DEFAULT	longtext
 COLUMNS	IS_NULLABLE	varchar(3)
 COLUMNS	DATA_TYPE	varchar(64)
-COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21)
-COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21)
-COLUMNS	NUMERIC_PRECISION	bigint(21)
-COLUMNS	NUMERIC_SCALE	bigint(21)
+COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned
+COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21) unsigned
+COLUMNS	NUMERIC_PRECISION	bigint(21) unsigned
+COLUMNS	NUMERIC_SCALE	bigint(21) unsigned
 COLUMNS	CHARACTER_SET_NAME	varchar(64)
 COLUMNS	COLLATION_NAME	varchar(64)
 COLUMNS	COLUMN_TYPE	longtext
@@ -7590,6 +8874,75 @@ COLUMN_PRIVILEGES	TABLE_NAME	varchar(64)
 COLUMN_PRIVILEGES	COLUMN_NAME	varchar(64)
 COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 COLUMN_PRIVILEGES	IS_GRANTABLE	varchar(3)
+ENGINES	ENGINE	varchar(64)
+ENGINES	SUPPORT	varchar(8)
+ENGINES	COMMENT	varchar(80)
+ENGINES	TRANSACTIONS	varchar(3)
+ENGINES	XA	varchar(3)
+ENGINES	SAVEPOINTS	varchar(3)
+EVENTS	EVENT_CATALOG	varchar(64)
+EVENTS	EVENT_SCHEMA	varchar(64)
+EVENTS	EVENT_NAME	varchar(64)
+EVENTS	DEFINER	varchar(77)
+EVENTS	TIME_ZONE	varchar(64)
+EVENTS	EVENT_BODY	varchar(8)
+EVENTS	EVENT_DEFINITION	longtext
+EVENTS	EVENT_TYPE	varchar(9)
+EVENTS	EXECUTE_AT	datetime
+EVENTS	INTERVAL_VALUE	varchar(256)
+EVENTS	INTERVAL_FIELD	varchar(18)
+EVENTS	SQL_MODE	longtext
+EVENTS	STARTS	datetime
+EVENTS	ENDS	datetime
+EVENTS	STATUS	varchar(18)
+EVENTS	ON_COMPLETION	varchar(12)
+EVENTS	CREATED	datetime
+EVENTS	LAST_ALTERED	datetime
+EVENTS	LAST_EXECUTED	datetime
+EVENTS	EVENT_COMMENT	varchar(64)
+EVENTS	ORIGINATOR	bigint(10)
+FILES	FILE_ID	bigint(4)
+FILES	FILE_NAME	varchar(64)
+FILES	FILE_TYPE	varchar(20)
+FILES	TABLESPACE_NAME	varchar(64)
+FILES	TABLE_CATALOG	varchar(64)
+FILES	TABLE_SCHEMA	varchar(64)
+FILES	TABLE_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NUMBER	bigint(4)
+FILES	ENGINE	varchar(64)
+FILES	FULLTEXT_KEYS	varchar(64)
+FILES	DELETED_ROWS	bigint(4)
+FILES	UPDATE_COUNT	bigint(4)
+FILES	FREE_EXTENTS	bigint(4)
+FILES	TOTAL_EXTENTS	bigint(4)
+FILES	EXTENT_SIZE	bigint(4)
+FILES	INITIAL_SIZE	bigint(21) unsigned
+FILES	MAXIMUM_SIZE	bigint(21) unsigned
+FILES	AUTOEXTEND_SIZE	bigint(21) unsigned
+FILES	CREATION_TIME	datetime
+FILES	LAST_UPDATE_TIME	datetime
+FILES	LAST_ACCESS_TIME	datetime
+FILES	RECOVER_TIME	bigint(4)
+FILES	TRANSACTION_COUNTER	bigint(4)
+FILES	VERSION	bigint(21) unsigned
+FILES	ROW_FORMAT	varchar(10)
+FILES	TABLE_ROWS	bigint(21) unsigned
+FILES	AVG_ROW_LENGTH	bigint(21) unsigned
+FILES	DATA_LENGTH	bigint(21) unsigned
+FILES	MAX_DATA_LENGTH	bigint(21) unsigned
+FILES	INDEX_LENGTH	bigint(21) unsigned
+FILES	DATA_FREE	bigint(21) unsigned
+FILES	CREATE_TIME	datetime
+FILES	UPDATE_TIME	datetime
+FILES	CHECK_TIME	datetime
+FILES	CHECKSUM	bigint(21) unsigned
+FILES	STATUS	varchar(20)
+FILES	EXTRA	varchar(255)
+GLOBAL_STATUS	VARIABLE_NAME	varchar(64)
+GLOBAL_STATUS	VARIABLE_VALUE	decimal(22,7)
+GLOBAL_VARIABLES	VARIABLE_NAME	varchar(64)
+GLOBAL_VARIABLES	VARIABLE_VALUE	longtext
 KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar(4096)
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar(64)
@@ -7602,6 +8955,60 @@ KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar(64)
+PARTITIONS	TABLE_CATALOG	varchar(4096)
+PARTITIONS	TABLE_SCHEMA	varchar(64)
+PARTITIONS	TABLE_NAME	varchar(64)
+PARTITIONS	PARTITION_NAME	varchar(64)
+PARTITIONS	SUBPARTITION_NAME	varchar(64)
+PARTITIONS	PARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	PARTITION_METHOD	varchar(12)
+PARTITIONS	SUBPARTITION_METHOD	varchar(12)
+PARTITIONS	PARTITION_EXPRESSION	longtext
+PARTITIONS	SUBPARTITION_EXPRESSION	longtext
+PARTITIONS	PARTITION_DESCRIPTION	longtext
+PARTITIONS	TABLE_ROWS	bigint(21) unsigned
+PARTITIONS	AVG_ROW_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	MAX_DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	INDEX_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_FREE	bigint(21) unsigned
+PARTITIONS	CREATE_TIME	datetime
+PARTITIONS	UPDATE_TIME	datetime
+PARTITIONS	CHECK_TIME	datetime
+PARTITIONS	CHECKSUM	bigint(21) unsigned
+PARTITIONS	PARTITION_COMMENT	varchar(80)
+PARTITIONS	NODEGROUP	varchar(12)
+PARTITIONS	TABLESPACE_NAME	varchar(64)
+PLUGINS	PLUGIN_NAME	varchar(64)
+PLUGINS	PLUGIN_VERSION	varchar(20)
+PLUGINS	PLUGIN_STATUS	varchar(10)
+PLUGINS	PLUGIN_TYPE	varchar(80)
+PLUGINS	PLUGIN_TYPE_VERSION	varchar(20)
+PLUGINS	PLUGIN_LIBRARY	varchar(64)
+PLUGINS	PLUGIN_LIBRARY_VERSION	varchar(20)
+PLUGINS	PLUGIN_AUTHOR	varchar(64)
+PLUGINS	PLUGIN_DESCRIPTION	longtext
+PLUGINS	PLUGIN_LICENSE	varchar(80)
+PROCESSLIST	ID	bigint(4)
+PROCESSLIST	USER	varchar(16)
+PROCESSLIST	HOST	varchar(64)
+PROCESSLIST	DB	varchar(64)
+PROCESSLIST	COMMAND	varchar(16)
+PROCESSLIST	TIME	bigint(7)
+PROCESSLIST	STATE	varchar(64)
+PROCESSLIST	INFO	longtext
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar(64)
+REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar(64)
 ROUTINES	SPECIFIC_NAME	varchar(64)
 ROUTINES	ROUTINE_CATALOG	varchar(4096)
 ROUTINES	ROUTINE_SCHEMA	varchar(64)
@@ -7632,6 +9039,10 @@ SCHEMA_PRIVILEGES	TABLE_CATALOG	varchar(4096)
 SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar(64)
 SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar(3)
+SESSION_STATUS	VARIABLE_NAME	varchar(64)
+SESSION_STATUS	VARIABLE_VALUE	decimal(22,7)
+SESSION_VARIABLES	VARIABLE_NAME	varchar(64)
+SESSION_VARIABLES	VARIABLE_VALUE	longtext
 STATISTICS	TABLE_CATALOG	varchar(4096)
 STATISTICS	TABLE_SCHEMA	varchar(64)
 STATISTICS	TABLE_NAME	varchar(64)
@@ -7652,20 +9063,20 @@ TABLES	TABLE_SCHEMA	varchar(64)
 TABLES	TABLE_NAME	varchar(64)
 TABLES	TABLE_TYPE	varchar(64)
 TABLES	ENGINE	varchar(64)
-TABLES	VERSION	bigint(21)
+TABLES	VERSION	bigint(21) unsigned
 TABLES	ROW_FORMAT	varchar(10)
-TABLES	TABLE_ROWS	bigint(21)
-TABLES	AVG_ROW_LENGTH	bigint(21)
-TABLES	DATA_LENGTH	bigint(21)
-TABLES	MAX_DATA_LENGTH	bigint(21)
-TABLES	INDEX_LENGTH	bigint(21)
-TABLES	DATA_FREE	bigint(21)
-TABLES	AUTO_INCREMENT	bigint(21)
+TABLES	TABLE_ROWS	bigint(21) unsigned
+TABLES	AVG_ROW_LENGTH	bigint(21) unsigned
+TABLES	DATA_LENGTH	bigint(21) unsigned
+TABLES	MAX_DATA_LENGTH	bigint(21) unsigned
+TABLES	INDEX_LENGTH	bigint(21) unsigned
+TABLES	DATA_FREE	bigint(21) unsigned
+TABLES	AUTO_INCREMENT	bigint(21) unsigned
 TABLES	CREATE_TIME	datetime
 TABLES	UPDATE_TIME	datetime
 TABLES	CHECK_TIME	datetime
 TABLES	TABLE_COLLATION	varchar(64)
-TABLES	CHECKSUM	bigint(21)
+TABLES	CHECKSUM	bigint(21) unsigned
 TABLES	CREATE_OPTIONS	varchar(255)
 TABLES	TABLE_COMMENT	varchar(80)
 TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
@@ -8084,6 +9495,7 @@ cp1250_general_ci
 cp1250_czech_cs
 cp1250_croatian_ci
 cp1250_bin
+cp1250_polish_ci
 gbk_chinese_ci
 gbk_bin
 latin5_turkish_ci
@@ -8291,10 +9703,10 @@ MAXLEN	bigint(3)	NO		0
 SHOW CREATE TABLE character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
-  `DESCRIPTION` varchar(60) NOT NULL default '',
-  `MAXLEN` bigint(3) NOT NULL default '0'
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
+  `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8372,12 +9784,12 @@ SORTLEN	bigint(3)	NO		0
 SHOW CREATE TABLE collations;
 Table	Create Table
 COLLATIONS	CREATE TEMPORARY TABLE `COLLATIONS` (
-  `COLLATION_NAME` varchar(64) NOT NULL default '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `ID` bigint(11) NOT NULL default '0',
-  `IS_DEFAULT` varchar(3) NOT NULL default '',
-  `IS_COMPILED` varchar(3) NOT NULL default '',
-  `SORTLEN` bigint(3) NOT NULL default '0'
+  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ID` bigint(11) NOT NULL DEFAULT '0',
+  `IS_DEFAULT` varchar(3) NOT NULL DEFAULT '',
+  `IS_COMPILED` varchar(3) NOT NULL DEFAULT '',
+  `SORTLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8448,6 +9860,7 @@ cp1250_general_ci	cp1250	26	Yes	Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_bin	cp1250	66		Yes	1
+cp1250_polish_ci	cp1250	99		Yes	1
 gbk_chinese_ci	gbk	28	Yes	Yes	1
 gbk_bin	gbk	87		Yes	1
 latin5_turkish_ci	latin5	30	Yes		0
@@ -8541,8 +9954,8 @@ CHARACTER_SET_NAME	varchar(64)	NO
 SHOW CREATE TABLE collation_character_set_applicability;
 Table	Create Table
 COLLATION_CHARACTER_SET_APPLICABILITY	CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
-  `COLLATION_NAME` varchar(64) NOT NULL default '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default ''
+  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8595,6 +10008,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -8609,6 +10023,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -8707,13 +10122,13 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE column_privileges;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8819,6 +10234,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_3'@'localhost'	NULL	db_datadict	SHOW VIEW	NO
 'user_3'@'localhost'	NULL	db_datadict	CREATE ROUTINE	NO
 'user_3'@'localhost'	NULL	db_datadict	ALTER ROUTINE	NO
+'user_3'@'localhost'	NULL	db_datadict	EVENT	NO
+'user_3'@'localhost'	NULL	db_datadict	TRIGGER	NO
 SELECT * FROM information_schema.column_privileges
 WHERE grantee LIKE "'user%"
  ORDER BY grantee, table_name, column_name, privilege_type;
@@ -8859,14 +10276,14 @@ TABLE_CATALOG	varchar(4096)	YES		NULL
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
 COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(21)	NO		0	
+ORDINAL_POSITION	bigint(21) unsigned	NO		0	
 COLUMN_DEFAULT	longtext	YES		NULL	
 IS_NULLABLE	varchar(3)	NO			
 DATA_TYPE	varchar(64)	NO			
-CHARACTER_MAXIMUM_LENGTH	bigint(21)	YES		NULL	
-CHARACTER_OCTET_LENGTH	bigint(21)	YES		NULL	
-NUMERIC_PRECISION	bigint(21)	YES		NULL	
-NUMERIC_SCALE	bigint(21)	YES		NULL	
+CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL	
+CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
+NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
+NUMERIC_SCALE	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
 COLUMN_TYPE	longtext	NO			
@@ -8877,25 +10294,25 @@ COLUMN_COMMENT	varchar(255)	NO
 SHOW CREATE TABLE columns;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `ORDINAL_POSITION` bigint(21) NOT NULL default '0',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ORDINAL_POSITION` bigint(21) unsigned NOT NULL DEFAULT '0',
   `COLUMN_DEFAULT` longtext,
-  `IS_NULLABLE` varchar(3) NOT NULL default '',
-  `DATA_TYPE` varchar(64) NOT NULL default '',
-  `CHARACTER_MAXIMUM_LENGTH` bigint(21) default NULL,
-  `CHARACTER_OCTET_LENGTH` bigint(21) default NULL,
-  `NUMERIC_PRECISION` bigint(21) default NULL,
-  `NUMERIC_SCALE` bigint(21) default NULL,
-  `CHARACTER_SET_NAME` varchar(64) default NULL,
-  `COLLATION_NAME` varchar(64) default NULL,
+  `IS_NULLABLE` varchar(3) NOT NULL DEFAULT '',
+  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
+  `NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
+  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
+  `COLLATION_NAME` varchar(64) DEFAULT NULL,
   `COLUMN_TYPE` longtext NOT NULL,
-  `COLUMN_KEY` varchar(3) NOT NULL default '',
-  `EXTRA` varchar(20) NOT NULL default '',
-  `PRIVILEGES` varchar(80) NOT NULL default '',
-  `COLUMN_COMMENT` varchar(255) NOT NULL default ''
+  `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
+  `EXTRA` varchar(20) NOT NULL DEFAULT '',
+  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
+  `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8912,14 +10329,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8967,14 +10384,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8989,6 +10406,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9001,6 +10487,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9031,6 +10571,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9051,20 +10595,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -9137,10 +10681,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
+NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
+NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
+NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
+NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
+NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
+NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
+NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -9174,6 +10744,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
+NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
@@ -9198,13 +10778,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
+NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -9249,14 +10849,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -9630,14 +11232,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -9652,6 +11254,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9664,6 +11335,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9694,6 +11419,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9714,20 +11443,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10081,14 +11810,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -10103,6 +11832,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10115,6 +11913,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10145,6 +11997,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10165,20 +12021,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10538,7 +12394,9 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	set	latin1	latin1_swedish_ci
 1.0000	text	latin1	latin1_swedish_ci
 1.0000	tinytext	latin1	latin1_swedish_ci
+1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	longtext	utf8	utf8_general_ci
+1.0000	mediumtext	utf8	utf8_general_ci
 1.0000	text	utf8	utf8_general_ci
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
@@ -10626,14 +12484,14 @@ NULL	information_schema	COLLATIONS	SORTLEN	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	COLUMNS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 1.0000	information_schema	COLUMNS	COLUMN_DEFAULT	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	COLUMNS	IS_NULLABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	COLUMNS	DATA_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	COLUMNS	CHARACTER_SET_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLLATION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	COLUMNS	COLUMN_TYPE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
@@ -10648,6 +12506,75 @@ NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(
 3.0000	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	ENGINES	SUPPORT	varchar	8	24	utf8	utf8_general_ci	varchar(8)
+3.0000	information_schema	ENGINES	COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	ENGINES	TRANSACTIONS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	XA	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	SAVEPOINTS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	EVENTS	EVENT_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)
+3.0000	information_schema	EVENTS	TIME_ZONE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_BODY	varchar	8	24	utf8	utf8_general_ci	varchar(8)
+1.0000	information_schema	EVENTS	EVENT_DEFINITION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	EVENTS	EVENT_TYPE	varchar	9	27	utf8	utf8_general_ci	varchar(9)
+NULL	information_schema	EVENTS	EXECUTE_AT	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	INTERVAL_VALUE	varchar	256	768	utf8	utf8_general_ci	varchar(256)
+3.0000	information_schema	EVENTS	INTERVAL_FIELD	varchar	18	54	utf8	utf8_general_ci	varchar(18)
+1.0000	information_schema	EVENTS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	EVENTS	STARTS	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	ENDS	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	STATUS	varchar	18	54	utf8	utf8_general_ci	varchar(18)
+3.0000	information_schema	EVENTS	ON_COMPLETION	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+NULL	information_schema	EVENTS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	LAST_EXECUTED	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	EVENT_COMMENT	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	EVENTS	ORIGINATOR	bigint	NULL	NULL	NULL	NULL	bigint(10)
+NULL	information_schema	FILES	FILE_ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	FILES	FILE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	FILE_TYPE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	FILES	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	LOGFILE_GROUP_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	FILES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	FULLTEXT_KEYS	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	FILES	DELETED_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	UPDATE_COUNT	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	FREE_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	TOTAL_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	EXTENT_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	INITIAL_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	MAXIMUM_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	CREATION_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	LAST_UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	LAST_ACCESS_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	RECOVER_TIME	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	TRANSACTION_COUNTER	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	FILES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
+NULL	information_schema	FILES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	FILES	STATUS	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	FILES	EXTRA	varchar	255	765	utf8	utf8_general_ci	varchar(255)
+3.0000	information_schema	GLOBAL_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10660,6 +12587,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint	NU
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+3.0000	information_schema	PARTITIONS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	PARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	SUBPARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	PARTITIONS	PARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+3.0000	information_schema	PARTITIONS	SUBPARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+1.0000	information_schema	PARTITIONS	PARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+1.0000	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+1.0000	information_schema	PARTITIONS	PARTITION_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	PARTITIONS	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	PARTITIONS	PARTITION_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	PARTITIONS	NODEGROUP	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+3.0000	information_schema	PARTITIONS	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_STATUS	varchar	10	30	utf8	utf8_general_ci	varchar(10)
+3.0000	information_schema	PLUGINS	PLUGIN_TYPE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_AUTHOR	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	PLUGINS	PLUGIN_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	PLUGINS	PLUGIN_LICENSE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	PROCESSLIST	USER	varchar	16	48	utf8	utf8_general_ci	varchar(16)
+3.0000	information_schema	PROCESSLIST	HOST	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PROCESSLIST	DB	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PROCESSLIST	COMMAND	varchar	16	48	utf8	utf8_general_ci	varchar(16)
+NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
+3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	SPECIFIC_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	ROUTINE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10690,6 +12671,10 @@ NULL	information_schema	ROUTINES	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datet
 3.0000	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	SESSION_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10710,20 +12695,20 @@ NULL	information_schema	STATISTICS	SUB_PART	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	TABLES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	TABLE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	TABLES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 NULL	information_schema	TABLES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 3.0000	information_schema	TABLES	TABLE_COLLATION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	TABLES	CREATE_OPTIONS	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 3.0000	information_schema	TABLES	TABLE_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
 3.0000	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
@@ -10796,10 +12781,36 @@ NULL	mysql	columns_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	db	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	db	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	db	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	event	db	char	64	192	utf8	utf8_bin	char(64)
+3.0000	mysql	event	name	char	64	192	utf8	utf8_general_ci	char(64)
+1.0000	mysql	event	body	longblob	4294967295	4294967295	NULL	NULL	longblob
+3.0000	mysql	event	definer	char	77	231	utf8	utf8_bin	char(77)
+NULL	mysql	event	execute_at	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	interval_value	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	event	interval_field	enum	18	54	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')
+NULL	mysql	event	created	timestamp	NULL	NULL	NULL	NULL	timestamp
+NULL	mysql	event	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
+NULL	mysql	event	last_executed	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	starts	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	ends	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	mysql	event	status	enum	18	54	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')
+3.0000	mysql	event	on_completion	enum	8	24	utf8	utf8_general_ci	enum('DROP','PRESERVE')
+3.0000	mysql	event	sql_mode	set	431	1293	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')
+3.0000	mysql	event	comment	char	64	192	utf8	utf8_bin	char(64)
+NULL	mysql	event	originator	int	NULL	NULL	NULL	NULL	int(10)
+1.0000	mysql	event	time_zone	char	64	64	latin1	latin1_swedish_ci	char(64)
 3.0000	mysql	func	name	char	64	192	utf8	utf8_bin	char(64)
 NULL	mysql	func	ret	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 3.0000	mysql	func	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	func	type	enum	9	27	utf8	utf8_general_ci	enum('function','aggregate')
+NULL	mysql	general_log	event_time	timestamp	NULL	NULL	NULL	NULL	timestamp
+1.0000	mysql	general_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
+NULL	mysql	general_log	thread_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	general_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	general_log	command_type	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	mysql	general_log	argument	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_category	parent_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
@@ -10833,6 +12844,16 @@ NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5)
 3.0000	mysql	host	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	host	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+NULL	mysql	ndb_binlog_index	Position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+1.0000	mysql	ndb_binlog_index	File	varchar	255	255	latin1	latin1_swedish_ci	varchar(255)
+NULL	mysql	ndb_binlog_index	epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	inserts	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	updates	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	deletes	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	schemaops	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+3.0000	mysql	plugin	name	char	64	192	utf8	utf8_bin	char(64)
+3.0000	mysql	plugin	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	proc	db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	proc	name	char	64	192	utf8	utf8_general_ci	char(64)
 3.0000	mysql	proc	type	enum	9	27	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')
@@ -10857,13 +12878,33 @@ NULL	mysql	proc	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	procs_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 3.0000	mysql	procs_priv	Proc_priv	set	27	81	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')
 NULL	mysql	procs_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
+3.0000	mysql	servers	Server_name	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Host	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Db	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Username	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Password	char	64	192	utf8	utf8_general_ci	char(64)
+NULL	mysql	servers	Port	int	NULL	NULL	NULL	NULL	int(4)
+3.0000	mysql	servers	Socket	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Wrapper	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Owner	char	64	192	utf8	utf8_general_ci	char(64)
+NULL	mysql	slow_log	start_time	timestamp	NULL	NULL	NULL	NULL	timestamp
+1.0000	mysql	slow_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
+NULL	mysql	slow_log	query_time	time	NULL	NULL	NULL	NULL	time
+NULL	mysql	slow_log	lock_time	time	NULL	NULL	NULL	NULL	time
+NULL	mysql	slow_log	rows_sent	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	rows_examined	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	slow_log	db	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
+NULL	mysql	slow_log	last_insert_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	insert_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
+1.0000	mysql	slow_log	sql_text	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 3.0000	mysql	tables_priv	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	tables_priv	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	User	char	16	48	utf8	utf8_bin	char(16)
 3.0000	mysql	tables_priv	Table_name	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 NULL	mysql	tables_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	tables_priv	Table_priv	set	90	270	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')
+3.0000	mysql	tables_priv	Table_priv	set	98	294	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')
 3.0000	mysql	tables_priv	Column_priv	set	31	93	utf8	utf8_general_ci	set('Select','Insert','Update','References')
 NULL	mysql	time_zone	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	time_zone	Use_leap_seconds	enum	1	3	utf8	utf8_general_ci	enum('Y','N')
@@ -10908,6 +12949,8 @@ NULL	mysql	time_zone_transition_type	Is_DST	tinyint	NULL	NULL	NULL	NULL	tinyint(
 3.0000	mysql	user	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Create_user_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	user	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	user	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	ssl_type	enum	9	27	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')
 1.0000	mysql	user	ssl_cipher	blob	65535	65535	NULL	NULL	blob
 1.0000	mysql	user	x509_issuer	blob	65535	65535	NULL	NULL	blob
@@ -11293,18 +13336,18 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE key_column_usage;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `ORDINAL_POSITION` bigint(10) NOT NULL default '0',
-  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) default NULL,
-  `REFERENCED_TABLE_SCHEMA` varchar(64) default NULL,
-  `REFERENCED_TABLE_NAME` varchar(64) default NULL,
-  `REFERENCED_COLUMN_NAME` varchar(64) default NULL
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT '0',
+  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL,
+  `REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL,
+  `REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL,
+  `REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11365,6 +13408,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_keyword	help_keyword_id	1	NULL	NULL	NULL	NULL
@@ -11373,6 +13418,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_relation	help_topic_id	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -11381,6 +13428,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -11442,26 +13490,26 @@ DEFINER	varchar(77)	NO
 SHOW CREATE TABLE routines;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_CATALOG` varchar(4096) default NULL,
-  `ROUTINE_SCHEMA` varchar(64) NOT NULL default '',
-  `ROUTINE_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_TYPE` varchar(9) NOT NULL default '',
-  `DTD_IDENTIFIER` varchar(64) default NULL,
-  `ROUTINE_BODY` varchar(8) NOT NULL default '',
+  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_CATALOG` varchar(4096) DEFAULT NULL,
+  `ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT '',
+  `DTD_IDENTIFIER` varchar(64) DEFAULT NULL,
+  `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
   `ROUTINE_DEFINITION` longtext,
-  `EXTERNAL_NAME` varchar(64) default NULL,
-  `EXTERNAL_LANGUAGE` varchar(64) default NULL,
-  `PARAMETER_STYLE` varchar(8) NOT NULL default '',
-  `IS_DETERMINISTIC` varchar(3) NOT NULL default '',
-  `SQL_DATA_ACCESS` varchar(64) NOT NULL default '',
-  `SQL_PATH` varchar(64) default NULL,
-  `SECURITY_TYPE` varchar(7) NOT NULL default '',
-  `CREATED` datetime NOT NULL default '0000-00-00 00:00:00',
-  `LAST_ALTERED` datetime NOT NULL default '0000-00-00 00:00:00',
+  `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
+  `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
+  `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
+  `IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
+  `SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
+  `SQL_PATH` varchar(64) DEFAULT NULL,
+  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
+  `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `SQL_MODE` longtext NOT NULL,
-  `ROUTINE_COMMENT` varchar(64) NOT NULL default '',
-  `DEFINER` varchar(77) NOT NULL default ''
+  `ROUTINE_COMMENT` varchar(64) NOT NULL DEFAULT '',
+  `DEFINER` varchar(77) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11786,11 +13834,11 @@ SQL_PATH	varchar(4096)	YES		NULL
 SHOW CREATE TABLE schemata;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(4096) default NULL,
-  `SCHEMA_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL default '',
-  `SQL_PATH` varchar(4096) default NULL
+  `CATALOG_NAME` varchar(4096) DEFAULT NULL,
+  `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `SQL_PATH` varchar(4096) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11869,12 +13917,12 @@ CONSTRAINT_TYPE	varchar(64)	NO
 SHOW CREATE TABLE table_constraints;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `CONSTRAINT_TYPE` varchar(64) NOT NULL default ''
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_TYPE` varchar(64) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11949,12 +13997,12 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE table_privileges;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12008,6 +14056,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = USER();
@@ -12017,7 +14066,7 @@ SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = "'user_2'@'localhost'";
 USER()	COUNT(*)
-user_2@localhost	11
+user_2@localhost	12
 connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12037,6 +14086,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'user_1'@'localhost'	NULL	db_datadict	tb1	SELECT	NO
 'user_3'@'localhost'	NULL	db_datadict	tb3	SELECT	NO
 	
@@ -12059,46 +14109,46 @@ TABLE_SCHEMA	varchar(64)	NO
 TABLE_NAME	varchar(64)	NO			
 TABLE_TYPE	varchar(64)	NO			
 ENGINE	varchar(64)	YES		NULL	
-VERSION	bigint(21)	YES		NULL	
+VERSION	bigint(21) unsigned	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
-TABLE_ROWS	bigint(21)	YES		NULL	
-AVG_ROW_LENGTH	bigint(21)	YES		NULL	
-DATA_LENGTH	bigint(21)	YES		NULL	
-MAX_DATA_LENGTH	bigint(21)	YES		NULL	
-INDEX_LENGTH	bigint(21)	YES		NULL	
-DATA_FREE	bigint(21)	YES		NULL	
-AUTO_INCREMENT	bigint(21)	YES		NULL	
+TABLE_ROWS	bigint(21) unsigned	YES		NULL	
+AVG_ROW_LENGTH	bigint(21) unsigned	YES		NULL	
+DATA_LENGTH	bigint(21) unsigned	YES		NULL	
+MAX_DATA_LENGTH	bigint(21) unsigned	YES		NULL	
+INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
+DATA_FREE	bigint(21) unsigned	YES		NULL	
+AUTO_INCREMENT	bigint(21) unsigned	YES		NULL	
 CREATE_TIME	datetime	YES		NULL	
 UPDATE_TIME	datetime	YES		NULL	
 CHECK_TIME	datetime	YES		NULL	
 TABLE_COLLATION	varchar(64)	YES		NULL	
-CHECKSUM	bigint(21)	YES		NULL	
+CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(255)	YES		NULL	
 TABLE_COMMENT	varchar(80)	NO			
 SHOW CREATE TABLE tables;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `TABLE_TYPE` varchar(64) NOT NULL default '',
-  `ENGINE` varchar(64) default NULL,
-  `VERSION` bigint(21) default NULL,
-  `ROW_FORMAT` varchar(10) default NULL,
-  `TABLE_ROWS` bigint(21) default NULL,
-  `AVG_ROW_LENGTH` bigint(21) default NULL,
-  `DATA_LENGTH` bigint(21) default NULL,
-  `MAX_DATA_LENGTH` bigint(21) default NULL,
-  `INDEX_LENGTH` bigint(21) default NULL,
-  `DATA_FREE` bigint(21) default NULL,
-  `AUTO_INCREMENT` bigint(21) default NULL,
-  `CREATE_TIME` datetime default NULL,
-  `UPDATE_TIME` datetime default NULL,
-  `CHECK_TIME` datetime default NULL,
-  `TABLE_COLLATION` varchar(64) default NULL,
-  `CHECKSUM` bigint(21) default NULL,
-  `CREATE_OPTIONS` varchar(255) default NULL,
-  `TABLE_COMMENT` varchar(80) NOT NULL default ''
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `ENGINE` varchar(64) DEFAULT NULL,
+  `VERSION` bigint(21) unsigned DEFAULT NULL,
+  `ROW_FORMAT` varchar(10) DEFAULT NULL,
+  `TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
+  `AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `DATA_FREE` bigint(21) unsigned DEFAULT NULL,
+  `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
+  `CREATE_TIME` datetime DEFAULT NULL,
+  `UPDATE_TIME` datetime DEFAULT NULL,
+  `CHECK_TIME` datetime DEFAULT NULL,
+  `TABLE_COLLATION` varchar(64) DEFAULT NULL,
+  `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
+  `CREATE_OPTIONS` varchar(255) DEFAULT NULL,
+  `TABLE_COMMENT` varchar(80) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12116,20 +14166,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 
@@ -12157,22 +14207,33 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12197,22 +14258,33 @@ connect(localhost,user_2,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12235,22 +14307,33 @@ connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12274,22 +14357,33 @@ root@localhost	db_datadict
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12299,14 +14393,20 @@ NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	N
 NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
 NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Column privileges
 NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Database privileges
+NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Events
 NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		User defined functions
+NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		General log
 NULL	mysql	help_category	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help categories
 NULL	mysql	help_keyword	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help keywords
 NULL	mysql	help_relation	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		keyword-topic relation
 NULL	mysql	help_topic	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help topics
 NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Host privileges;  Merged with database privileges
+NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
+NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		MySQL plugins
 NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Stored Procedures
 NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Procedure privileges
+NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		MySQL Foreign Servers table
+NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Slow log
 NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Table privileges
 NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zones
 NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Leap seconds information for time zones
@@ -12354,14 +14454,14 @@ SECURITY_TYPE	varchar(7)	NO
 SHOW CREATE TABLE views;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
   `VIEW_DEFINITION` longtext NOT NULL,
-  `CHECK_OPTION` varchar(8) NOT NULL default '',
-  `IS_UPDATABLE` varchar(3) NOT NULL default '',
-  `DEFINER` varchar(77) NOT NULL default '',
-  `SECURITY_TYPE` varchar(7) NOT NULL default ''
+  `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
+  `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
+  `DEFINER` varchar(77) NOT NULL DEFAULT '',
+  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12449,21 +14549,21 @@ COMMENT	varchar(16)	YES		NULL
 SHOW CREATE TABLE statistics;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `NON_UNIQUE` bigint(1) NOT NULL default '0',
-  `INDEX_SCHEMA` varchar(64) NOT NULL default '',
-  `INDEX_NAME` varchar(64) NOT NULL default '',
-  `SEQ_IN_INDEX` bigint(2) NOT NULL default '0',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `COLLATION` varchar(1) default NULL,
-  `CARDINALITY` bigint(21) default NULL,
-  `SUB_PART` bigint(3) default NULL,
-  `PACKED` varchar(10) default NULL,
-  `NULLABLE` varchar(3) NOT NULL default '',
-  `INDEX_TYPE` varchar(16) NOT NULL default '',
-  `COMMENT` varchar(16) default NULL
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `NON_UNIQUE` bigint(1) NOT NULL DEFAULT '0',
+  `INDEX_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `INDEX_NAME` varchar(64) NOT NULL DEFAULT '',
+  `SEQ_IN_INDEX` bigint(2) NOT NULL DEFAULT '0',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLLATION` varchar(1) DEFAULT NULL,
+  `CARDINALITY` bigint(21) DEFAULT NULL,
+  `SUB_PART` bigint(3) DEFAULT NULL,
+  `PACKED` varchar(10) DEFAULT NULL,
+  `NULLABLE` varchar(3) NOT NULL DEFAULT '',
+  `INDEX_TYPE` varchar(16) NOT NULL DEFAULT '',
+  `COMMENT` varchar(16) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12541,6 +14641,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -12552,6 +14654,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	0	NULL	NULL		BTREE	
@@ -12561,6 +14665,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -12610,11 +14715,11 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE schema_privileges;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12661,6 +14766,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12675,6 +14782,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401502,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12722,6 +14831,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12736,6 +14847,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401503_1,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12772,10 +14885,10 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE user_privileges;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) DEFAULT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12817,10 +14930,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12840,10 +14953,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12855,10 +14968,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12882,10 +14995,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12902,10 +15015,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12919,10 +15032,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12934,10 +15047,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT SELECT ON *.* TO 'user_1'@'localhost' WITH GRANT OPTION
@@ -12981,10 +15094,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -13034,10 +15147,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -13049,10 +15162,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -13069,10 +15182,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -13095,10 +15208,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	user_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	user_3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -13155,23 +15268,23 @@ DEFINER	longtext	NO
 SHOW CREATE TABLE triggers;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(4096) default NULL,
-  `TRIGGER_SCHEMA` varchar(64) NOT NULL default '',
-  `TRIGGER_NAME` varchar(64) NOT NULL default '',
-  `EVENT_MANIPULATION` varchar(6) NOT NULL default '',
-  `EVENT_OBJECT_CATALOG` varchar(4096) default NULL,
-  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL default '',
-  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL default '',
-  `ACTION_ORDER` bigint(4) NOT NULL default '0',
+  `TRIGGER_CATALOG` varchar(4096) DEFAULT NULL,
+  `TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '',
+  `EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '',
+  `EVENT_OBJECT_CATALOG` varchar(4096) DEFAULT NULL,
+  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '',
+  `ACTION_ORDER` bigint(4) NOT NULL DEFAULT '0',
   `ACTION_CONDITION` longtext,
   `ACTION_STATEMENT` longtext NOT NULL,
-  `ACTION_ORIENTATION` varchar(9) NOT NULL default '',
-  `ACTION_TIMING` varchar(6) NOT NULL default '',
-  `ACTION_REFERENCE_OLD_TABLE` varchar(64) default NULL,
-  `ACTION_REFERENCE_NEW_TABLE` varchar(64) default NULL,
-  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL default '',
-  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL default '',
-  `CREATED` datetime default NULL,
+  `ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '',
+  `ACTION_TIMING` varchar(6) NOT NULL DEFAULT '',
+  `ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL,
+  `ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL,
+  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '',
+  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '',
+  `CREATED` datetime DEFAULT NULL,
   `SQL_MODE` longtext NOT NULL,
   `DEFINER` longtext NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -13219,11 +15332,70 @@ ERROR 42S02: Unknown table 'parameters' in information_schema
 
 Testcase 3.2.20.1:
 --------------------------------------------------------------------------------
-
-checking a table that will be implemented later
------------------------------------------------
 DESC referential_constraints;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+USE information_schema;
+DESC referential_constraints;
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+SHOW CREATE TABLE referential_constraints;
+Table	Create Table
+REFERENTIAL_CONSTRAINTS	CREATE TEMPORARY TABLE `REFERENTIAL_CONSTRAINTS` (
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `UNIQUE_CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `MATCH_OPTION` varchar(64) NOT NULL DEFAULT '',
+  `UPDATE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `DELETE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `REFERENCED_TABLE_NAME` varchar(64) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
+SELECT COUNT(*) FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+COUNT(*)
+11
+SELECT * FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 
 *** End of Data Dictionary Tests ***
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result
index 13fffecd365..ab4508fb302 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -9,7 +9,7 @@ CREATE TABLE t1_values
 id BIGINT AUTO_INCREMENT,
 select_id BIGINT,
 PRIMARY KEY(id)
-) ENGINE = 'MYISAM' ;
+) ENGINE = <engine_to_be_tested>;
 ALTER TABLE t1_values ADD my_char_30        CHAR(30);
 ALTER TABLE t1_values ADD my_varchar_1000   VARCHAR(1000);
 ALTER TABLE t1_values ADD my_binary_30      BINARY(30);
@@ -123,10 +123,8 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = 1758;
-
-some statements disabled because of
-Bug#12440: CAST(data type DOUBLE AS TIME) strange results
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = +1.758E+3;
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -135,29 +133,20 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_binary_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '-3333.3333';
-
-some statements disabled because of
-Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = -0.33333333E+4;
 
 "Attention: CAST --> SIGNED INTEGER
-            The file with expected results suffers from
-            Bug#5083 Big integer values are inserted as negative into 
-                     decimal/string columns
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Both have the status: To be fixed later"
---------------------------------------------------------------------------------
-
-some statements disabled because of
-Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result
+            Status: To be fixed later"
 --------------------------------------------------------------------------------
 
 "Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5083 5913 9809"
+            The file with expected results suffers from Bug 5913"
 --------------------------------------------------------------------------------
 
 some statements disabled because of
-Bugs#8663: cant use bgint unsigned as input to cast
+Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
 SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values';
@@ -175,11 +164,6 @@ SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values';
-
-"Attention: IF(my_year IS NULL, ...
-            The file with expected results suffers from 
-            Bug#11689. successful CREATE VIEW but SELECT on view fails."
---------------------------------------------------------------------------------
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_varchar_1000),
@@ -202,7 +186,7 @@ SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
 
 "Attention: LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', <numeric column>)
-            The file with expected results suffers from Bug 10963 11728"
+            The file with expected results suffers from Bug 10963"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
 because there are 32/64 Bit differences
 --------------------------------------------------------------------------------
@@ -216,8 +200,9 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
+SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select = 
-'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
+'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -299,19 +284,19 @@ SET sql_mode = '';
 --------------------------------------------------------------------------------
 CREATE VIEW v1 AS SELECT my_char_30, id FROM t1_values;
 SELECT my_char_30, id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL;
+WHERE select_id = 190 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL);
+WHERE select_id = 190 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values;
 SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL;
+WHERE select_id = 189 OR select_id IS NULL order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -323,7 +308,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select concat(_latin1'A',`t1_values`.`my_char_30`) AS `CONCAT('A',my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL);
+WHERE select_id = 189 OR select_id IS NULL) order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -337,13 +322,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL;
+WHERE select_id = 188 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varbinary_1000`) AS `LTRIM(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL);
+WHERE select_id = 188 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -351,13 +336,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL;
+WHERE select_id = 187 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_binary_30`) AS `LTRIM(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL);
+WHERE select_id = 187 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -365,13 +350,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL;
+WHERE select_id = 186 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varchar_1000`) AS `LTRIM(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL);
+WHERE select_id = 186 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -379,13 +364,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL;
+WHERE select_id = 185 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_char_30`) AS `LTRIM(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL);
+WHERE select_id = 185 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -393,13 +378,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL;
+WHERE select_id = 184 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varbinary_1000`) AS `LOWER(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL);
+WHERE select_id = 184 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -407,13 +392,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL;
+WHERE select_id = 183 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_binary_30`) AS `LOWER(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL);
+WHERE select_id = 183 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -421,13 +406,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL;
+WHERE select_id = 182 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LOWER(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL);
+WHERE select_id = 182 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -435,13 +420,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL;
+WHERE select_id = 181 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_char_30`) AS `LOWER(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL);
+WHERE select_id = 181 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -449,13 +434,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL;
+WHERE select_id = 180 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_decimal`) AS `LOCATE('-', ' - -ABC', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL);
+WHERE select_id = 180 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -463,13 +448,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL;
+WHERE select_id = 179 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_double`) AS `LOCATE('-', ' - -ABC', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL);
+WHERE select_id = 179 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -477,13 +462,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL;
+WHERE select_id = 178 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_bigint`) AS `LOCATE('-', ' - -ABC', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL);
+WHERE select_id = 178 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -491,13 +476,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL;
+WHERE select_id = 177 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varbinary_1000`,3) AS `LOCATE('-', my_varbinary_1000, 3)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL);
+WHERE select_id = 177 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -505,13 +490,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL;
+WHERE select_id = 176 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_binary_30`,3) AS `LOCATE('-', my_binary_30, 3)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL);
+WHERE select_id = 176 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -519,13 +504,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL;
+WHERE select_id = 175 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varchar_1000`,3) AS `LOCATE('-', my_varchar_1000, 3)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL);
+WHERE select_id = 175 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -533,13 +518,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL;
+WHERE select_id = 174 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_char_30`,3) AS `LOCATE('-', my_char_30, 3)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL);
+WHERE select_id = 174 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -547,13 +532,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL;
+WHERE select_id = 173 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varbinary_1000, my_binary_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL);
+WHERE select_id = 173 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -561,13 +546,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL;
+WHERE select_id = 172 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varbinary_1000, my_varchar_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL);
+WHERE select_id = 172 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -575,13 +560,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL;
+WHERE select_id = 171 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varbinary_1000, my_char_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL);
+WHERE select_id = 171 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -589,13 +574,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL;
+WHERE select_id = 170 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varbinary_1000, my_varbinary_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL);
+WHERE select_id = 170 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -603,13 +588,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL;
+WHERE select_id = 169 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_binary_30, my_varbinary_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL);
+WHERE select_id = 169 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -617,13 +602,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL;
+WHERE select_id = 168 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_binary_30, my_varchar_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL);
+WHERE select_id = 168 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -631,13 +616,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL;
+WHERE select_id = 167 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_binary_30, my_char_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL);
+WHERE select_id = 167 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -645,13 +630,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL;
+WHERE select_id = 166 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_binary_30, my_binary_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL);
+WHERE select_id = 166 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -659,13 +644,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL;
+WHERE select_id = 165 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varchar_1000, my_varbinary_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL);
+WHERE select_id = 165 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -673,13 +658,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL;
+WHERE select_id = 164 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varchar_1000, my_binary_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL);
+WHERE select_id = 164 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -687,13 +672,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL;
+WHERE select_id = 163 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varchar_1000, my_char_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL);
+WHERE select_id = 163 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -701,13 +686,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL;
+WHERE select_id = 162 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varchar_1000, my_varchar_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL);
+WHERE select_id = 162 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -715,13 +700,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL;
+WHERE select_id = 161 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_char_30, my_varbinary_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL);
+WHERE select_id = 161 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -729,13 +714,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL;
+WHERE select_id = 160 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_char_30, my_binary_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL);
+WHERE select_id = 160 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -743,13 +728,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL;
+WHERE select_id = 159 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_char_30, my_varchar_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL);
+WHERE select_id = 159 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -757,13 +742,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values;
 SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL;
+WHERE select_id = 158 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_char_30, my_char_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL);
+WHERE select_id = 158 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -771,13 +756,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL;
+WHERE select_id = 157 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varbinary_1000`) AS `LOCATE('char', my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL);
+WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -785,13 +770,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL;
+WHERE select_id = 156 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_binary_30`) AS `LOCATE('char', my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL);
+WHERE select_id = 156 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -799,13 +784,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL;
+WHERE select_id = 155 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varchar_1000`) AS `LOCATE('char', my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL);
+WHERE select_id = 155 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -813,46 +798,46 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL;
+WHERE select_id = 154 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `LOCATE('char', my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL);
+WHERE select_id = 154 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../log/current_test'), id FROM t1_values;
-SELECT LOAD_FILE('../log/current_test'), id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL;
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: myisam_func_view
+CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
+SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+WHERE select_id = 153 OR select_id IS NULL order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: myisam_func_view
+äÄ@
 	2
-CURRENT_TEST: myisam_func_view
+äÄ@
 	3
-CURRENT_TEST: myisam_func_view
+äÄ@
 	4
-CURRENT_TEST: myisam_func_view
+äÄ@
 	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../log/current_test') AS `LOAD_FILE('../log/current_test')`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL);
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: myisam_func_view
+WHERE select_id = 153 OR select_id IS NULL) order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: myisam_func_view
+äÄ@
 	2
-CURRENT_TEST: myisam_func_view
+äÄ@
 	3
-CURRENT_TEST: myisam_func_view
+äÄ@
 	4
-CURRENT_TEST: myisam_func_view
+äÄ@
 	5
 DROP VIEW v1;
 
@@ -861,13 +846,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL;
+WHERE select_id = 152 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varbinary_1000`) AS `LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL);
+WHERE select_id = 152 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -875,13 +860,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL;
+WHERE select_id = 151 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_binary_30`) AS `LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL);
+WHERE select_id = 151 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -889,13 +874,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL;
+WHERE select_id = 150 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varchar_1000`) AS `LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL);
+WHERE select_id = 150 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -903,19 +888,19 @@ CREATE VIEW v1 AS SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL;
+WHERE select_id = 149 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_char_30`) AS `LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL);
+WHERE select_id = 149 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values;
 SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL;
+WHERE select_id = 148 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -930,7 +915,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL);
+WHERE select_id = 148 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -945,7 +930,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values;
 SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL;
+WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -957,7 +942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varbinary_1000`,2) AS `LEFT(my_varbinary_1000, 2)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL);
+WHERE select_id = 147 OR select_id IS NULL) order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -969,7 +954,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values;
 SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL;
+WHERE select_id = 146 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -981,7 +966,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL);
+WHERE select_id = 146 OR select_id IS NULL) order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -993,7 +978,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values;
 SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL;
+WHERE select_id = 145 OR select_id IS NULL order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1005,7 +990,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varchar_1000`,2) AS `LEFT(my_varchar_1000, 2)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL);
+WHERE select_id = 145 OR select_id IS NULL) order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1017,7 +1002,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values;
 SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL;
+WHERE select_id = 144 OR select_id IS NULL order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1029,7 +1014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_char_30`,2) AS `LEFT(my_char_30, 2)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL);
+WHERE select_id = 144 OR select_id IS NULL) order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1043,13 +1028,13 @@ CREATE VIEW v1 AS SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL;
+WHERE select_id = 143 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LCASE(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL);
+WHERE select_id = 143 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1057,13 +1042,13 @@ CREATE VIEW v1 AS SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values;
 SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL;
+WHERE select_id = 142 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `INSTR(my_char_30, 'char')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL);
+WHERE select_id = 142 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1071,7 +1056,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL;
+WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1083,7 +1068,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varbinary_1000`) AS `BIT_LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL);
+WHERE select_id = 141 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1097,7 +1082,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL;
+WHERE select_id = 140 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1109,7 +1094,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL);
+WHERE select_id = 140 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240		2
@@ -1123,7 +1108,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL;
+WHERE select_id = 139 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1135,7 +1120,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varchar_1000`) AS `BIT_LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL);
+WHERE select_id = 139 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1149,7 +1134,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL;
+WHERE select_id = 138 OR select_id IS NULL order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1161,7 +1146,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_char_30`) AS `BIT_LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL);
+WHERE select_id = 138 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1175,7 +1160,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values;
 SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL;
+WHERE select_id = 137 OR select_id IS NULL order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1187,7 +1172,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_year`,_latin1'IS_NULL') AS `IFNULL(my_year,'IS_NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL);
+WHERE select_id = 137 OR select_id IS NULL) order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1201,7 +1186,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values;
 SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL;
+WHERE select_id = 136 OR select_id IS NULL order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1213,7 +1198,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_time`,_latin1'IS_NULL') AS `IFNULL(my_time,'IS_NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL);
+WHERE select_id = 136 OR select_id IS NULL) order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1227,7 +1212,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values;
 SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL;
+WHERE select_id = 135 OR select_id IS NULL order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1239,7 +1224,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_timestamp`,_latin1'IS_NULL') AS `IFNULL(my_timestamp,'IS_NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL);
+WHERE select_id = 135 OR select_id IS NULL) order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1253,7 +1238,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values;
 SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL;
+WHERE select_id = 134 OR select_id IS NULL order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1265,7 +1250,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_date`,_latin1'IS_NULL') AS `IFNULL(my_date,'IS_NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL);
+WHERE select_id = 134 OR select_id IS NULL) order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1279,7 +1264,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values;
 SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL;
+WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1291,7 +1276,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_datetime`,_latin1'IS_NULL') AS `IFNULL(my_datetime,'IS_NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL);
+WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1305,7 +1290,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values;
 SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL;
+WHERE select_id = 132 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1317,7 +1302,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_double`,_latin1'IS_NULL') AS `IFNULL(my_double,'IS_NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL);
+WHERE select_id = 132 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1331,7 +1316,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values;
 SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL;
+WHERE select_id = 131 OR select_id IS NULL order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1343,7 +1328,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_decimal`,_latin1'IS_NULL') AS `IFNULL(my_decimal,'IS_NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL);
+WHERE select_id = 131 OR select_id IS NULL) order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1357,7 +1342,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values;
 SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL;
+WHERE select_id = 130 OR select_id IS NULL order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1369,7 +1354,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_bigint`,_latin1'IS_NULL') AS `IFNULL(my_bigint,'IS_NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL);
+WHERE select_id = 130 OR select_id IS NULL) order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1383,7 +1368,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL;
+WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1395,7 +1380,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varbinary_1000`,_latin1'IS_NULL') AS `IFNULL(my_varbinary_1000,'IS_NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL);
+WHERE select_id = 129 OR select_id IS NULL) order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1409,7 +1394,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values;
 SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL;
+WHERE select_id = 128 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1421,7 +1406,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,_latin1'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL);
+WHERE select_id = 128 OR select_id IS NULL) order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 		2
@@ -1435,7 +1420,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values;
 SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL;
+WHERE select_id = 127 OR select_id IS NULL order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1447,7 +1432,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varchar_1000`,_latin1'IS_NULL') AS `IFNULL(my_varchar_1000,'IS_NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL);
+WHERE select_id = 127 OR select_id IS NULL) order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1461,7 +1446,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values;
 SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL;
+WHERE select_id = 126 OR select_id IS NULL order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1473,7 +1458,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_char_30`,_latin1'IS_NULL') AS `IFNULL(my_char_30,'IS_NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL);
+WHERE select_id = 126 OR select_id IS NULL) order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1487,7 +1472,7 @@ CREATE VIEW v1 AS SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values;
 SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL;
+WHERE select_id = 125 OR select_id IS NULL order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1501,7 +1486,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL);
+WHERE select_id = 125 OR select_id IS NULL) order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1516,7 +1501,7 @@ CREATE VIEW v1 AS SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values;
 SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL;
+WHERE select_id = 124 OR select_id IS NULL order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1530,7 +1515,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL);
+WHERE select_id = 124 OR select_id IS NULL) order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1545,7 +1530,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL;
+WHERE select_id = 123 OR select_id IS NULL order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1559,7 +1544,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL);
+WHERE select_id = 123 OR select_id IS NULL) order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1574,7 +1559,7 @@ CREATE VIEW v1 AS SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values;
 SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL;
+WHERE select_id = 122 OR select_id IS NULL order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1588,7 +1573,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL);
+WHERE select_id = 122 OR select_id IS NULL) order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1603,7 +1588,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values;
 SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL;
+WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1617,7 +1602,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL);
+WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1632,7 +1617,7 @@ CREATE VIEW v1 AS SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values;
 SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL;
+WHERE select_id = 120 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1646,7 +1631,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL);
+WHERE select_id = 120 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1661,7 +1646,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values;
 SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL;
+WHERE select_id = 119 OR select_id IS NULL order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1675,7 +1660,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL);
+WHERE select_id = 119 OR select_id IS NULL) order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1690,7 +1675,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values;
 SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL;
+WHERE select_id = 118 OR select_id IS NULL order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1704,7 +1689,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL);
+WHERE select_id = 118 OR select_id IS NULL) order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1719,7 +1704,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL;
+WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1733,7 +1718,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL);
+WHERE select_id = 117 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1748,7 +1733,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL;
+WHERE select_id = 116 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1762,7 +1747,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL);
+WHERE select_id = 116 OR select_id IS NULL) order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1777,7 +1762,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL;
+WHERE select_id = 115 OR select_id IS NULL order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1791,7 +1776,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL);
+WHERE select_id = 115 OR select_id IS NULL) order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1806,7 +1791,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values;
 SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL;
+WHERE select_id = 114 OR select_id IS NULL order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1820,7 +1805,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL);
+WHERE select_id = 114 OR select_id IS NULL) order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1835,7 +1820,7 @@ CREATE VIEW v1 AS SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values;
 SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL;
+WHERE select_id = 113 OR select_id IS NULL order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1847,7 +1832,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_year`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_year, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL);
+WHERE select_id = 113 OR select_id IS NULL) order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1861,7 +1846,7 @@ CREATE VIEW v1 AS SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values;
 SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL;
+WHERE select_id = 112 OR select_id IS NULL order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1873,7 +1858,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_time`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_time, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL);
+WHERE select_id = 112 OR select_id IS NULL) order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1887,7 +1872,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL;
+WHERE select_id = 111 OR select_id IS NULL order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1899,7 +1884,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_timestamp`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL);
+WHERE select_id = 111 OR select_id IS NULL) order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1913,7 +1898,7 @@ CREATE VIEW v1 AS SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values;
 SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL;
+WHERE select_id = 110 OR select_id IS NULL order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1925,7 +1910,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_date`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_date, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL);
+WHERE select_id = 110 OR select_id IS NULL) order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1939,7 +1924,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values;
 SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL;
+WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1951,7 +1936,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_datetime`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL);
+WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1965,7 +1950,7 @@ CREATE VIEW v1 AS SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values;
 SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL;
+WHERE select_id = 108 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1977,7 +1962,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_double`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_double, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL);
+WHERE select_id = 108 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1991,7 +1976,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values;
 SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL;
+WHERE select_id = 107 OR select_id IS NULL order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2003,7 +1988,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_decimal`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL);
+WHERE select_id = 107 OR select_id IS NULL) order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2017,7 +2002,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values;
 SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL;
+WHERE select_id = 106 OR select_id IS NULL order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2029,7 +2014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_bigint`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL);
+WHERE select_id = 106 OR select_id IS NULL) order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2043,7 +2028,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL;
+WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2055,7 +2040,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varbinary_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL);
+WHERE select_id = 105 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2069,7 +2054,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL;
+WHERE select_id = 104 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2086,7 +2071,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_binary_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL);
+WHERE select_id = 104 OR select_id IS NULL) order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2105,7 +2090,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL;
+WHERE select_id = 103 OR select_id IS NULL order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2117,7 +2102,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varchar_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL);
+WHERE select_id = 103 OR select_id IS NULL) order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2131,7 +2116,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values;
 SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL;
+WHERE select_id = 102 OR select_id IS NULL order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2146,7 +2131,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_char_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL);
+WHERE select_id = 102 OR select_id IS NULL) order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2163,7 +2148,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL;
+WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2175,7 +2160,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using koi8r) AS `CONVERT(my_varbinary_1000 USING koi8r)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL);
+WHERE select_id = 101 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2189,7 +2174,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING koi8r), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL;
+WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2201,7 +2186,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL);
+WHERE select_id = 100 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2215,7 +2200,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING koi8r), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL;
+WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2227,7 +2212,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL);
+WHERE select_id = 99 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2241,7 +2226,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING koi8r), 
 my_char_30, id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL;
+WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2253,7 +2238,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL);
+WHERE select_id = 98 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2267,7 +2252,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING utf8), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL;
+WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2279,7 +2264,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using utf8) AS `CONVERT(my_varbinary_1000 USING utf8)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL);
+WHERE select_id = 97 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2293,7 +2278,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING utf8), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL;
+WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2305,7 +2290,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL);
+WHERE select_id = 96 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -2319,7 +2304,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING utf8), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL;
+WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2331,7 +2316,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using utf8) AS `CONVERT(my_varchar_1000 USING utf8)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL);
+WHERE select_id = 95 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2345,7 +2330,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL;
+WHERE select_id = 94 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2357,7 +2342,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using utf8) AS `CONVERT(my_char_30 USING utf8)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL);
+WHERE select_id = 94 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2371,7 +2356,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL;
+WHERE select_id = 93 OR select_id IS NULL order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2383,7 +2368,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as unsigned) AS `CAST(my_year AS UNSIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL);
+WHERE select_id = 93 OR select_id IS NULL) order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2397,7 +2382,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL;
+WHERE select_id = 92 OR select_id IS NULL order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2415,7 +2400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL);
+WHERE select_id = 92 OR select_id IS NULL) order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2435,7 +2420,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL;
+WHERE select_id = 91 OR select_id IS NULL order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2453,7 +2438,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL);
+WHERE select_id = 91 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2473,7 +2458,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL;
+WHERE select_id = 90 OR select_id IS NULL order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2490,7 +2475,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL);
+WHERE select_id = 90 OR select_id IS NULL) order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2509,7 +2494,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL;
+WHERE select_id = 89 OR select_id IS NULL order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2526,7 +2511,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL);
+WHERE select_id = 89 OR select_id IS NULL) order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2545,7 +2530,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL;
+WHERE select_id = 88 OR select_id IS NULL order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2561,7 +2546,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL);
+WHERE select_id = 88 OR select_id IS NULL) order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2579,7 +2564,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL;
+WHERE select_id = 87 OR select_id IS NULL order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2591,7 +2576,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL);
+WHERE select_id = 87 OR select_id IS NULL) order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2605,7 +2590,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL;
+WHERE select_id = 86 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2622,7 +2607,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL);
+WHERE select_id = 86 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2641,7 +2626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL;
+WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2659,7 +2644,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL);
+WHERE select_id = 85 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -2679,7 +2664,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL;
+WHERE select_id = 84 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2696,7 +2681,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL);
+WHERE select_id = 84 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2715,7 +2700,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL;
+WHERE select_id = 83 OR select_id IS NULL order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2732,7 +2717,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL);
+WHERE select_id = 83 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2751,7 +2736,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL;
+WHERE select_id = 82 OR select_id IS NULL order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2763,7 +2748,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as signed) AS `CAST(my_year AS SIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL);
+WHERE select_id = 82 OR select_id IS NULL) order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2777,7 +2762,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL;
+WHERE select_id = 81 OR select_id IS NULL order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2794,7 +2779,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL);
+WHERE select_id = 81 OR select_id IS NULL) order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2813,7 +2798,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL;
+WHERE select_id = 80 OR select_id IS NULL order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2831,7 +2816,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL);
+WHERE select_id = 80 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2851,7 +2836,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL;
+WHERE select_id = 79 OR select_id IS NULL order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2868,7 +2853,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL);
+WHERE select_id = 79 OR select_id IS NULL) order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2887,7 +2872,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL;
+WHERE select_id = 78 OR select_id IS NULL order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2904,7 +2889,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL);
+WHERE select_id = 78 OR select_id IS NULL) order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2919,11 +2904,43 @@ Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL) order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL;
+WHERE select_id = 76 OR select_id IS NULL order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2938,7 +2955,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL);
+WHERE select_id = 76 OR select_id IS NULL) order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2955,7 +2972,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL;
+WHERE select_id = 75 OR select_id IS NULL order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2967,7 +2984,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as signed) AS `CAST(my_bigint AS SIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL);
+WHERE select_id = 75 OR select_id IS NULL) order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2981,7 +2998,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL;
+WHERE select_id = 74 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2997,7 +3014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL);
+WHERE select_id = 74 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3015,7 +3032,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL;
+WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3032,7 +3049,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL);
+WHERE select_id = 73 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0		2
@@ -3051,7 +3068,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL;
+WHERE select_id = 72 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3067,7 +3084,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL);
+WHERE select_id = 72 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3085,7 +3102,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL;
+WHERE select_id = 71 OR select_id IS NULL order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3101,7 +3118,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL);
+WHERE select_id = 71 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3119,25 +3136,25 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL;
+WHERE select_id = 70 OR select_id IS NULL order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL);
+WHERE select_id = 70 OR select_id IS NULL) order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 DROP VIEW v1;
 
 
@@ -3145,25 +3162,25 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL;
+WHERE select_id = 69 OR select_id IS NULL order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL);
+WHERE select_id = 69 OR select_id IS NULL) order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -3171,25 +3188,35 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL;
+WHERE select_id = 68 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL);
+WHERE select_id = 68 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3197,25 +3224,25 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL;
+WHERE select_id = 67 OR select_id IS NULL order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL);
+WHERE select_id = 67 OR select_id IS NULL) order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -3223,25 +3250,73 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL;
+WHERE select_id = 66 OR select_id IS NULL order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL);
+WHERE select_id = 66 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+DROP VIEW v1;
+
+
+CREATE VIEW v1 AS SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as decimal) AS `CAST(my_double AS DECIMAL)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL) order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3249,25 +3324,31 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL;
+WHERE select_id = 64 OR select_id IS NULL order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL);
+WHERE select_id = 64 OR select_id IS NULL) order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3275,25 +3356,31 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL;
+WHERE select_id = 63 OR select_id IS NULL order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL);
+WHERE select_id = 63 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3301,14 +3388,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL;
+WHERE select_id = 62 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3318,14 +3405,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL);
+WHERE select_id = 62 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3337,14 +3424,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL;
+WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	27
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3359,14 +3446,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL);
+WHERE select_id = 61 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	27
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3383,14 +3470,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL;
+WHERE select_id = 60 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3400,14 +3487,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL);
+WHERE select_id = 60 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3419,14 +3506,14 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL;
+WHERE select_id = 59 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3439,14 +3526,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL);
+WHERE select_id = 59 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3461,7 +3548,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL;
+WHERE select_id = 58 OR select_id IS NULL order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3473,7 +3560,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL);
+WHERE select_id = 58 OR select_id IS NULL) order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3487,7 +3574,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL;
+WHERE select_id = 57 OR select_id IS NULL order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3499,7 +3586,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as time) AS `CAST(my_time AS TIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL);
+WHERE select_id = 57 OR select_id IS NULL) order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3513,7 +3600,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL;
+WHERE select_id = 56 OR select_id IS NULL order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3525,7 +3612,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as time) AS `CAST(my_timestamp AS TIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL);
+WHERE select_id = 56 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3539,7 +3626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL;
+WHERE select_id = 55 OR select_id IS NULL order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3551,7 +3638,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as time) AS `CAST(my_date AS TIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL);
+WHERE select_id = 55 OR select_id IS NULL) order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3565,7 +3652,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL;
+WHERE select_id = 54 OR select_id IS NULL order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3577,7 +3664,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as time) AS `CAST(my_datetime AS TIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL);
+WHERE select_id = 54 OR select_id IS NULL) order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3587,11 +3674,45 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL) order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL;
+WHERE select_id = 52 OR select_id IS NULL order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3607,7 +3728,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL);
+WHERE select_id = 52 OR select_id IS NULL) order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3625,7 +3746,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL;
+WHERE select_id = 51 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3642,7 +3763,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as time) AS `CAST(my_varbinary_1000 AS TIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL);
+WHERE select_id = 51 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3661,7 +3782,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL;
+WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3680,7 +3801,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as time) AS `CAST(my_binary_30 AS TIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL);
+WHERE select_id = 50 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00		2
@@ -3701,7 +3822,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL;
+WHERE select_id = 49 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3718,7 +3839,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as time) AS `CAST(my_varchar_1000 AS TIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL);
+WHERE select_id = 49 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3737,7 +3858,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL;
+WHERE select_id = 48 OR select_id IS NULL order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3754,7 +3875,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as time) AS `CAST(my_char_30 AS TIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL);
+WHERE select_id = 48 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3773,7 +3894,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL;
+WHERE select_id = 47 OR select_id IS NULL order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3781,16 +3902,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL);
+WHERE select_id = 47 OR select_id IS NULL) order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3798,10 +3919,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -3809,35 +3930,31 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL;
+WHERE select_id = 46 OR select_id IS NULL order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL);
+WHERE select_id = 46 OR select_id IS NULL) order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 DROP VIEW v1;
 
 
@@ -3845,7 +3962,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL;
+WHERE select_id = 45 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3857,7 +3974,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as datetime) AS `CAST(my_timestamp AS DATETIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL);
+WHERE select_id = 45 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3871,7 +3988,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL;
+WHERE select_id = 44 OR select_id IS NULL order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3883,7 +4000,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as datetime) AS `CAST(my_date AS DATETIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL);
+WHERE select_id = 44 OR select_id IS NULL) order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3897,7 +4014,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL;
+WHERE select_id = 43 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3909,7 +4026,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as datetime) AS `CAST(my_datetime AS DATETIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL);
+WHERE select_id = 43 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3923,7 +4040,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL;
+WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3932,17 +4049,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL);
+WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3951,11 +4068,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -3963,7 +4080,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL;
+WHERE select_id = 41 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3972,17 +4089,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL);
+WHERE select_id = 41 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3991,11 +4108,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4003,7 +4120,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL;
+WHERE select_id = 40 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4012,16 +4129,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as datetime) AS `CAST(my_varbinary_1000 AS DATETIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL);
+WHERE select_id = 40 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4030,10 +4147,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4041,7 +4158,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL;
+WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4050,17 +4167,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as datetime) AS `CAST(my_binary_30 AS DATETIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL);
+WHERE select_id = 39 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4069,10 +4186,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 DROP VIEW v1;
 
@@ -4081,7 +4198,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL;
+WHERE select_id = 38 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4090,16 +4207,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as datetime) AS `CAST(my_varchar_1000 AS DATETIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL);
+WHERE select_id = 38 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4108,10 +4225,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4119,7 +4236,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL;
+WHERE select_id = 37 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4128,16 +4245,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as datetime) AS `CAST(my_char_30 AS DATETIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL);
+WHERE select_id = 37 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4146,10 +4263,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4157,7 +4274,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL;
+WHERE select_id = 36 OR select_id IS NULL order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4165,16 +4282,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL);
+WHERE select_id = 36 OR select_id IS NULL) order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4182,10 +4299,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -4193,7 +4310,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL;
+WHERE select_id = 35 OR select_id IS NULL order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4205,7 +4322,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL);
+WHERE select_id = 35 OR select_id IS NULL) order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4219,7 +4336,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL;
+WHERE select_id = 34 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4231,7 +4348,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as date) AS `CAST(my_timestamp AS DATE)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL);
+WHERE select_id = 34 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4245,7 +4362,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL;
+WHERE select_id = 33 OR select_id IS NULL order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4257,7 +4374,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as date) AS `CAST(my_date AS DATE)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL);
+WHERE select_id = 33 OR select_id IS NULL) order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4271,7 +4388,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL;
+WHERE select_id = 32 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4283,7 +4400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as date) AS `CAST(my_datetime AS DATE)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL);
+WHERE select_id = 32 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4297,7 +4414,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL;
+WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4306,16 +4423,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL);
+WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4324,10 +4441,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4335,7 +4452,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL;
+WHERE select_id = 30 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4344,16 +4461,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL);
+WHERE select_id = 30 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4362,10 +4479,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4373,7 +4490,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL;
+WHERE select_id = 29 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4382,16 +4499,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as date) AS `CAST(my_varbinary_1000 AS DATE)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL);
+WHERE select_id = 29 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4400,10 +4517,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4411,7 +4528,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL;
+WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4420,17 +4537,17 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as date) AS `CAST(my_binary_30 AS DATE)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL);
+WHERE select_id = 28 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL		2
@@ -4439,10 +4556,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	10
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 DROP VIEW v1;
 
@@ -4451,7 +4568,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL;
+WHERE select_id = 27 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4460,16 +4577,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as date) AS `CAST(my_varchar_1000 AS DATE)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL);
+WHERE select_id = 27 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4478,10 +4595,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4489,7 +4606,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL;
+WHERE select_id = 26 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4498,16 +4615,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as date) AS `CAST(my_char_30 AS DATE)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL);
+WHERE select_id = 26 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4516,10 +4633,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---äÖüß@µ*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---äÖüß@µ*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4527,7 +4644,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL;
+WHERE select_id = 25 OR select_id IS NULL order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4539,7 +4656,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset latin1) AS `CAST(my_year AS CHAR)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL);
+WHERE select_id = 25 OR select_id IS NULL) order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4553,7 +4670,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL;
+WHERE select_id = 24 OR select_id IS NULL order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4565,7 +4682,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset latin1) AS `CAST(my_time AS CHAR)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL);
+WHERE select_id = 24 OR select_id IS NULL) order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4579,7 +4696,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL;
+WHERE select_id = 23 OR select_id IS NULL order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4591,7 +4708,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset latin1) AS `CAST(my_timestamp AS CHAR)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL);
+WHERE select_id = 23 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4605,7 +4722,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL;
+WHERE select_id = 22 OR select_id IS NULL order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4617,7 +4734,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset latin1) AS `CAST(my_date AS CHAR)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL);
+WHERE select_id = 22 OR select_id IS NULL) order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4631,7 +4748,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL;
+WHERE select_id = 21 OR select_id IS NULL order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4643,7 +4760,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset latin1) AS `CAST(my_datetime AS CHAR)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL);
+WHERE select_id = 21 OR select_id IS NULL) order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4657,7 +4774,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL;
+WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4669,7 +4786,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset latin1) AS `CAST(my_double AS CHAR)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL);
+WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4683,7 +4800,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL;
+WHERE select_id = 19 OR select_id IS NULL order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4695,7 +4812,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset latin1) AS `CAST(my_decimal AS CHAR)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL);
+WHERE select_id = 19 OR select_id IS NULL) order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4709,7 +4826,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL;
+WHERE select_id = 18 OR select_id IS NULL order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4721,7 +4838,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset latin1) AS `CAST(my_bigint AS CHAR)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL);
+WHERE select_id = 18 OR select_id IS NULL) order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4735,7 +4852,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL;
+WHERE select_id = 17 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4747,7 +4864,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset latin1) AS `CAST(my_varbinary_1000 AS CHAR)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL);
+WHERE select_id = 17 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4761,7 +4878,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL;
+WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4773,7 +4890,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL);
+WHERE select_id = 16 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -4787,7 +4904,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL;
+WHERE select_id = 15 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4799,7 +4916,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset latin1) AS `CAST(my_varchar_1000 AS CHAR)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL);
+WHERE select_id = 15 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4813,7 +4930,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL;
+WHERE select_id = 14 OR select_id IS NULL order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4825,7 +4942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset latin1) AS `CAST(my_char_30 AS CHAR)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL);
+WHERE select_id = 14 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4839,7 +4956,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL;
+WHERE select_id = 13 OR select_id IS NULL order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4851,7 +4968,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset binary) AS `CAST(my_year AS BINARY)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL);
+WHERE select_id = 13 OR select_id IS NULL) order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4865,7 +4982,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL;
+WHERE select_id = 12 OR select_id IS NULL order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4877,7 +4994,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset binary) AS `CAST(my_time AS BINARY)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL);
+WHERE select_id = 12 OR select_id IS NULL) order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4891,7 +5008,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL;
+WHERE select_id = 11 OR select_id IS NULL order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4903,7 +5020,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset binary) AS `CAST(my_timestamp AS BINARY)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL);
+WHERE select_id = 11 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4917,7 +5034,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL;
+WHERE select_id = 10 OR select_id IS NULL order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4929,7 +5046,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset binary) AS `CAST(my_date AS BINARY)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL);
+WHERE select_id = 10 OR select_id IS NULL) order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4943,7 +5060,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL;
+WHERE select_id = 9 OR select_id IS NULL order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4955,7 +5072,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset binary) AS `CAST(my_datetime AS BINARY)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL);
+WHERE select_id = 9 OR select_id IS NULL) order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4969,7 +5086,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL;
+WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4981,7 +5098,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset binary) AS `CAST(my_double AS BINARY)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL);
+WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4995,7 +5112,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL;
+WHERE select_id = 7 OR select_id IS NULL order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5007,7 +5124,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset binary) AS `CAST(my_decimal AS BINARY)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL);
+WHERE select_id = 7 OR select_id IS NULL) order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5021,7 +5138,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL;
+WHERE select_id = 6 OR select_id IS NULL order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5033,7 +5150,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset binary) AS `CAST(my_bigint AS BINARY)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL);
+WHERE select_id = 6 OR select_id IS NULL) order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5047,7 +5164,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL;
+WHERE select_id = 5 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5059,7 +5176,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset binary) AS `CAST(my_varbinary_1000 AS BINARY)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL);
+WHERE select_id = 5 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5073,7 +5190,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL;
+WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5085,7 +5202,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL);
+WHERE select_id = 4 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 		2
@@ -5099,7 +5216,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL;
+WHERE select_id = 3 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5111,7 +5228,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset binary) AS `CAST(my_varchar_1000 AS BINARY)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL);
+WHERE select_id = 3 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5125,7 +5242,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL;
+WHERE select_id = 2 OR select_id IS NULL order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5137,7 +5254,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset binary) AS `CAST(my_char_30 AS BINARY)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL);
+WHERE select_id = 2 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5149,7 +5266,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT sqrt(my_bigint), my_bigint, id FROM t1_values;
 SELECT sqrt(my_bigint), my_bigint, id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL;
+WHERE select_id = 1 OR select_id IS NULL order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -5163,7 +5280,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sqrt(`t1_values`.`my_bigint`) AS `sqrt(my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL);
+WHERE select_id = 1 OR select_id IS NULL) order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc.result b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
index a1e08c94ab9..b52f0dbbbf0 100644
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
@@ -3,19 +3,16 @@
 .                         IMPORTANT NOTICE:
 .                         -----------------
 .
-.  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
-.         for correctness!
+.  FIXME: The .result files are still NOT CHECKED for correctness!
 .
 .  FIXME: Several tests are affected by known problems around DECIMAL
-.  FIXME: and NUMERIC that needs to be checked again after WL#2984
+.  FIXME: and NUMERIC that will be checked again after WL#2984 once
 .  FIXME: has been completed. Some of them are marked in the result.
 .
-.  This .result file has been checked OK with Linux 5.0.23-bk,
-.  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
-.
-. This file has been saved although it might contain failures / wrong
-. results to be able to detect _new_ differences in the behaviour.
-. Hopefully the remaining checks can be made soon.
+. Currently (Dec 06, 2005) this .result file is checked OK for Linux
+. with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
+. Using the available Windows version 5.0.16 there are differences
+. that can be ignored (e.g. WL#2984).
 .
 --------------------------------------------------------------------------------
 	FIXME: There are subtests that are switched off due to known bugs:
@@ -99,20 +96,21 @@ USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
+f1	f2	f3	f4	f5	f6
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
 set @v1 = f1;
 SELECT @v1, @v1;
 END//
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
+@v1	@v1
+abc	abc
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 binary ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -121,12 +119,12 @@ SELECT @v1;
 END//
 CALL sp1( 34 );
 @v1
-3
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+34
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 blob ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -139,6 +137,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 int )  language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -151,6 +151,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
@@ -159,19 +161,13 @@ BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(60, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
@@ -179,56 +175,51 @@ SELECT @v1;
 END//
 CALL sp1( 17976931340000 );
 @v1
-17976931340000.000000000000000000000000000000
+17976931340000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 set("value1", "value1") ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 CALL sp1( "value1, value1" );
 f1
-value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+value1, value1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) language sql SELECT f1;
 CALL sp1( 'abc' );
@@ -278,9 +269,7 @@ SHOW PROCEDURE status like 'sp1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 DROP PROCEDURE sp1;
 
 Testcase 4.1.2:
@@ -344,13 +333,11 @@ CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  lang
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SELECT fn1( "value1" );
 fn1( "value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
+Warning	1292	Truncated incorrect DECIMAL value: 'value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -359,14 +346,11 @@ CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) langua
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 SELECT fn1( "value1, value1" );
 fn1( "value1, value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+Warning	1292	Truncated incorrect DECIMAL value: 'value1, value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -457,7 +441,7 @@ CREATE PROCEDURE sp1 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(f1 char(20) )
+sp1		CREATE PROCEDURE `sp1`(f1 char(20) )
 SELECT * from t1 where f2 = f1
 DROP PROCEDURE sp1;
 
@@ -470,7 +454,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50)
 return concat('hello, ', s, '!');
 show CREATE FUNCTION fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50)
+fn1		CREATE FUNCTION `fn1`(s char(20)) RETURNS char(50)
 return concat('hello, ', s, '!')
 DROP FUNCTION fn1;
 
@@ -514,7 +498,7 @@ CREATE PROCEDURE sp7b (a char (20), out b char(20))
 SELECT f1 into b from t1 where t1.f2= a;
 CALL sp7b('xyz', @out_param);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -527,8 +511,8 @@ END//
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -2581,12 +2565,12 @@ alter procedure sp1 sql security definer;
 alter function sp1 sql security definer;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
+sp1		CREATE PROCEDURE `sp1`()
     COMMENT 'this is a procedure'
 set @x= 3
 show CREATE FUNCTION sp1;
 Function	sql_mode	Create Function
-sp1		CREATE DEFINER=`root`@`localhost` FUNCTION `sp1`() RETURNS int(11)
+sp1		CREATE FUNCTION `sp1`() RETURNS int(11)
     COMMENT 'this is a function'
 return 4
 USE db_storedproc;
@@ -4603,9 +4587,6 @@ END begin_label//
 CALL sp1();
 @v1	@v2
 1	2
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.7:
@@ -4640,9 +4621,6 @@ declare y char;
 SELECT f1, f2 into x, y from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.9:
@@ -4725,9 +4703,9 @@ fetch cur1 into e;
 SELECT x, y, z, a, b, c, d, e;
 close cur1;
 END//
-ERROR 42000: Too big scale 255 specified for column ''. Maximum is 30.
 CALL sp6();
-ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
+x	y	z	a	b	c	d	e
+a	1	1.1	value1	1200000000000	mediumtext	2005-02-02 12:12:12	a`
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -4759,7 +4737,7 @@ BEGIN
 declare x char, integer default '0';
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0';
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -4768,7 +4746,7 @@ BEGIN
 declare x1, x2 char, integer default '0', 1;
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0', 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0', 1;
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -6010,11 +5988,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-000	000	000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6023,7 +5997,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-001	001	001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6050,11 +6024,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000	00000	00000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6063,7 +6033,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00001	00001	00001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6090,11 +6060,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000	00000000	00000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6103,7 +6069,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001	00000001	00000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6130,11 +6096,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6143,7 +6105,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000001	0000000001	0000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6161,7 +6123,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-18446744073709551615	18446744073709551615	18446744073709551615
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6170,11 +6132,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000000	00000000000000000000	00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6183,7 +6141,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000001	00000000000000000001	00000000000000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6192,11 +6150,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--9999999999	-9999999999	-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6207,11 +6161,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6220,11 +6170,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6235,11 +6181,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6250,11 +6192,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6265,11 +6203,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6280,11 +6214,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6295,11 +6225,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6326,7 +6252,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6335,7 +6261,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6344,7 +6270,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6353,7 +6279,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6362,7 +6288,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6371,7 +6297,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6407,7 +6333,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-2005-02-02 12:20:12	2005-02-02 12:20:12	2005-02-02 12:20:12
+20050202122012	20050202122012	20050202122012
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -12458,13 +12384,10 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	a	3
-Warnings:
-Warning	1265	Data truncated for column 'y' at row 3
-Warning	1265	Data truncated for column 'y' at row 1
+NULL	abaa	3
 SELECT @v1, @v2;
 @v1	@v2
-4	a
+4	a`
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12531,7 +12454,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12558,11 +12481,9 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-t
+temp
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12580,7 +12501,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
+Warning	1292	Truncated incorrect DOUBLE value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12606,9 +12527,7 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-0000-00-00 00:00:00
-Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+asd
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12652,7 +12571,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12683,8 +12602,6 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12748,8 +12665,6 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12757,8 +12672,6 @@ declare x tinyint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12766,8 +12679,6 @@ declare x tinyint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12775,8 +12686,6 @@ declare x tinyint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12784,8 +12693,6 @@ declare x tinyint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12793,8 +12700,6 @@ declare x smallint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12802,8 +12707,6 @@ declare x smallint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12811,8 +12714,6 @@ declare x smallint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12820,8 +12721,6 @@ declare x smallint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12829,8 +12728,6 @@ declare x mediumint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12838,8 +12735,6 @@ declare x mediumint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12847,8 +12742,6 @@ declare x mediumint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12856,8 +12749,6 @@ declare x mediumint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12865,8 +12756,6 @@ declare x int;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12874,8 +12763,6 @@ declare x int unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12883,8 +12770,6 @@ declare x int zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12892,8 +12777,6 @@ declare x int unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12901,8 +12784,6 @@ declare x bigint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12910,8 +12791,6 @@ declare x bigint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12919,8 +12798,6 @@ declare x bigint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12928,8 +12805,6 @@ declare x bigint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12938,7 +12813,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12947,7 +12822,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12956,7 +12831,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12965,7 +12840,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12974,7 +12849,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12983,7 +12858,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12992,7 +12867,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13001,7 +12876,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13009,8 +12884,6 @@ declare x real;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13018,8 +12891,6 @@ declare x real unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13027,8 +12898,6 @@ declare x real zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13036,8 +12905,6 @@ declare x real unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13045,8 +12912,6 @@ declare x float;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13054,8 +12919,6 @@ declare x float unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13063,8 +12926,6 @@ declare x float zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13072,8 +12933,6 @@ declare x float unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13081,8 +12940,6 @@ declare x date;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13090,8 +12947,6 @@ declare x time;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13099,8 +12954,6 @@ declare x datetime;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13108,8 +12961,6 @@ declare x timestamp;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13117,8 +12968,6 @@ declare x year;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13126,8 +12975,6 @@ declare x year(3);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13135,8 +12982,6 @@ declare x year(4);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13144,8 +12989,6 @@ declare x enum("1enum", "2enum");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13153,8 +12996,6 @@ declare x set("1set", "2set");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.38:
@@ -13802,7 +13643,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13828,7 +13669,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -15085,7 +14926,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
--46744073709551616
+0
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -15104,8 +14945,6 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -15133,10 +14972,6 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -15145,9 +14980,7 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -15156,10 +14989,7 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15178,10 +15008,6 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15190,9 +15016,7 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15201,10 +15025,7 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15240,10 +15061,7 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15279,10 +15097,7 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000000000000000000000000000000000000000000000000000000001
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15291,10 +15106,7 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15303,10 +15115,7 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000001
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15315,10 +15124,7 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15336,9 +15142,7 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15347,9 +15151,7 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15358,9 +15160,7 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15378,9 +15178,7 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15389,9 +15187,7 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15400,9 +15196,7 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15420,9 +15214,7 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15431,9 +15223,7 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15442,9 +15232,7 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15462,9 +15250,7 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15473,9 +15259,7 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15484,9 +15268,7 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15504,9 +15286,7 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15515,9 +15295,7 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15526,9 +15304,7 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15546,9 +15322,7 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15557,9 +15331,7 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15568,9 +15340,7 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15579,10 +15349,7 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2147483648
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15618,9 +15385,7 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15647,11 +15412,7 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15660,9 +15421,7 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15671,9 +15430,7 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15683,9 +15440,6 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15694,9 +15448,7 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15705,10 +15457,7 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15717,9 +15466,7 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15729,9 +15476,6 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15740,9 +15484,7 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15751,10 +15493,7 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15763,12 +15502,7 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999999999999999999999999999.999999999999999999999999999999
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15778,10 +15512,6 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15791,10 +15521,6 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15803,10 +15529,7 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15854,9 +15577,7 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15865,9 +15586,7 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15876,10 +15595,7 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15897,9 +15613,7 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15908,9 +15622,7 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15919,9 +15631,7 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15957,11 +15667,7 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15997,11 +15703,7 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
@@ -16057,7 +15759,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-25:59:59
+26:00:00
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -16066,7 +15768,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:00
+1998-01-02 01:01:01
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -16076,8 +15778,6 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -16087,8 +15787,6 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
 CREATE FUNCTION fn96( f1 char binary) returns char binary
 BEGIN
@@ -16098,8 +15796,6 @@ END//
 SELECT fn96( 'h');
 fn96( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -16221,7 +15917,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
-18400000000000000000
+-9223372036854775808
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -16230,7 +15926,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-00184000000000000000
+184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -16239,9 +15935,7 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
-00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-9220000000000000
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
@@ -16253,7 +15947,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
@@ -16265,7 +15959,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -16274,11 +15968,7 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -16287,9 +15977,7 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
@@ -16301,10 +15989,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
@@ -16316,7 +16001,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
@@ -16328,11 +16013,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
@@ -16344,9 +16025,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
@@ -16358,10 +16037,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
@@ -16373,7 +16049,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000000000000000000000000
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
@@ -16385,7 +16061,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
@@ -16397,7 +16073,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-000000000000000010000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
@@ -16409,10 +16085,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
@@ -16421,7 +16094,7 @@ SELECT f1;
 END//
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000
+-1000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
@@ -16430,10 +16103,10 @@ SELECT f1;
 END//
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000
+100000000000000000000.000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
@@ -16445,10 +16118,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp20_duz( 100000000000000000000 );
 f1
-0000000000000000000000000000000000000000000100000000000000000000
+100000000000000000000.000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-0000000000000000000000000000000000000001000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
@@ -16460,10 +16133,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
@@ -16475,10 +16145,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
@@ -16490,10 +16157,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
@@ -16505,10 +16169,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16526,9 +16187,7 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16537,9 +16196,7 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16548,9 +16205,7 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16568,9 +16223,7 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16579,9 +16232,7 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16590,9 +16241,7 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16610,9 +16259,7 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16621,9 +16268,7 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16632,9 +16277,7 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16652,9 +16295,7 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16663,9 +16304,7 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16674,9 +16313,7 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16694,9 +16331,7 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16705,9 +16340,7 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16716,9 +16349,7 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16736,9 +16367,7 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16747,9 +16376,7 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16758,9 +16385,7 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16769,10 +16394,7 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2150000000
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16799,7 +16421,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-0215000000
+215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16808,9 +16430,7 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16837,11 +16457,7 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388602
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16850,9 +16466,7 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16861,9 +16475,7 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16872,10 +16484,7 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16884,9 +16493,7 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16895,10 +16502,7 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16907,9 +16511,7 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16918,10 +16520,7 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16930,9 +16529,7 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16941,10 +16538,7 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
@@ -16953,12 +16547,7 @@ SELECT f1;
 END//
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
@@ -16967,11 +16556,7 @@ SELECT f1;
 END//
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
@@ -16980,11 +16565,7 @@ SELECT f1;
 END//
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
@@ -16993,10 +16574,7 @@ SELECT f1;
 END//
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
@@ -17005,7 +16583,7 @@ SELECT f1;
 END//
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000
+-10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
@@ -17014,7 +16592,7 @@ SELECT f1;
 END//
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
@@ -17023,7 +16601,7 @@ SELECT f1;
 END//
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
@@ -17032,7 +16610,7 @@ SELECT f1;
 END//
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -17041,9 +16619,7 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -17052,9 +16628,7 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -17063,10 +16637,7 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -17075,7 +16646,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.1
+1.10000
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -17084,9 +16655,7 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -17095,9 +16664,7 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -17106,9 +16673,7 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -17144,11 +16709,7 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-32602
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -17184,11 +16745,7 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-102
 DROP PROCEDURE IF EXISTS sp89;
 DROP PROCEDURE IF EXISTS sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -17208,7 +16765,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-25:59:59
+26:00:00.999997
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -17217,7 +16774,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:00
+1998-01-02 01:01:01.000001
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -17226,9 +16783,7 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -17237,9 +16792,7 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -17248,9 +16801,7 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -17295,7 +16846,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-2061
+61
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -17350,8 +16901,6 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -17388,9 +16937,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
+61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2033	2084	2033	2084
+61	71	61	71	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17461,9 +17010,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
+ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17606,7 +17155,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-18400000000000000000	NULL
+9223372036854775807	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17614,7 +17163,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-18400000000000000000	18400000000000000000	NULL
+9223372036854775807	9223372036854775807	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17622,7 +17171,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
-18353255926290448384	18353255926290448384	18353255926290448384
+-2	-2	-2
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17630,7 +17179,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
-18353255926290448384	18353255926290448384
+-2	-2
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17688,9 +17237,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17742,9 +17291,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17788,9 +17337,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17823,9 +17372,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17858,9 +17407,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17893,9 +17442,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17928,9 +17477,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17996,9 +17545,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -18030,9 +17579,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -18064,9 +17613,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -18098,9 +17647,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -18132,9 +17681,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -18166,9 +17715,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -18234,9 +17783,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -18268,9 +17817,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -18302,9 +17851,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -18370,9 +17919,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -18404,9 +17953,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -18438,9 +17987,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18472,9 +18021,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18540,9 +18089,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18574,9 +18123,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18642,9 +18191,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18676,9 +18225,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18744,9 +18293,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18778,9 +18327,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18812,9 +18361,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18846,9 +18395,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18880,9 +18429,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18914,9 +18463,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18948,9 +18497,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18982,9 +18531,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -19016,9 +18565,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -19050,9 +18599,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -19084,9 +18633,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -19118,9 +18667,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -19152,9 +18701,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -19186,9 +18735,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -19220,9 +18769,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -19254,9 +18803,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -19288,9 +18837,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -19322,9 +18871,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -19356,9 +18905,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
+61	61	71	61	61	71	61	61	71	61	61	71
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2061	2071	2061	2071
+61	71	61	71	61	71	61	71
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19492,9 +19041,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	a	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	a	a	a
+ah	aah	ah	aah	ah	aah	ah	aah
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19526,9 +19075,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	NULL	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	NULL	a	a
+ah	aah	ah	aah	ah	NULL	ah	aah
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19628,9 +19177,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
+1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
+1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19662,9 +19211,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19696,9 +19245,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19730,9 +19279,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19764,9 +19313,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19798,9 +19347,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19832,9 +19381,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19866,9 +19415,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19900,9 +19449,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19934,9 +19483,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19968,9 +19517,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -20002,9 +19551,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -20036,9 +19585,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -20070,9 +19619,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -20104,9 +19653,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -20138,9 +19687,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -20172,9 +19721,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -20274,9 +19823,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -20308,9 +19857,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -20376,9 +19925,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -20410,9 +19959,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -20444,9 +19993,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20478,9 +20027,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20512,9 +20061,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20546,9 +20095,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20580,9 +20129,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20614,9 +20163,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20682,9 +20231,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20716,9 +20265,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20750,9 +20299,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20818,9 +20367,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20886,9 +20435,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20914,7 +20463,7 @@ insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
 Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
+sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
@@ -20950,7 +20499,7 @@ SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
 Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
+sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
@@ -20993,7 +20542,7 @@ show warnings;
 END//
 show CREATE PROCEDURE sp4;
 Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -21041,14 +20590,14 @@ set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
 Procedure	sql_mode	Create Procedure
-sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
 END
 show CREATE PROCEDURE sp6b;
 Procedure	sql_mode	Create Procedure
-sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
@@ -21056,7 +20605,7 @@ set @y=@x;
 END
 show CREATE PROCEDURE sp6c;
 Procedure	sql_mode	Create Procedure
-sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
@@ -21242,7 +20791,7 @@ END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
+fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
@@ -21274,7 +20823,7 @@ END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
 Procedure	sql_mode	Create Procedure
-sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
+sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
index 7a16c10859b..b314b6c7f1a 100755
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
@@ -166,7 +166,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 limit 1;
+SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -209,7 +209,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 limit 1;
+SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -544,6 +544,9 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
+Warnings:
+Note	1051	Unknown table 'tqq'
+Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()
@@ -1084,7 +1087,8 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
+where f4 >=-5000 order by f4 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1167,7 +1171,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2;
+SELECT f1, f2, f4, f5 from t2 order by f4;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1187,21 +1191,21 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
 open cur1;
 open cur2;
 BEGIN
-declare continue handler for sqlstate '02000' set count = 1;
+declare continue handler for sqlstate '02000' set count=1;
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-1-', count, newf1, newf2, newf4, newf5;
 insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-set count = 4;
+set count= 4;
 BEGIN
-while count > 0 do
+while count> 0 do
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-2-', count, newf1, newf2, newf4, newf5;
-set count = count - 1;
+set count = count- 1;
 END while;
 SELECT '-3-', count, newf1, newf2, newf4, newf4;
 END;
@@ -1270,8 +1274,10 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1302,8 +1308,10 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
index 33a51a7edbe..f41d5d7d440 100755
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
@@ -80,7 +80,7 @@ connect(localhost,user_1,,db_storedproc,MYSQL_PORT,MYSQL_SOCK);
 user_1@localhost	db_storedproc
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-SELECT * FROM db_storedproc.t1 LIMIT 1;
+SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
 END//
 CREATE FUNCTION fn31105(n INT) RETURNS INT
 BEGIN
@@ -209,7 +209,7 @@ CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -226,7 +226,7 @@ CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -246,7 +246,7 @@ CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -279,7 +279,7 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
index 4bbee8aa133..4d9a6c64947 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
@@ -199,6 +199,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
+BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 insert into t1 (f2) values ('insert 3.5.1.7');
 select * from t1;
 f1	f2	f3
@@ -207,12 +210,14 @@ update t1 set f2='update 3.5.1.7';
 select * from t1;
 f1	f2	f3
 NULL	update 3.5.1.7	42
-select trigger_name from information_schema.triggers;
+select trigger_name from information_schema.triggers order by trigger_name;
 trigger_name
 trg5_1
 trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
 drop trigger trg5_1;
 drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 drop table t1;
 
 Testcase 3.5.1.8:
@@ -314,7 +319,7 @@ insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 select @test_var1, @test_var2, @test_var3;
 @test_var1	@test_var2	@test_var3
 trig1	trig2	trig3
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -324,7 +329,7 @@ trig2	3
 select * from trig_db3.t1;
 f1	f2
 trig3	4
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -349,10 +354,10 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1 
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-trig_db1	trig1_b	t1
 trig_db1	trig1_a	t1
+trig_db1	trig1_b	t1
 trig_db2	trig2	t1
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03.result b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
index 3dbfa77b464..73befa606c9 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
@@ -82,16 +82,16 @@ Testcase 3.5.3.2/6:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 grant ALL  on *.* to test_noprivs@localhost;
-revoke SUPER  on *.* from test_noprivs@localhost;
+revoke TRIGGER on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -104,10 +104,10 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 select current_user;
@@ -122,15 +122,12 @@ root@localhost
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
 ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1'
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-
-note: once 15166 is fixed a similar case for SELECT needs to be added
----------------------------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -139,10 +136,10 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -151,12 +148,12 @@ use priv_db;
 drop trigger trg1_2;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 drop trigger trg1_2;
 
 Testcase 3.5.3.7a:
@@ -166,12 +163,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke UPDATE  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
+grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -180,24 +177,24 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-select f1 from t1;
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
 use priv_db;
 select current_user;
@@ -205,236 +202,220 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 drop trigger trg4a_2;
 
 Testcase 3.5.3.7b:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs;
+grant TRIGGER on *.* to test_noprivs;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
 insert 3.5.3.7-1b
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2b';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
 insert 3.5.3.7-2b
-update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-select f1 from t1;
-f1
-insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
+update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
+select f1 from t1 order by f1;
+f1
+insert 3.5.3.2-no
+insert 3.5.3.6-no
+insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
 trig 3.5.3.7-2b
+update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
 -----------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
+update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2c';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
 trig 3.5.3.7-2c
+update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
-trig 3.5.3.7-2c
 insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
+trig 3.5.3.7-2c
+update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2d';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
-update 3.5.3.7-1b
-trig 3.5.3.7-2b
 insert 3.5.3.7-1c
-trig 3.5.3.7-2c
 insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
+trig 3.5.3.7-2b
+trig 3.5.3.7-2c
 trig 3.5.3.7-2d
+update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -444,12 +425,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke SELECT  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, SELECT on *.* to test_yesprivs@localhost;
+grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -458,7 +439,7 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 
 Trigger create disabled - should fail - Bug 8887
 ------------------------------------------------
@@ -477,17 +458,13 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-2a
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2a');
 select @test_var;
 @test_var
@@ -497,26 +474,26 @@ drop trigger trg5a_2;
 Testcase: 3.5.3.8b
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke SELECT  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -533,7 +510,7 @@ before trig 3.5.3.8-1b
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -543,10 +520,6 @@ insert into t1 (f1) values ('insert 3.5.3.8-2b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-2b
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.* to test_yesprivs@localhost;
 update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 select @test_var;
 @test_var
@@ -556,26 +529,26 @@ drop trigger trg5b_2;
 Testcase 3.5.3.8c:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -588,16 +561,12 @@ before trig 3.5.3.8-1c
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2c';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2c');
 select @test_var;
 @test_var
@@ -607,24 +576,24 @@ drop trigger trg5c_2;
 Testcase: 3.5.3.8d:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
@@ -638,16 +607,12 @@ before trig 3.5.3.8-1d
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2d';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2d');
 select @test_var;
 @test_var
@@ -662,12 +627,12 @@ drop table if exists t2;
 create table t1 (f1 int) engine= myisam;
 create table t2 (f2 int) engine= myisam;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t2` TO 'test_yesprivs'@'localhost'
 GRANT SELECT, UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -683,10 +648,10 @@ ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 4
-select f2 from t2;
+select f2 from t2 order by f2;
 f2
 4
 use priv_db;
@@ -699,11 +664,11 @@ ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
 2
-select f2 from t2;
+4
+select f2 from t2 order by f2;
 f2
 1
 use priv_db;
@@ -716,12 +681,12 @@ ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 1
 select @aaa;
@@ -737,13 +702,13 @@ ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
+1
+1
 2
-1
-1
-select f2 from t2;
+4
+select f2 from t2 order by f2;
 f2
 drop database if exists priv_db;
 drop user test_yesprivs@localhost;
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
index 16d91726e30..e10b5fe919d 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
@@ -93,18 +93,18 @@ Create trigger trg1 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.1';
 Use db_drop;
 Insert into t1 values ('Insert error 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
 Insert into t1 values ('Insert no trigger 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
-Trigger 3.5.4.1
 Insert no trigger 3.5.4.1
+Trigger 3.5.4.1
 drop trigger trg1;
 drop database if exists db_drop;
 revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -258,7 +258,7 @@ use dbtest_one;
 Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Select * from dbtest_two.t2;
+Select * from dbtest_two.t2 order by f1;
 f1
 1st Insert 3.5.
 2nd Insert 3.5.
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_08.result b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
index ec8e12ff32d..906aea070d9 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
@@ -139,10 +139,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -150,7 +150,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -162,14 +162,22 @@ select @test_var;
 3.5.8.4 - single SQL - insert
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
+BEGIN
 insert into db_test.t1_i 
 values (new.f120, new.f136, new.f144, new.f163);
+END//
+Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
+f120	f122	f136	f144	f163
+1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
+select * from db_test.t1_i order by i120;
+i120	i136	i144	i163
+1	00222	0000023456	1.050000000000000000000000000000
 update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 I	Test 3.5.8.4-Single Insert	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
 I	00222	0000023456	1.050000000000000000000000000000
@@ -186,14 +194,14 @@ update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 U	Test 3.5.8.4-Single Update	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 
 3.5.8.3/4 - single SQL - delete
 -------------------------------
@@ -206,7 +214,7 @@ f122='Test 3.5.8.4-Single Delete'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 D	Test 3.5.8.4-Single Delete	00444	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -253,29 +261,29 @@ END//
 set @test_var='Empty', @test_var2=0;
 Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	one	2nd else
 Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	two	2nd else
 D	Test 3.5.8.5-if	00102	two	2nd else
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd if
 D	Test 3.5.8.5-if	00101	three	2nd if
 D	Test 3.5.8.5-if	00102	three	2nd if
-d	Test 3.5.8.5-if	00010	three	2nd if
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00101	three	2nd else
 D	Test 3.5.8.5-if	00102	three	2nd else
-d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00103	three	2nd else
 create trigger trg3 before update on tb3 for each row
 BEGIN
@@ -335,20 +343,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -358,34 +366,34 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
 B	Test 3.5.8.5-case	00191	0000000016	1*0000099999
 C	Test 3.5.8.5-case	00200	0000000001	1*0000099999
-1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 Insert into tb3 (f120, f122, f136, f144) 
 values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 create trigger trg3a before update on tb3 for each row
 BEGIN
 CASE
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_09.result b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
index 9643aa567e3..6a98e527244 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
@@ -120,7 +120,7 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
 Insert into tb3 (f122, f136, f163) 
 values ('Test 3.5.9.3', 7, 123.17);
 Update tb3 Set f136=8 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -136,7 +136,7 @@ a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 @tr_var_b4_136, @tr_var_b4_163;
@@ -176,7 +176,7 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
 Insert into tb3 (f122, f136, f151, f163) 
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%';
+where f122 like 'Test 3.5.9.4%' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -194,9 +194,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig';
+where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
index 7867fc9f9e2..d1ab6daa423 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
@@ -87,7 +87,7 @@ Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1);
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%';
+from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -101,7 +101,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -115,7 +115,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -146,7 +146,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
-Select * from tb_load limit 10;
+Select * from tb_load order by f1 limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -241,7 +241,7 @@ insert into t3 (f1) values (new.f1+1000);
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3;
+select * from t3 order by f1;
 f1
 12
 102
@@ -276,17 +276,17 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1;
+select * from t1 order by f1;
 f1
 0
 1
-select * from t2;
+select * from t2 order by f2;
 f2
 2
-select * from t3;
+select * from t3 order by f3;
 f3
 3
-select * from t4;
+select * from t4 order by f4;
 f4
 4
 drop trigger tr1;
@@ -373,7 +373,7 @@ create table t4 (f4 tinyint) engine = myisam;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL
+  `f1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values (1);
 create trigger tr1 after insert on t1
@@ -385,16 +385,16 @@ for each row insert into t4 (f4) values (new.f3+1000);
 set autocommit=0;
 start transaction;
 insert into t1 values (1);
-ERROR 22003: Out of range value adjusted for column 'f4' at row 1
+ERROR 22003: Out of range value for column 'f4' at row 1
 commit;
-select * from t1;
+select * from t1 order by f1;
 f1
 1
 1
-select * from t2;
+select * from t2 order by f2;
 f2
 2
-select * from t3;
+select * from t3 order by f3;
 f3
 3
 drop trigger tr1;
diff --git a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result
index 3a76024cf80..a3620575c8b 100644
--- a/mysql-test/suite/funcs_1/r/myisam_views.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result
@@ -470,7 +470,8 @@ SET @x=0;
 CREATE or REPLACE VIEW v1 AS Select 1 INTO @x;
 ERROR HY000: View's SELECT contains a 'INTO' clause
 Select @x;
-ERROR HY000: View's SELECT contains a variable or parameter
+@x
+0
 CREATE or REPLACE VIEW v1 AS Select 1
 FROM (SELECT 1 FROM t1) my_table;
 ERROR HY000: View's SELECT contains a subquery in the FROM clause
@@ -607,7 +608,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 CREATE or REPLACE view v1 as Select f59, f60
 from tb2 by group f59  ;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by group f59' at line 2
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.5 
+--------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1 ;
 CREATE VIEW v1 SELECT * FROM tb2 limit 100 ;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT * FROM tb2 limit 100' at line 1
@@ -627,7 +630,9 @@ CREATE VIEW v1    SELECT 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1' at line 1
 CREATE VIEW v1 AS         ;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.6 
+--------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1 ;
 CREATE or REPLACE                       VIEW v1
 as SELECT * from tb2 limit 100 ;
@@ -1812,7 +1817,9 @@ ERROR HY000: View's SELECT contains a subquery in the FROM clause
 SELECT * FROM test.v1      ;
 ERROR 42S02: Table 'test.v1' doesn't exist
 Drop view if exists test.v1 ;
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.40 
+--------------------------------------------------------------------------------
 Drop view if exists test.v1 ;
 Set @var1 = 'ABC' ;
 Set @var2 = 'XYZ' ;
@@ -1821,7 +1828,9 @@ ERROR HY000: View's SELECT contains a variable or parameter
 CREATE VIEW test.v1 AS SELECT @@global.sort_buffer_size;
 ERROR HY000: View's SELECT contains a variable or parameter
 Drop view if exists test.v1 ;
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.41 
+--------------------------------------------------------------------------------
 Drop view if exists test.v1 ;
 Drop procedure if exists sp1 ;
 Create procedure sp1() DETERMINISTIC
@@ -1838,7 +1847,9 @@ Warnings:
 Note	1051	Unknown table 'test.v1'
 Drop procedure sp1 ;
 ERROR 42000: PROCEDURE test.sp1 does not exist
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.42 
+--------------------------------------------------------------------------------
 Drop VIEW if exists test.v1 ;
 CREATE TEMPORARY VIEW test.v1 AS
 SELECT * FROM test.tb2 limit 2 ;
@@ -1850,7 +1861,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SELECT * FROM test.tb2 limit 2' at line 1
 Drop view if exists test.v1 ;
 Use test;
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.43 
+--------------------------------------------------------------------------------
 Drop view if exists test.v1 ;
 CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
 INSERT INTO test.v1 values(122,432);
@@ -1935,7 +1948,7 @@ f1	f2
 2	two
 4	four
 INSERT INTO v1 VALUES(2,'two');
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 INSERT INTO v1 VALUES(3,'three');
 affected rows: 1
 INSERT INTO v1 VALUES(6,'six');
@@ -1954,7 +1967,7 @@ f1	f2
 3	three
 4	four
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
@@ -2001,12 +2014,12 @@ DROP VIEW  IF EXISTS test.v1;
 CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
 ENGINE = myisam;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 A	1
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	1
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -2014,7 +2027,7 @@ affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 INSERT INTO v1 VALUES('B',2);
 affected rows: 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -2022,7 +2035,7 @@ UPDATE v1 SET f2 = 4;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 INSERT INTO v1 VALUES('B',3);
 ERROR HY000: CHECK OPTION failed 'test.v1'
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -10562,7 +10575,7 @@ f1	f2	f3	f4
 DELETE FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10631,7 +10644,7 @@ DROP VIEW v1;
 CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10966,11 +10979,11 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(5)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -10990,12 +11003,12 @@ f4x	char(5)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4x	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(10);
@@ -11013,14 +11026,14 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(10)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
 2	NULL	<-- 10 -->	t1 2
 2	NULL	<-- 10 -->	v1 2
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11049,7 +11062,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(8)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11058,7 +11071,7 @@ f1	f2	f4	report
 2	NULL	<-- 10 -	v1 2
 3	NULL	<-- 10 -	t1 3
 3	NULL	<-- 10 -	v1 3
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11082,7 +11095,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11093,7 +11106,7 @@ f1	f2	f4	report
 3	NULL	<-- 10 -	v1 3
 4	NULL	<------ 20 -------->	t1 4
 4	NULL	<------ 20 -------->	v1 4
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11121,7 +11134,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11134,7 +11147,7 @@ f1	f2	f4	report
 4	NULL	<------ 20 -------->	v1 4
 <------------- 30 ----------->	NULL	<------ 20 -------->	t1 5
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11158,7 +11171,7 @@ f4	varchar(20)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report
 -1	ABC	t1 0
 -1	ABC	v1 0
@@ -11172,7 +11185,7 @@ f1	f4	report
 <------------- 30 ----------->	<------ 20 -------->	t1 5
 <------------- 30 ----------->	<------ 20 -------->	v1 5
 ABC	<------ 20 -------->	t1 6
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
 INSERT INTO t1 SET f1 = 'ABC', f2 = '1500-12-04',
@@ -11191,7 +11204,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11207,7 +11220,7 @@ f1	f4	report	f2
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	1500-12-04
 ABC	<------ 20 -------->	v1 7	1500-12-04
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11241,7 +11254,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11256,10 +11269,10 @@ f1	f4	report	f2
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	NULL
-ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033
+ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	v1 8	-0.00033
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11274,8 +11287,8 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
+ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	v1 8
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
 INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
@@ -11298,7 +11311,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2	f3
 -1	ABC	t1 0	NULL	NULL
 -1	ABC	v1 0	NULL	NULL
@@ -11313,12 +11326,12 @@ f1	f4	report	f2	f3
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL	NULL
 ABC	<------ 20 -------->	t1 6	NULL	NULL
 ABC	<------ 20 -------->	t1 7	NULL	NULL
-ABC	<------ 20 -------->	v1 7	NULL	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033	NULL
-ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
+ABC	<------ 20 -------->	v1 7	NULL	NULL
+ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	v1 9a	-0.00033	NULL
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11333,10 +11346,10 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
-ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	t1 9
+ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	v1 9a
 DROP TABLE t1;
 DROP VIEW  v1;
@@ -11351,10 +11364,10 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	1.7320508075689
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
@@ -11367,21 +11380,21 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
 ABC	DEF
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.7320508075689
 ABC	0
+ABC	1.7320508075689
 SELECT SQRT('DEF');
 SQRT('DEF')
 0
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2;
+SELECT * FROM v2 order by 1;
 SQRT('DEF')
 0
 Warnings:
@@ -11391,27 +11404,27 @@ DESCRIBE v2;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM v2;
+SELECT * FROM v2 order by 2;
 f1	my_sqrt
+ABC	0
 ABC	1.7320508075689
-ABC	0
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
index a8d52fee0b5..2efc5a83663 100755
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
@@ -209,7 +209,7 @@ BEGIN
     set @x = x;
     set @y = y;
     set @z = 234;
-    SELECT f1, f2 into @x, @y from t2 limit 1;
+    SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
     SELECT @x, @y, @z, invar;
     BEGIN
       set @x = 2;
@@ -257,7 +257,7 @@ BEGIN
    declare x integer; declare y integer;
    set @x=x;
    set @y=y;
-   SELECT f4, f3 into @x, @y from t2 limit 1;
+   SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
    SELECT @x, @y;
 END//
 delimiter ;//
@@ -1271,7 +1271,8 @@ BEGIN
    declare f5_value char(20);
    declare f4_value integer;
    declare f6_value integer;
-   declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
+   declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
+                where f4 >=-5000 order by f4 limit 3;
    open cur1;
    while proceed do
       SELECT count AS 'loop';
@@ -1368,7 +1369,7 @@ create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) )
 
 #Error: 1329 SQLSTATE: 02000 (ER_SP_FETCH_NO_DATA) Message: No data to FETCH
 
-SELECT f1, f2, f4, f5 from t2;
+SELECT f1, f2, f4, f5 from t2 order by f4;
 
 delimiter //;
 CREATE PROCEDURE sp1( )
@@ -1379,21 +1380,21 @@ BEGIN
    declare newf2 char(20);
    declare newf5 char(20);
    declare newf4 integer;
-   declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
-   declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+   declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+   declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
    open cur1;
    open cur2;
    BEGIN
-      declare continue handler for sqlstate '02000' set count = 1;
+      declare continue handler for sqlstate '02000' set count=1;
       fetch cur1 into newf1, newf2, newf4, newf5;
       SELECT '-1-', count, newf1, newf2, newf4, newf5;
       insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-      set count = 4;
+      set count= 4;
       BEGIN
-         while count > 0 do
+         while count> 0 do
             fetch cur1 into newf1, newf2, newf4, newf5;
             SELECT '-2-', count, newf1, newf2, newf4, newf5;
-            set count = count - 1;
+            set count = count- 1;
          END while;
          SELECT '-3-', count, newf1, newf2, newf4, newf4;
       END;
@@ -1453,8 +1454,10 @@ BEGIN
    declare i_newf12 char(20);
    declare i_newf13 date;
    declare i_newf14 integer;
-   declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
-   declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
+   declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
+                where f4>=-5000 order by f4 limit 4;
+   declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
+                where f4>=-5000 order by f4 limit 3;
    declare continue handler for sqlstate '02000' set proceed=0;
    open cur1;
    open cur2;
@@ -1486,8 +1489,10 @@ BEGIN
    DECLARE o_newf12 CHAR(20);
    DECLARE o_newf13 DATE;
    DECLARE o_newf14 INTEGER;
-   DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
-   DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+   DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+                WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+   DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+                WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
    DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
    OPEN cur1;
    OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
index d7b0a370a82..e69a95a724e 100755
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
@@ -54,7 +54,7 @@ connect (user2_1, localhost, user_1, , db_storedproc);
 delimiter //;
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-   SELECT * FROM db_storedproc.t1 LIMIT 1;
+   SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
 END//
 delimiter ;//
 
@@ -244,21 +244,21 @@ delimiter ;//
 
 CALL sp_ins_1();
 SELECT row_count();
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 
 CALL sp_ins_3();
 #FIXME: check is 1 correct here? I expect 3 for 3 inserted rows inside the procedure
 SELECT row_count();
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 
 CALL sp_upd();
 SELECT row_count();
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 
 #FIXME: check is 3 correct here?  I expect 7 for 4 inserted and then 3 updated rows inside the procedure
 CALL sp_ins_upd();
 SELECT row_count();
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 
 # cleanup
 DROP PROCEDURE sp_ins_1;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
index b88410b83f4..49bd5b98401 100644
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
@@ -6,19 +6,16 @@ let $message= .
               .                         IMPORTANT NOTICE:
               .                         -----------------
               .
-              .  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
-              .         for correctness!
+              .  FIXME: The .result files are still NOT CHECKED for correctness!
               .
               .  FIXME: Several tests are affected by known problems around DECIMAL
-              .  FIXME: and NUMERIC that needs to be checked again after WL#2984
+              .  FIXME: and NUMERIC that will be checked again after WL#2984 once
               .  FIXME: has been completed. Some of them are marked in the result.
               .
-              .  This .result file has been checked OK with Linux 5.0.23-bk,
-              .  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
-              .
-              . This file has been saved although it might contain failures / wrong
-              . results to be able to detect _new_ differences in the behaviour.
-              . Hopefully the remaining checks can be made soon.
+              . Currently (Dec 06, 2005) this .result file is checked OK for Linux
+              . with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
+              . Using the available Windows version 5.0.16 there are differences
+              . that can be ignored (e.g. WL#2984).
               .;
 --source include/show_msg80.inc
 
@@ -914,7 +911,7 @@ SELECT * from t1 where f2 = f1;
 #/t'ql/mysql-test
 #t]# t@localhost t
 
-#FIXME check this is OK:--error 1064
+--error 0,1064
 CREATE PROCEDURE function()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE function;
@@ -1015,7 +1012,7 @@ CREATE PROCEDURE collate()
 CREATE PROCEDURE column()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE columns()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE columns;
@@ -1192,7 +1189,7 @@ CREATE PROCEDURE false()
 CREATE PROCEDURE fetch()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE fields()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE fields;
@@ -1213,7 +1210,7 @@ CREATE PROCEDURE force()
 CREATE PROCEDURE foreign()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE found()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE found;
@@ -1226,7 +1223,7 @@ CREATE PROCEDURE from()
 CREATE PROCEDURE fulltext()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE goto()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE goto;
@@ -1495,7 +1492,7 @@ CREATE PROCEDURE precision()
 CREATE PROCEDURE primary()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE privileges()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE privileges;
@@ -1656,7 +1653,7 @@ CREATE PROCEDURE straight_join()
 CREATE PROCEDURE table()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE tables()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE tables;
@@ -1837,7 +1834,7 @@ CREATE FUNCTION char ascii not null(f1 char ascii not null) returns char ascii n
 CREATE FUNCTION tinytext(f1 tinytext) returns tinytext
     return f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE FUNCTION text(f1 text) returns text
     return f1;
   DROP FUNCTION text;
@@ -10128,7 +10125,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE sp1()
 BEGIN
     declare precision char;
@@ -10430,7 +10427,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE sp1()
 BEGIN
     declare soname char;
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
index 26a5dab3370..af94041d245 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
@@ -214,21 +214,29 @@ let $message= Testcase 3.5.1.7: - need to fix;
 	eval create table t1 (f1 int, f2 char(25),f3 int) engine=$engine_type;
 	CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1 
 		for each row set new.f3 = '14';
+# In 5.0 names to long (more than 64 chars) were trimed without an error
+# In 5.1 an error is returned. So adding a call with the expected error 
+# and one with a shorter name to validate proper execution
+	--error 1059
 	CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 		BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
+	CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
+		BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 
 	insert into t1 (f2) values ('insert 3.5.1.7');
 	select * from t1;
 	update t1 set f2='update 3.5.1.7';
 	select * from t1;
-	select trigger_name from information_schema.triggers;
+	select trigger_name from information_schema.triggers order by trigger_name;
 
 #Cleanup
 	--disable_warnings 
 	--error 0, 1360
 	drop trigger trg5_1;
-	# The above trigger should be dropped since the name was trimmed.
+	# In 5.1 the long name should generate an error that is to long
+	--error 1059
 	drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
+	drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 	drop table t1;
 
 #Section 3.5.1.8
@@ -385,10 +393,10 @@ let $message= Testcase 3.5.1.11:;
 	insert into trig_db2.t2 (f1,f2) values ('insert to db2 t2 from db1',3);
 	insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 	select @test_var1, @test_var2, @test_var3;
-	select * from t1;
+	select * from t1 order by f2;
 	select * from trig_db2.t2;
 	select * from trig_db3.t1;
-	select * from t1;
+	select * from t1 order by f2;
 	use test;
 
 #Cleanup
@@ -434,7 +442,7 @@ let $message= Testcase 3.5.2.1/2/3:;
 	create trigger trig_db2.trig2 before insert on trig_db2.t1 
 		for each row set @test_var3='trig2';
 	select trigger_schema, trigger_name, event_object_table
-		from information_schema.triggers;
+		from information_schema.triggers order by trigger_name;
 
 	set @test_var1= '', @test_var2= '', @test_var3= '';
 	insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_03.inc b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
index 764fccec734..4821b47099a 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
@@ -29,23 +29,23 @@ let $message= Testcase 3.5.3:;
 	set password for test_yesprivs@localhost = password('PWD');
 
 #Section 3.5.3.1 / 3.5.3.2
-# Test case: Ensure SUPER privilege is required to create a trigger
+# Test case: Ensure TRIGGER privilege is required to create a trigger
 #Section 3.5.3.3 / 3.5.3.4
-# Test case: Ensure that root always has the SUPER privilege.
+# Test case: Ensure that root always has the TRIGGER privilege.
 # OMR - No need to test this since SUPER priv is an existing one and not related
 #       or added for triggers (TP 2005-06-06)
 #Section 3.5.3.5 / 3.5.3.6
-# Test case: Ensure that the SUPER privilege is required to drop a trigger.
+# Test case: Ensure that the TRIGGER privilege is required to drop a trigger.
 let $message= Testcase 3.5.3.2/6:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 	grant ALL  on *.* to test_noprivs@localhost;
-	revoke SUPER  on *.* from test_noprivs@localhost;
+	revoke TRIGGER on *.* from test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 # Adding the minimal priv to be able to set to the db
 	grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
@@ -63,14 +63,15 @@ let $message= Testcase 3.5.3.2:;
         select current_user;
 	use priv_db;
 
-	--error 1227
+# error 1227 is better, as it says, that not the privilege
+	--error 1142,1227
 	create trigger trg1_1 before INSERT on t1 for each row
 		set new.f1 = 'trig 3.5.3.2_1-no';
 
 	connection default;
 	use priv_db;
 	insert into t1 (f1) values ('insert 3.5.3.2-no');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 	connection yes_privs;
         select current_user;
@@ -83,29 +84,27 @@ let $message= Testcase 3.5.3.2:;
         select current_user;
 	use priv_db;
 
-        # Added following the fix to bug 5861
-	--error 1143
+        --error 1143
 	insert into t1 (f1) values ('insert 3.5.3.2-yes');
-	select f1 from t1;
-	grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-let $message= note: once 15166 is fixed a similar case for SELECT needs to be added;
---source include/show_msg.inc
+	select f1 from t1 order by f1;
+
+        grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
+        insert into t1 (f1) values ('insert 3.5.3.2-yes');
+        select f1 from t1 order by f1;
 
-	insert into t1 (f1) values ('insert 3.5.3.2-yes');
-	select f1 from t1;
 let $message= Testcase 3.5.3.6:;
 --source include/show_msg.inc
 
 	connection no_privs;
 	use priv_db;
 
-	--error 1227
+	--error 1142,1227
 	drop trigger trg1_2;
 
 	connection default;
 	use priv_db;
 	insert into t1 (f1) values ('insert 3.5.3.6-yes');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 	connection yes_privs;
 	use priv_db;
@@ -115,7 +114,7 @@ let $message= Testcase 3.5.3.6:;
 	connection default;
 	use priv_db;
 	insert into t1 (f1) values ('insert 3.5.3.6-no');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 # Cleanup
 	--disable_warnings
@@ -144,7 +143,7 @@ let $message=Testcase 3.5.3.7a:;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
+	grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
@@ -156,7 +155,7 @@ let $message=Testcase 3.5.3.7a:;
 	select current_user;
 	use priv_db;
 	show grants;
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 let $message= Trigger create disabled - should fail - Bug 8884;
 --source include/show_msg.inc
@@ -166,7 +165,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1a');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	--error 0, 1360
 	drop trigger trg4a_1;
 
@@ -179,14 +178,8 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
-
-        # Added to bypass bug 15166
-let $message= SELECT priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant SELECT on *.* to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.7-2b');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 # Cleanup
 	--disable_warnings
@@ -200,13 +193,13 @@ let $message= Testcase 3.5.3.7b:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs;
+	grant TRIGGER on *.* to test_noprivs;
 	grant ALL  on priv_db.* to test_noprivs@localhost;
 	revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 	show grants for test_noprivs;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant UPDATE on priv_db.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -228,9 +221,9 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1b');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	--error 0, 1360
 	drop trigger trg4b_1;
 
@@ -242,15 +235,10 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
-        # Added to bypass bug 15166
-let $message= SELECT priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant SELECT on priv_db.* to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.7-2b');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-	select f1 from t1;
+	select f1 from t1 order by f1;
 # Cleanup
 	--disable_warnings
 	drop trigger trg4b_2;
@@ -263,13 +251,13 @@ let $message= Testcase 3.5.3.7c;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs@localhost;
+	grant TRIGGER on *.* to test_noprivs@localhost;
 	grant ALL  on priv_db.t1 to test_noprivs@localhost;
 	revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 	show grants for test_noprivs;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -291,7 +279,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1c');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	--error 0, 1360
 	drop trigger trg4c_1;
 
@@ -303,13 +291,8 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
-        # Added to bypass bug 15166
-let $message= SELECT priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant SELECT on priv_db.t1 to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.7-2c');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 # Cleanup
 	--disable_warnings
@@ -325,13 +308,13 @@ let $message= Testcase 3.5.3.7d:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs@localhost;
+	grant TRIGGER on *.* to test_noprivs@localhost;
 # There is no ALL privs on the column level
 	grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 	show grants for test_noprivs;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_noprivs;
 
@@ -352,7 +335,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1d');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	--error 0, 1360
 	drop trigger trg4d_1;
 
@@ -364,13 +347,8 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
-        # Added to bypass bug 15166
-let $message= SELECT priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.7-2d');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 # Cleanup
 	--disable_warnings
@@ -394,7 +372,7 @@ let $message= Testcase 3.5.3.8a:;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER, SELECT on *.* to test_yesprivs@localhost;
+	grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
@@ -433,11 +411,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
         set @test_var= 'before trig 3.5.3.8-2a';
 	select @test_var;
 
-        # Added to bypass bug 15166
-let $message= UPDATE priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant UPDATE on *.* to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.8-2a');
 	select @test_var;
 
@@ -453,13 +426,13 @@ let $message= Testcase: 3.5.3.8b;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs@localhost;
+	grant TRIGGER on *.* to test_noprivs@localhost;
 	grant ALL  on priv_db.* to test_noprivs@localhost;
 	revoke SELECT  on priv_db.* from test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant SELECT on priv_db.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -499,11 +472,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	insert into t1 (f1) values ('insert 3.5.3.8-2b');
 	select @test_var;
 
-        # Added to bypass bug 15166
-let $message= UPDATE priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant UPDATE on priv_db.* to test_yesprivs@localhost;
-
 	update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 	select @test_var;
 # Cleanup
@@ -518,13 +486,13 @@ let $message= Testcase 3.5.3.8c:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs@localhost;
+	grant TRIGGER on *.* to test_noprivs@localhost;
 	grant ALL  on priv_db.t1 to test_noprivs@localhost;
 	revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -560,11 +528,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	connection default;
         set @test_var='before trig 3.5.3.8-2c';
 
-        # Added to bypass bug 15166
-let $message= UPDATE priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.8-2c');
 	select @test_var;
 # Cleanup
@@ -579,13 +542,13 @@ let $message=Testcase: 3.5.3.8d:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs@localhost;
+	grant TRIGGER on *.* to test_noprivs@localhost;
 # There is no ALL prov on the column level
 	grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_noprivs@localhost;
 
@@ -620,11 +583,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	connection default;
         set @test_var='before trig 3.5.3.8-2d';
 
-        # Added to bypass bug 15166
-let $message= UPDATE priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.8-2d');
 	select @test_var;
 
@@ -650,7 +608,7 @@ let $message=Testcase: 3.5.3.x:;
         eval create table t2 (f2 int) engine= $engine_type;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 	grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
@@ -671,8 +629,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 	grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (4);
-	select f1 from t1;
-	select f2 from t2;
+	select f1 from t1 order by f1;
+	select f2 from t2 order by f2;
 
 	connection yes_353x;
 	use priv_db;
@@ -687,8 +645,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 	grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (2);
-	select f1 from t1;
-	select f2 from t2;
+	select f1 from t1 order by f1;
+	select f2 from t2 order by f2;
 
 	connection yes_353x;
 	use priv_db;
@@ -703,8 +661,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 	grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (1);
-	select f1 from t1;
-	select f2 from t2;
+	select f1 from t1 order by f1;
+	select f2 from t2 order by f2;
         select @aaa;
 
 	connection yes_353x;
@@ -720,8 +678,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 	grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (1);
-	select f1 from t1;
-	select f2 from t2;
+	select f1 from t1 order by f1;
+	select f2 from t2 order by f2;
 
 
 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
index 15c94ada975..ccfeb1aec99 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
@@ -51,14 +51,14 @@ let $message= Testcase 3.5.4.1:;
 	connection con1_general;
 	Use db_drop;
 	Insert into t1 values ('Insert error 3.5.4.1');
-	Select * from t1;
+	Select * from t1 order by f1;
 	connection con1_super;
 	drop trigger trg1;
 	select trigger_schema, trigger_name, event_object_table
-		from information_schema.triggers;
+		from information_schema.triggers order by trigger_name;
 	connection con1_general;
 	Insert into t1 values ('Insert no trigger 3.5.4.1');
-	Select * from t1;
+	Select * from t1 order by f1;
 
 #Cleanup
 	--disable_warnings 
@@ -294,7 +294,7 @@ let $message= Testcase 3.5.5.4:;
 	Select * from t2;
 	use dbtest_one;
 	Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
-	Select * from dbtest_two.t2;
+	Select * from dbtest_two.t2 order by f1;
 
 #Cleanup
 	connection con1_super;
@@ -535,7 +535,7 @@ let $message= Testcase 3.5.7.13/14:;
 	Create trigger trg9_1 BEFORE DELETE 
 		on tb3 for each row set @test_var=@test_var+1;
 
-	--error ER_NOT_SUPPORTED_YET 
+	--error ER_NOT_SUPPORTED_YET
 	Create trigger trg9_2 BEFORE DELETE 
 		on tb3 for each row set @test_var=@test_var+10;
 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_08.inc b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
index 300080e455d..4a7ea486248 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
@@ -111,9 +111,10 @@ let $message= 3.5.8.4 - multiple SQL;
 	Insert into tb3 (f120, f122, f136, f144, f163) 
 		values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 	Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
-	select * from db_test.t1_i;
-	select * from db_test.t1_u;
-	select * from db_test.t1_d;
+# error in ndb
+	select * from db_test.t1_i order by i120;
+	select * from db_test.t1_u order by u120;
+	select * from db_test.t1_d order by d120;
 	select @test_var;
 
 
@@ -121,16 +122,22 @@ let $message= 3.5.8.4 - single SQL - insert;
 --source include/show_msg.inc
 # Trigger definition - single SQL Insert
 	connection con2_super;
+        delimiter //;
 	Create trigger trg2 BEFORE UPDATE on tb3 for each row
+        BEGIN
 		insert into db_test.t1_i 
 			values (new.f120, new.f136, new.f144, new.f163);
+        END//
+        delimiter ;//
 
 # Trigger exeution - single SQL Insert
 	connection con2_general;
+        Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
+        select * from db_test.t1_i order by i120;
 	update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 	Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-	select * from db_test.t1_i;
+	select * from db_test.t1_i order by i120;
 
 
 let $message= 3.5.8.4 - single SQL - update;
@@ -148,7 +155,7 @@ let $message= 3.5.8.4 - single SQL - update;
 	update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 		 where f122='Test 3.5.8.4-Single Insert';
 	Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-	select * from db_test.t1_u;
+	select * from db_test.t1_u order by u120;
 
 
 let $message= 3.5.8.3/4 - single SQL - delete;
@@ -167,7 +174,7 @@ let $message= 3.5.8.3/4 - single SQL - delete;
 		 where f122='Test 3.5.8.4-Single Update';
 #unlock tables;
 	Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-	select * from db_test.t1_d;
+	select * from db_test.t1_d order by d120;
 
 
 let $message= 3.5.8.3/4 - single SQL - select;
@@ -228,16 +235,16 @@ let $message= Testcase 3.5.8.5 (IF):;
 	set @test_var='Empty', @test_var2=0;
 	Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if';
+		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 	Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if';
+		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 	Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if';
+		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 	Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if';
+		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 
 	delimiter //;
 	--error 1064
@@ -313,28 +320,28 @@ let $message= Testcase 3.5.8.5-case:;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('a', 'Test 3.5.8.5-case', 5, 7);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('b', 'Test 3.5.8.5-case', 71,16);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('c', 'Test 3.5.8.5-case', 80,1);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 	Insert into tb3 (f120, f122, f136) 
 		values ('d', 'Test 3.5.8.5-case', 152);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('e', 'Test 3.5.8.5-case', 200, 8);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 	--error 0, 1339
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('f', 'Test 3.5.8.5-case', 100, 8);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 
 	delimiter //;
 	--error 1064
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_09.inc b/mysql-test/suite/funcs_1/triggers/triggers_09.inc
index 4eaaf3e35e2..912c5f50b21 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_09.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_09.inc
@@ -85,7 +85,7 @@ let $message= Testcase 3.5.9.3:;
 		values ('Test 3.5.9.3', 7, 123.17);
 	Update tb3 Set f136=8 where f122='Test 3.5.9.3';
 
-	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
@@ -104,7 +104,7 @@ let $message= Testcase 3.5.9.3:;
 
 	delete from tb3 where f122='Test 3.5.9.3';
 
-	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
@@ -159,7 +159,7 @@ let $message= Testcase 3.5.9.4:;
 		values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 
 	select f118, f121, f122, f136, f151, f163 from tb3 
-		where f122 like 'Test 3.5.9.4%';
+		where f122 like 'Test 3.5.9.4%' order by f163;
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
@@ -180,7 +180,7 @@ let $message= Testcase 3.5.9.4:;
 		 where f122='Test 3.5.9.4';
 
 	select f118, f121, f122, f136, f151, f163 from tb3 
-		where f122 like 'Test 3.5.9.4-trig';
+		where f122 like 'Test 3.5.9.4-trig' order by f163;
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
index 534c4efaa86..1b7505260f7 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
@@ -48,7 +48,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 	Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 	Insert into vw11 (f122, f151) values ('Not in View', 3);
 	select f121, f122, f151, f163
-		from tb3 where f122 like 'Test 3.5.10.1/2/3%';
+		from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 	select f121, f122, f151, f163 from vw11;
 	select f121, f122, f151, f163
 		from tb3 where f122 like 'Not in View';
@@ -56,7 +56,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 #Section 3.5.10.2
 	Update vw11 set f163=1;
 	select f121, f122, f151, f163 from tb3
-		where f122 like 'Test 3.5.10.1/2/3%';
+		where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 	select f121, f122, f151, f163 from vw11;
 
 #Section 3.5.10.3
@@ -64,7 +64,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 	Select @test_var as 'before delete';
 	delete from vw11 where f151=1;
 	select f121, f122, f151, f163 from tb3
-		where f122 like 'Test 3.5.10.1/2/3%';
+		where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 	select f121, f122, f151, f163 from vw11;
 	Select @test_var as 'after delete';
 
@@ -98,7 +98,7 @@ let $message= Testcase 3.5.10.4:;
 	eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 
 	select @counter as 'Rows Loaded After';
-	Select * from tb_load limit 10;
+	Select * from tb_load order by f1 limit 10;
 
 #Cleanup
 	--disable_warnings
@@ -233,7 +233,7 @@ let $message= Testcase y.y.y.2: Check for triggers starting triggers;
 #lock tables t1 write, t2_1 write, t2_2 write, t2_3 write, t2_4 write, t3 write;
 	insert into t1 values (1);
 #unlock tables;
-	select * from t3;
+	select * from t3 order by f1;
 
 #Cleanup
 	--disable_warnings
@@ -274,10 +274,10 @@ let $message= Testcase y.y.y.3: Circular trigger reference;
 	# OBN See bug 11896
 	--error 1442
 	insert into t1 values (1);
-	select * from t1;
-	select * from t2;
-	select * from t3;
-	select * from t4;
+	select * from t1 order by f1;
+	select * from t2 order by f2;
+	select * from t3 order by f3;
+	select * from t4 order by f4;
 
 #Cleanup
 	--disable_warnings
@@ -384,9 +384,9 @@ let $message= Testcase y.y.y.5: Roleback of nested trigger references;
 	--error 1264
 	insert into t1 values (1);
 	commit;
-	select * from t1;
-	select * from t2;
-	select * from t3;
+	select * from t1 order by f1;
+	select * from t2 order by f2;
+	select * from t3 order by f3;
 #unlock tables;
 #Cleanup
 	--disable_warnings
diff --git a/mysql-test/suite/funcs_1/views/func_view.inc b/mysql-test/suite/funcs_1/views/func_view.inc
index 4479db22e70..3bf9e96b332 100644
--- a/mysql-test/suite/funcs_1/views/func_view.inc
+++ b/mysql-test/suite/funcs_1/views/func_view.inc
@@ -3,7 +3,8 @@
 #  Functions within VIEWs                         #
 #                                                 #
 ###################################################
-# 14.09.2005 ML
+# 2006-12-08 ML   Maintenance + refinements
+# 2005-09-14 ML   Create this test
 
 let $message= ! Attention: The file with the expected results suffers from
 Bug#10713: mysqldump includes database in create view and referenced tables;
@@ -68,7 +69,7 @@ Bug#10713: mysqldump includes database in create view and referenced tables;
 #         But there will be a special messages within the protocol files.
 #         Example:
 #            "Attention: CAST --> SIGNED INTEGER
-#            The file with expected results suffers from Bug 5083 5913 9809";
+#            The file with expected results suffers from Bug 5913";
 #            means, the file with expected results contains result sets which
 #            are known to be wrong.
 #            "Attention: The last <whatever> failed" 
@@ -187,6 +188,7 @@ CREATE TABLE t1_modes
 --enable_query_log
 
 # The table to be used in the FROM parts of the SELECTs
+--replace_result $type <engine_to_be_tested>
 eval CREATE TABLE t1_values
 (
    id BIGINT AUTO_INCREMENT,
@@ -416,8 +418,8 @@ eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = -25;
 # SELECT * FROM t1_values;
 
-# 1.     Cast Functions and Operators
-# 1.1.   CAST
+# 1.    Cast Functions and Operators
+# 1.1   CAST
 #
 # Note(ML): I guess the CAST routines are used in many other functions.
 #           Therefore check also nearly all "ugly" variants like 
@@ -587,15 +589,10 @@ let $col_type= my_bigint;
 eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = 1758;
 let $col_type= my_double;
-let $message= some statements disabled because of
-Bug#12440: CAST(data type DOUBLE AS TIME) strange results;
---source include/show_msg80.inc
-if (0)
-{
+# Bug#12440: CAST(data type DOUBLE AS TIME) strange results;
 --source suite/funcs_1/views/fv_cast.inc
 eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = +1.758E+3;
-}
 let $col_type= my_datetime;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_date;
@@ -631,16 +628,11 @@ let $col_type= my_bigint;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_decimal;
 --source suite/funcs_1/views/fv_cast.inc
-let $message= some statements disabled because of
-Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian;
---source include/show_msg80.inc
-if (0)
-{
+# Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian;
 let $col_type= my_double;
 --source suite/funcs_1/views/fv_cast.inc
 eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = -0.33333333E+4;
-}
 let $col_type= my_datetime;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_date;
@@ -658,11 +650,8 @@ let $target_type= SIGNED INTEGER;
 #
 let $message= 
 "Attention: CAST --> SIGNED INTEGER
-            The file with expected results suffers from
-            Bug#5083 Big integer values are inserted as negative into 
-                     decimal/string columns
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Both have the status: To be fixed later";
+            Status: To be fixed later";
 --source include/show_msg80.inc
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_cast.inc
@@ -676,14 +665,9 @@ let $col_type= my_bigint;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_decimal;
 --source suite/funcs_1/views/fv_cast.inc
-let $message= some statements disabled because of
-Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result;
---source include/show_msg80.inc
-if (0)
-{
+# Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result;
 let $col_type= my_double;
 --source suite/funcs_1/views/fv_cast.inc
-}
 let $col_type= my_datetime;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_date;
@@ -701,7 +685,7 @@ let $target_type= UNSIGNED INTEGER;
 #
 let $message= 
 "Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5083 5913 9809";
+            The file with expected results suffers from Bug 5913";
 --source include/show_msg80.inc
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_cast.inc
@@ -716,10 +700,11 @@ let $col_type= my_bigint;
 let $col_type= my_decimal;
 --source suite/funcs_1/views/fv_cast.inc
 let $message= some statements disabled because of
-Bugs#8663: cant use bgint unsigned as input to cast;
+Bug#5913 Traditional mode: BIGINT range not correctly delimited;
 --source include/show_msg80.inc
 if (0)
 {
+# Bugs#8663: cant use bgint unsigned as input to cast
 let $col_type= my_double;
 --source suite/funcs_1/views/fv_cast.inc
 }
@@ -847,11 +832,6 @@ let $col_type= my_year;
 #           select if(isnull(`test`.`t1`.`f1`),_latin1'IS     NULL',
 #                  _latin1'IS NOT NULL'),...
 #
-let $message=
-"Attention: IF($col_type IS NULL, ...
-            The file with expected results suffers from 
-            Bug#11689. successful CREATE VIEW but SELECT on view fails.";
---source include/show_msg80.inc
 # Bug#11689 success on Create view .. IF(col1 IS NULL,...), col2 ; but SELECT fails
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_if2.inc
@@ -1030,7 +1010,7 @@ eval SET @my_select =
 #
 let $message= 
 "Attention: LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', <numeric column>)
-            The file with expected results suffers from Bug 10963 11728"
+            The file with expected results suffers from Bug 10963"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
             because there are 32/64 Bit differences;
 --source include/show_msg80.inc
@@ -1084,8 +1064,10 @@ $col_type, id FROM t1_values';
 #            If the file doesn't exist or cannot be read ... ,
 #            the function returns NULL.
 # SELECT LOADFILE
+#        Prepare a file:
+SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 eval SET @my_select = 
-'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
+'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
 --source suite/funcs_1/views/fv1.inc
 
 
@@ -1309,14 +1291,13 @@ while ($select_id)
        --disable_query_log
        eval set @got_errno= $mysql_errno ;
        let $run0= `SELECT @got_errno = 0`;
-       let $print_warning= `SELECT @got_errno`;
-       if ($print_warning)
-       {
-          SELECT 'Attention: The last CREATE VIEW failed ' AS ""
-           UNION
-          SELECT '' ;
-       }
        --enable_query_log
+       if (!$run0)
+       {
+          --echo
+          --echo Attention: The last CREATE VIEW failed
+          --echo
+       }
     }
 
     # FIXME           The loop over the modes will start here.
@@ -1330,21 +1311,17 @@ while ($select_id)
           --disable_result_log
        }
        eval $my_select
-            WHERE select_id = $select_id OR select_id IS NULL;
+            WHERE select_id = $select_id OR select_id IS NULL order by id;
        if ($run_no_result)
        {
           --enable_result_log
        }
-       --disable_query_log
-       eval set @got_errno= $mysql_errno ;
-       let $print_warning= `SELECT @got_errno`;
-       if ($print_warning)
+       if ($mysql_errno)
        {
-          SELECT 'Attention: The last SELECT on the base table failed' AS ""
-           UNION
-          SELECT '' ;
+          --echo
+          --echo Attention: The last SELECT on the base table failed
+          --echo
        }
-       --enable_query_log
     }
 
     # $run0 is 1, if CREATE VIEW was successful.
@@ -1353,16 +1330,12 @@ while ($select_id)
     {
        # Check the CREATE VIEW statement
        SHOW CREATE VIEW v1;
-       --disable_query_log
-       eval set @got_errno= $mysql_errno ;
-       let $print_warning= `SELECT @got_errno`;
-       if ($print_warning)
+       if ($mysql_errno)
        {
-          SELECT 'Attention: The last SHOW CREATE VIEW failed' AS ""
-           UNION
-          SELECT '' ;
+          --echo
+          --echo Attention: The last SHOW CREATE VIEW failed
+          --echo
        }
-       --enable_query_log
 
        # Maybe a Join is faster
        if ($run_no_result)
@@ -1371,21 +1344,17 @@ while ($select_id)
        }
        eval SELECT v1.* FROM v1
             WHERE v1.id IN (SELECT id FROM t1_values
-                            WHERE select_id = $select_id OR select_id IS NULL);
+                            WHERE select_id = $select_id OR select_id IS NULL) order by id;
        if ($run_no_result)
        {
           --enable_result_log
        }
-       --disable_query_log
-       eval set @got_errno= $mysql_errno ;
-       let $print_warning= `SELECT @got_errno`;
-       if ($print_warning)
+       if ($mysql_errno)
        {
-          SELECT 'Attention: The last SELECT from VIEW failed' AS ""
-           UNION
-          SELECT '' ;
+          --echo
+          --echo Attention: The last SELECT from VIEW failed
+          --echo
        }
-       --enable_query_log
 
        DROP VIEW v1;
     }
@@ -1394,11 +1363,11 @@ while ($select_id)
 
     # Produce two empty lines as separator between different SELECTS
     # to be tested.
-    --disable_query_log
-    SELECT '' AS "";
-    --enable_query_log
+    --echo
+    --echo
 
     dec $select_id ;
 }
 
 DROP TABLE t1_selects, t1_modes, t1_values;
+--exec rm $MYSQLTEST_VARDIR/tmp/func_view.dat
diff --git a/mysql-test/suite/funcs_1/views/views_master.inc b/mysql-test/suite/funcs_1/views/views_master.inc
index b06873af159..0e3371bdb18 100644
--- a/mysql-test/suite/funcs_1/views/views_master.inc
+++ b/mysql-test/suite/funcs_1/views/views_master.inc
@@ -1772,7 +1772,7 @@ SELECT * FROM v1 ORDER BY f1;
 --enable_info
 # 1.   The record to be inserted will be within the scope of the view.
 #      But there is already a record with the PRIMARY KEY f1 = 2 .
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO v1 VALUES(2,'two');
 # 2.   The record to be inserted will be within the scope of the view.
 #      There is no already existing record with the PRIMARY KEY f1 = 3 .
@@ -1789,7 +1789,7 @@ SELECT * FROM v1 ORDER BY f1;
 # 1.   The record to be updated is within the scope of the view
 #      and will stay inside the scope.
 #      But there is already a record with the PRIMARY KEY f1 = 2 .
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
 # 2.   The record to be updated is within the scope of the view
 #      and will stay inside the scope.
@@ -1873,11 +1873,11 @@ DROP VIEW  IF EXISTS test.v1;
 eval CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
      ENGINE = $engine_type;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 --enable_info
 # positive cases
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -1885,7 +1885,7 @@ INSERT INTO v1 VALUES('B',2);
 --disable_info
 # Bug#11771: View over InnoDB table, wrong result SELECT on VIEW,
 #            field->query_id wrong
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 # negative cases
 --enable_info
 --error 1369
@@ -1895,7 +1895,7 @@ INSERT INTO v1 VALUES('B',3);
 --disable_info
 # Bug#11771: View over InnoDB table, wrong result SELECT on VIEW,
 #            field->query_id wrong
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 
 
 let $message= Testcase 3.3.1.49 ;
@@ -3287,7 +3287,7 @@ DELETE FROM t1;
 #           f1 gets the default 0, because we are in the native sql_mode
 INSERT INTO v1 SET f2 = 'ABC';
 #           f1 gets the default 0, but this value is already exists
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO v1 SET f2 = 'ABC';
 SELECT * from t1;
 DELETE FROM t1;
@@ -3375,7 +3375,7 @@ CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 #           f1 gets the default 0, because we are in the native sql_mode
 INSERT INTO v1 SET f2 = 'ABC';
 #           f1 gets the default 0 and this value is already exists
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO v1 SET f2 = 'ABC';
 SELECT * from t1;
 DELETE FROM t1;
@@ -3838,8 +3838,8 @@ INSERT INTO v1 SET f1 = -1, f4 = 'ABC', report = 'v1 0';
 # 0. Initial state
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 1. Name of one base table column is altered
 ALTER TABLE t1 CHANGE COLUMN f4 f4x CHAR(5);
@@ -3854,9 +3854,9 @@ DESCRIBE t1;
 # Bug#12533 crash on DESCRIBE <view> after renaming base table column;
 --error 1356
 DESCRIBE v1;
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 --error 1356
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 #
 # 2. Length of one base table column is increased
@@ -3865,8 +3865,8 @@ INSERT INTO t1 SET f1 = 2, f4 = '<-- 10 -->', report = 't1 2';
 INSERT INTO v1 SET f1 = 2, f4 = '<-- 10 -->', report = 'v1 2';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 3. Length of one base table column is reduced
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(8);
@@ -3874,8 +3874,8 @@ INSERT INTO t1 SET f1 = 3, f4 = '<-- 10 -->', report = 't1 3';
 INSERT INTO v1 SET f1 = 3, f4 = '<-- 10 -->', report = 'v1 3';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 4. Type of one base table column is altered   string -> string
 ALTER TABLE t1 CHANGE COLUMN f4 f4 VARCHAR(20);
@@ -3883,8 +3883,8 @@ INSERT INTO t1 SET f1 = 4, f4 = '<------ 20 -------->', report = 't1 4';
 INSERT INTO v1 SET f1 = 4, f4 = '<------ 20 -------->', report = 'v1 4';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 5. Type of one base table column altered   numeric -> string 
 ALTER TABLE t1 CHANGE COLUMN f1 f1 VARCHAR(30);
@@ -3894,8 +3894,8 @@ INSERT INTO v1 SET f1 = '<------------- 30 ----------->',
                    f4 = '<------ 20 -------->', report = 'v1 5';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 6. DROP of one base table column
 ALTER TABLE t1 DROP COLUMN f2;
@@ -3905,9 +3905,9 @@ INSERT INTO v1 SET f1 = 'ABC', f4 = '<------ 20 -------->', report = 'v1 6';
 DESCRIBE t1;
 --error 1356
 DESCRIBE v1;
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 --error 1356
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 #
 # 7. Recreation of dropped base table column with the same data type like before
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
@@ -3917,8 +3917,8 @@ INSERT INTO v1 SET f1 = 'ABC', f2 = '1500-12-04',
                    f4 = '<------ 20 -------->', report = 'v1 7';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 8. Recreation of dropped base table column with a different data type
 #    like before
@@ -3930,8 +3930,8 @@ INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
                    f4 = '<------ 20 -------->', report = 'v1 8';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 9. Add a column to the base table
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
@@ -3944,8 +3944,8 @@ INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
                    f4 = '<------ 20 -------->', report = 'v1 9a';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 10. VIEW with numeric function is "victim" of data type change
 DROP TABLE t1;
@@ -3955,32 +3955,32 @@ INSERT INTO t1   SET f1 = 'ABC', f2 = 3;
 CREATE VIEW v1 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, f2;
+SELECT * FROM v1 order by 2;
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
 INSERT INTO t1   SET f1 = 'ABC', f2 = 'DEF';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, f2;
+SELECT * FROM v1 order by 2;
 # Some statements for comparison
 # - the ugly SQRT('DEF) as constant
 SELECT SQRT('DEF');
 # - Will a VIEW based on the same definition show the same result ?
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2;
+SELECT * FROM v2 order by 1;
 # - Will a VIEW v2 created after the base table column recreation show the same
 #   result set like v1 ?
 CREATE OR REPLACE VIEW v2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 DESCRIBE v2;
-SELECT * FROM v2;
+SELECT * FROM v2 order by 2;
 # - What will be the content of base table created with AS SELECT ?
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 --enable_ps_protocol
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
@@ -3988,7 +3988,7 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 --enable_ps_protocol
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
@@ -3996,7 +3996,7 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 --enable_ps_protocol
 #
 DROP TABLE t1;

From d27bf14ed7aab39b8b83d0eed34cb3ba4417de35 Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Fri, 27 Jul 2007 18:42:25 +0500
Subject: [PATCH 078/139] Bug #29878 Garbage data generation when executing
 SESSION_USER() on a slave.

Item_func_user doesn't calculate anything in it's val_str() method,
just returns saved str_value.
Though Item::save_in_field method can destroy str_value, relying on
val_str() return. As a result we get the garbage stored in field.

We cannot use Item::save_in_field implementation for Item_func_user,
reimplement it in simpler way.


mysql-test/r/rpl_session_var.result:
  Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.

  test result
mysql-test/t/rpl_session_var.test:
  Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.

  test case
sql/item.cc:
  Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.

  duplicating code moved to Item::save_str_in_field
sql/item.h:
  Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.

  duplicating code moved to Item::save_str_in_field
sql/item_strfunc.h:
  Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.

  Item_func_user::save_in_field implemented as simple storing str_value
---
 mysql-test/r/rpl_session_var.result | 10 ++++++
 mysql-test/t/rpl_session_var.test   | 22 ++++++++++++
 sql/item.cc                         | 52 +++++++++++++++++++++--------
 sql/item.h                          |  6 +++-
 sql/item_strfunc.h                  |  4 +++
 5 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/mysql-test/r/rpl_session_var.result b/mysql-test/r/rpl_session_var.result
index b5b4b815ade..787899932d6 100644
--- a/mysql-test/r/rpl_session_var.result
+++ b/mysql-test/r/rpl_session_var.result
@@ -41,3 +41,13 @@ select * from t2 order by b;
 b	a
 1	1
 drop table t1,t2;
+CREATE TABLE t1 (
+`id` int(11) NOT NULL auto_increment,
+`data` varchar(100),
+PRIMARY KEY  (`id`)
+) ENGINE=MyISAM;
+INSERT INTO t1(data) VALUES(SESSION_USER());
+SELECT * FROM t1;
+id	data
+1	
+drop table t1;
diff --git a/mysql-test/t/rpl_session_var.test b/mysql-test/t/rpl_session_var.test
index a6f4b496a23..8231a0dbefd 100644
--- a/mysql-test/t/rpl_session_var.test
+++ b/mysql-test/t/rpl_session_var.test
@@ -40,3 +40,25 @@ drop table t1,t2;
 save_master_pos;
 connection slave;
 sync_with_master;
+
+#
+# Bug #29878 Garbage data generation when executing SESSION_USER() on a slave. 
+#
+
+connection master;
+CREATE TABLE t1 (
+  `id` int(11) NOT NULL auto_increment,
+  `data` varchar(100),
+  PRIMARY KEY  (`id`)
+ ) ENGINE=MyISAM;
+
+INSERT INTO t1(data) VALUES(SESSION_USER());
+save_master_pos;
+connection slave;
+sync_with_master;
+SELECT * FROM t1;
+connection master;
+drop table t1;
+save_master_pos;
+connection slave;
+sync_with_master;
diff --git a/sql/item.cc b/sql/item.cc
index 2fc58eebe75..bd47fb706a6 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -336,6 +336,37 @@ int Item::save_date_in_field(Field *field)
 }
 
 
+/*
+  Store the string value in field directly
+
+  SYNOPSIS
+    Item::save_str_value_in_field()
+    field   a pointer to field where to store
+    result  the pointer to the string value to be stored
+
+  DESCRIPTION
+    The method is used by Item_*::save_in_field implementations
+    when we don't need to calculate the value to store
+    See Item_string::save_in_field() implementation for example
+
+  IMPLEMENTATION
+    Check if the Item is null and stores the NULL or the
+    result value in the field accordingly.
+
+  RETURN
+    Nonzero value if error
+*/
+
+int Item::save_str_value_in_field(Field *field, String *result)
+{
+  if (null_value)
+    return set_field_to_null(field);
+  field->set_notnull();
+  return field->store(result->ptr(), result->length(),
+		      collation.collation);
+}
+
+
 Item::Item():
   rsize(0), name(0), orig_name(0), name_length(0), fixed(0),
   is_autogenerated_name(TRUE),
@@ -3009,16 +3040,6 @@ my_decimal *Item_copy_string::val_decimal(my_decimal *decimal_value)
 }
 
 
-
-int Item_copy_string::save_in_field(Field *field, bool no_conversions)
-{
-  if (null_value)
-    return set_field_to_null(field);
-  field->set_notnull();
-  return field->store(str_value.ptr(),str_value.length(),
-		      collation.collation);
-}
-
 /*
   Functions to convert item to field (for send_fields)
 */
@@ -4417,6 +4438,12 @@ int Item_null::save_safe_in_field(Field *field)
 }
 
 
+/*
+  This implementation can lose str_value content, so if the
+  Item uses str_value to store something, it should
+  reimplement it's ::save_in_field() as Item_string, for example, does
+*/
+
 int Item::save_in_field(Field *field, bool no_conversions)
 {
   int error;
@@ -4474,10 +4501,7 @@ int Item_string::save_in_field(Field *field, bool no_conversions)
 {
   String *result;
   result=val_str(&str_value);
-  if (null_value)
-    return set_field_to_null(field);
-  field->set_notnull();
-  return field->store(result->ptr(),result->length(),collation.collation);
+  return save_str_value_in_field(field, result);
 }
 
 
diff --git a/sql/item.h b/sql/item.h
index 5b1a80a5f03..72236cb5e63 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -612,6 +612,7 @@ public:
 
   int save_time_in_field(Field *field);
   int save_date_in_field(Field *field);
+  int save_str_value_in_field(Field *field, String *result);
 
   virtual Field *get_tmp_table_field() { return 0; }
   /* This is also used to create fields in CREATE ... SELECT: */
@@ -2166,7 +2167,10 @@ public:
   my_decimal *val_decimal(my_decimal *);
   void make_field(Send_field *field) { item->make_field(field); }
   void copy();
-  int save_in_field(Field *field, bool no_conversions);
+  int save_in_field(Field *field, bool no_conversions)
+  {
+    return save_str_value_in_field(field, &str_value);
+  }
   table_map used_tables() const { return (table_map) 1L; }
   bool const_item() const { return 0; }
   bool is_null() { return null_value; }
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index d7c4a3eddef..6ca0b89a22b 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -434,6 +434,10 @@ public:
   }
   const char *func_name() const { return "user"; }
   const char *fully_qualified_func_name() const { return "user()"; }
+  int save_in_field(Field *field, bool no_conversions)
+  {
+    return save_str_value_in_field(field, &str_value);
+  }
 };
 
 

From e030b5dcc030e5777ed6260e4a9bb1c135b32aed Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Fri, 27 Jul 2007 18:20:17 +0400
Subject: [PATCH 079/139] Fix for BUG#30027: mysqldump does not dump views
 properly.

mysqldump generates view defitions in two stages:

  - dump CREATE TABLE statements for the temporary tables.  For each view a
    temporary table, that has the same structure as the view is created.

  - dump DROP TABLE statements for the temporary tables and CREATE VIEW
    statements for the view.

This approach is required because views can have dependencies on each other
(a view can use other views). So, they should be created in the particular
order. mysqldump however is not smart enough, so in order to resolve
dependencies it creates temporary tables first of all.

The problem was that mysqldump might have generated incorrect dump for the
temporary table when a view has non-ASCII column name. That happened when
default-character-set is not utf8.

The fix is to:

  1. Switch character_set_client for the mysqldump's connection to binary
     before issuing SHOW FIELDS statement in order to avoid conversion.

  2. Dump switch character_set_client statements to UTF8 and back for
     CREATE TABLE statement that is issued to create temporary table.


client/mysqldump.c:
  1. Switch character_set_results for mysqldump's connection to
  binary before SHOW FIELDS in order to avoid conversion to client
  character set.

  2. Dump switch character_set_client statements to UTF8 and back
  for CREATE TABLE statement.
mysql-test/r/mysqldump.result:
  Update result file.
mysql-test/t/mysqldump.test:
  Test case for BUG#30027.
---
 client/mysqldump.c            | 69 ++++++++++++++++++++---------------
 mysql-test/r/mysqldump.result | 69 +++++++++++++++++++++++++++++++++++
 mysql-test/t/mysqldump.test   | 58 +++++++++++++++++++++++++++++
 3 files changed, 166 insertions(+), 30 deletions(-)

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 0f30ebddacc..6f0e30b8f35 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2174,7 +2174,9 @@ static uint get_table_structure(char *table, char *db, char *table_type,
         */
         my_snprintf(query_buff, sizeof(query_buff),
                     "SHOW FIELDS FROM %s", result_table);
-        if (mysql_query_with_error_report(mysql, 0, query_buff))
+        if (switch_character_set_results(mysql, "binary") ||
+            mysql_query_with_error_report(mysql, &result, query_buff) ||
+            switch_character_set_results(mysql, default_charset))
         {
           /*
             View references invalid or privileged table/col/fun (err 1356),
@@ -2192,43 +2194,50 @@ static uint get_table_structure(char *table, char *db, char *table_type,
         else
           my_free(scv_buff, MYF(MY_ALLOW_ZERO_PTR));
 
-        if ((result= mysql_store_result(mysql)))
+        if (mysql_num_rows(result))
         {
-          if (mysql_num_rows(result))
+          if (opt_drop)
           {
-            if (opt_drop)
-            {
             /*
-              We have already dropped any table of the same name
-              above, so here we just drop the view.
-             */
-
-              fprintf(sql_file, "/*!50001 DROP VIEW IF EXISTS %s*/;\n",
-                      opt_quoted_table);
-              check_io(sql_file);
-            }
-
-            fprintf(sql_file, "/*!50001 CREATE TABLE %s (\n", result_table);
-            /*
-               Get first row, following loop will prepend comma - keeps
-               from having to know if the row being printed is last to
-               determine if there should be a _trailing_ comma.
+              We have already dropped any table of the same name above, so
+              here we just drop the view.
             */
-            row= mysql_fetch_row(result);
 
-            fprintf(sql_file, "  %s %s", quote_name(row[0], name_buff, 0),
-                    row[1]);
-
-            while((row= mysql_fetch_row(result)))
-            {
-              /* col name, col type */
-              fprintf(sql_file, ",\n  %s %s",
-                      quote_name(row[0], name_buff, 0), row[1]);
-            }
-            fprintf(sql_file, "\n) */;\n");
+            fprintf(sql_file, "/*!50001 DROP VIEW IF EXISTS %s*/;\n",
+                    opt_quoted_table);
             check_io(sql_file);
           }
+
+          fprintf(sql_file,
+                  "SET @saved_cs_client     = @@character_set_client;\n"
+                  "SET character_set_client = utf8;\n"
+                  "/*!50001 CREATE TABLE %s (\n",
+                  result_table);
+
+          /*
+            Get first row, following loop will prepend comma - keeps from
+            having to know if the row being printed is last to determine if
+            there should be a _trailing_ comma.
+          */
+
+          row= mysql_fetch_row(result);
+
+          fprintf(sql_file, "  %s %s", quote_name(row[0], name_buff, 0),
+                  row[1]);
+
+          while((row= mysql_fetch_row(result)))
+          {
+            /* col name, col type */
+            fprintf(sql_file, ",\n  %s %s",
+                    quote_name(row[0], name_buff, 0), row[1]);
+          }
+          fprintf(sql_file,
+                  "\n) */;\n"
+                  "SET character_set_client = @saved_cs_client;\n");
+
+          check_io(sql_file);
         }
+
         mysql_free_result(result);
 
         if (path)
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index e8c971a41bc..88ec05bc788 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -1887,9 +1887,12 @@ INSERT INTO `t2` VALUES ('alfred'),('angie'),('bingo'),('waffle'),('lemon');
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v2` (
   `a` varchar(30)
 ) */;
+SET character_set_client = @saved_cs_client;
 /*!50001 DROP TABLE `v2`*/;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
@@ -1978,9 +1981,12 @@ LOCK TABLES `t1` WRITE;
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v1` (
   `a` int(11)
 ) */;
+SET character_set_client = @saved_cs_client;
 /*!50001 DROP TABLE `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
@@ -2046,9 +2052,12 @@ INSERT INTO `t2` VALUES ('alfred'),('angie'),('bingo'),('waffle'),('lemon');
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v2` (
   `a` varchar(30)
 ) */;
+SET character_set_client = @saved_cs_client;
 /*!50001 DROP TABLE `v2`*/;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
@@ -2151,23 +2160,32 @@ INSERT INTO `t1` VALUES (1,2,'one'),(2,4,'two'),(3,6,'three');
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v1` (
   `a` int(11),
   `b` int(11),
   `c` varchar(30)
 ) */;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v2` (
   `a` int(11)
 ) */;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v3`;
 /*!50001 DROP VIEW IF EXISTS `v3`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v3` (
   `a` int(11),
   `b` int(11),
   `c` varchar(30)
 ) */;
+SET character_set_client = @saved_cs_client;
 /*!50001 DROP TABLE `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
@@ -2867,25 +2885,34 @@ INSERT INTO `t1` VALUES (1,'first value','xxxx'),(2,'second value','tttt'),(3,'t
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `v0`;
 /*!50001 DROP VIEW IF EXISTS `v0`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v0` (
   `a` int(11),
   `b` varchar(32),
   `c` varchar(32)
 ) */;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v1` (
   `a` int(11),
   `b` varchar(32),
   `c` varchar(32)
 ) */;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v2` (
   `a` int(11),
   `b` varchar(32),
   `c` varchar(32)
 ) */;
+SET character_set_client = @saved_cs_client;
 
 USE `test`;
 /*!50001 DROP TABLE `v0`*/;
@@ -3248,9 +3275,12 @@ INSERT INTO `t1` VALUES (1232131),(4711),(3231),(815);
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v1` (
   `id` int(11)
 ) */;
+SET character_set_client = @saved_cs_client;
 
 USE `mysqldump_test_db`;
 /*!50001 DROP TABLE `v1`*/;
@@ -3302,9 +3332,12 @@ CREATE TABLE `basetable` (
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_views` /*!40100 DEFAULT CHARACTER SET latin1 */;
 
 USE `mysqldump_views`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `nasishnasifu` (
   `id` bigint(20) unsigned
 ) */;
+SET character_set_client = @saved_cs_client;
 
 USE `mysqldump_tables`;
 
@@ -3870,9 +3903,12 @@ INSERT INTO `t1` VALUES (1232131),(4711),(3231),(815);
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v1` (
   `id` int(11)
 ) */;
+SET character_set_client = @saved_cs_client;
 
 USE `mysqldump_test_db`;
 /*!50001 DROP TABLE `v1`*/;
@@ -3903,5 +3939,38 @@ drop view v1;
 drop table t1;
 drop database mysqldump_test_db;
 #
+# Bug #30027: mysqldump does not dump views properly.
+#            
+
+# Cleanup.
+DROP DATABASE IF EXISTS mysqldump_test_db;
+
+# Create objects.
+CREATE DATABASE mysqldump_test_db;
+set names koi8r;
+CREATE VIEW mysqldump_test_db.v2 AS SELECT 1 AS ËÏÌÏÎËÁ1;
+CREATE VIEW mysqldump_test_db.v1 AS SELECT ËÏÌÏÎËÁ1 FROM mysqldump_test_db.v2;
+set names latin1;
+
+# Dump mysqldump_test_db to /dev/shm/t1/var/tmp/bug30027.sql.
+
+# Drop mysqldump_test_db.
+DROP DATABASE mysqldump_test_db;
+
+# Restore mysqldump_test_db from /dev/shm/t1/var/tmp/bug30027.sql.
+
+# Check the view.
+set names utf8;
+SHOW CREATE VIEW mysqldump_test_db.v1;
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqldump_test_db`.`v1` AS select `v2`.`колонка1` AS `колонка1` from `mysqldump_test_db`.`v2`	koi8r	koi8r_general_ci
+SHOW CREATE VIEW mysqldump_test_db.v2;
+View	Create View	character_set_client	collation_connection
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqldump_test_db`.`v2` AS select 1 AS `колонка1`	koi8r	koi8r_general_ci
+set names latin1;
+
+# Cleanup.
+DROP DATABASE mysqldump_test_db;
+#
 # End of 5.1 tests
 #
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 38d8a07fe48..a0d1195addc 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1676,6 +1676,64 @@ drop database mysqldump_test_db;
 --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug26121.sql
 --remove_file $MYSQLTEST_VARDIR/tmp/bug26121.sql
 
+###########################################################################
+
+--echo #
+--echo # Bug #30027: mysqldump does not dump views properly.
+--echo #            
+
+--echo
+--echo # Cleanup.
+
+--disable_warnings
+DROP DATABASE IF EXISTS mysqldump_test_db;
+--enable_warnings
+
+--echo
+--echo # Create objects.
+
+CREATE DATABASE mysqldump_test_db;
+
+set names koi8r;
+
+CREATE VIEW mysqldump_test_db.v2 AS SELECT 1 AS ËÏÌÏÎËÁ1;
+CREATE VIEW mysqldump_test_db.v1 AS SELECT ËÏÌÏÎËÁ1 FROM mysqldump_test_db.v2;
+
+set names latin1;
+
+--echo
+--echo # Dump mysqldump_test_db to $MYSQLTEST_VARDIR/tmp/bug30027.sql.
+
+--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --default-character-set=latin1 --databases mysqldump_test_db > $MYSQLTEST_VARDIR/tmp/bug30027.sql
+# --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --databases mysqldump_test_db > $MYSQLTEST_VARDIR/tmp/bug30027.sql
+
+--echo
+--echo # Drop mysqldump_test_db.
+
+DROP DATABASE mysqldump_test_db;
+
+--echo
+--echo # Restore mysqldump_test_db from $MYSQLTEST_VARDIR/tmp/bug30027.sql.
+
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug30027.sql
+
+--echo
+--echo # Check the view.
+
+set names utf8;
+
+SHOW CREATE VIEW mysqldump_test_db.v1;
+SHOW CREATE VIEW mysqldump_test_db.v2;
+
+set names latin1;
+
+--echo
+--echo # Cleanup.
+
+DROP DATABASE mysqldump_test_db;
+
+###########################################################################
+
 --echo #
 --echo # End of 5.1 tests
 --echo #

From d47763406d40cf429696e77ec5ef34720c6e9b5f Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Fri, 27 Jul 2007 17:29:48 +0300
Subject: [PATCH 080/139] fixing the 5.1-opt merge of the fix for bug 29571:
 cannot check the statments in the binlog for row based replication.

---
 .../extra/rpl_tests/rpl_insert_delayed.test   | 41 ++++++++++++-------
 .../suite/rpl/r/rpl_row_insert_delayed.result | 12 ------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
index 1dc14748688..e492903afad 100644
--- a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
+++ b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
@@ -90,27 +90,36 @@ connection master;
 # Bug #29571: INSERT DELAYED IGNORE written to binary log on the master but
 # on the slave
 #
-#flush the logs before the test
-connection slave;
-FLUSH LOGS;
-connection master;
-FLUSH LOGS;
+if  (`SELECT @@global.binlog_format != 'ROW'`)
+{
+  #flush the logs before the test
+  connection slave;
+  FLUSH LOGS;
+  connection master;
+  FLUSH LOGS;
+}
 
 CREATE TABLE t1(a int, UNIQUE(a));
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 flush table t1; # to wait for INSERT DELAYED to be done
 
-#must show two INSERT DELAYED
---replace_column 1 x 2 x 3 x 4 x 5 x
-show binlog events in 'master-bin.000002' LIMIT 2,2;
+if  (`SELECT @@global.binlog_format != 'ROW'`)
+{
+  #must show two INSERT DELAYED
+  --replace_column 1 x 2 x 3 x 4 x 5 x
+  show binlog events in 'master-bin.000002' LIMIT 2,2;
+}
 select * from t1;
 
 sync_slave_with_master;
 echo On slave;
-#must show two INSERT DELAYED
---replace_column 1 x 2 x 3 x 4 x 5 x
-show binlog events in 'slave-bin.000002' LIMIT 2,2;
+if  (`SELECT @@global.binlog_format != 'ROW'`)
+{
+  #must show two INSERT DELAYED
+  --replace_column 1 x 2 x 3 x 4 x 5 x
+  show binlog events in 'slave-bin.000002' LIMIT 2,2;
+}
 select * from t1;
 
 
@@ -118,10 +127,14 @@ select * from t1;
 connection master;
 drop table t1;
 sync_slave_with_master;
-#flush the logs after the test
-FLUSH LOGS;
+if  (`SELECT @@global.binlog_format != 'ROW'`)
+{
+  #flush the logs after the test
+  FLUSH LOGS;
+  connection master;
+  FLUSH LOGS;
+}
 connection master;
-FLUSH LOGS;
 
 
 --echo End of 5.0 tests
diff --git a/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result b/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
index 87b375bf653..1551d83266d 100644
--- a/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
+++ b/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
@@ -46,29 +46,17 @@ id	name
 USE test;
 DROP SCHEMA mysqlslap;
 use test;
-FLUSH LOGS;
-FLUSH LOGS;
 CREATE TABLE t1(a int, UNIQUE(a));
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 flush table t1;
-show binlog events in 'master-bin.000002' LIMIT 2,2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-x	x	x	x	x	table_id: 23 (test.t1)
-x	x	x	x	x	table_id: 23 flags: STMT_END_F
 select * from t1;
 a
 1
 On slave
-show binlog events in 'slave-bin.000002' LIMIT 2,2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-x	x	x	x	x	table_id: 23 (test.t1)
-x	x	x	x	x	table_id: 23 flags: STMT_END_F
 select * from t1;
 a
 1
 drop table t1;
-FLUSH LOGS;
-FLUSH LOGS;
 End of 5.0 tests
 set @@global.binlog_format = @old_global_binlog_format;

From 82c87c0a44d17ff2ae723c1ac38ad103bf6949f5 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Fri, 27 Jul 2007 17:55:39 +0300
Subject: [PATCH 081/139] Bug #30000: SHOW commands once again ends up in the 
 slow query log Disable the SHOW commands to appear in the show query log.
 Update the commands type array.

mysql-test/r/show_check.result:
  Bug #30000: test case
mysql-test/t/show_check.test:
  Bug #30000: test case
sql/sql_parse.cc:
  Bug #30000: skip SHOW commands from the
  slow query log.
---
 mysql-test/r/show_check.result | 70 +++++++++++++++++++++++++++++++---
 mysql-test/t/show_check.test   | 64 +++++++++++++++++++++++++++++++
 sql/sql_parse.cc               | 36 ++++++++++++++---
 3 files changed, 160 insertions(+), 10 deletions(-)

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 83881be8ad4..f84d4f3882c 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -790,13 +790,73 @@ show tables;
 Tables_in_test
 show status like 'slow_queries';
 Variable_name	Value
-Slow_queries	1
+Slow_queries	0
 select 1 from information_schema.tables limit 1;
 1
 1
 show status like 'slow_queries';
 Variable_name	Value
-Slow_queries	2
+Slow_queries	1
+create table t1 (a int);
+create trigger tr1 before insert on t1 for each row 
+begin
+end;
+create view v1 as select a from t1;
+create procedure p1()
+begin
+end;
+create function f1()
+returns int
+return 0;
+create event e1 on schedule every 1 year starts now()
+ends date_add(now(), interval 5 hour) do
+begin
+end;
+flush status;
+show databases;
+show tables;
+show events;
+show table status;
+show open tables;
+show plugins;
+show columns in t1;
+show slave hosts;
+show keys in t1;
+show column types;
+show table types;
+show storage engines;
+show authors;
+show contributors;
+show privileges;
+show count(*) warnings;
+show count(*) errors;
+show warnings;
+show status;
+show processlist;
+show variables;
+show charset;
+show collation;
+show grants;
+show create database test;
+show create table t1;
+show create view v1;
+show master status;
+show slave status;
+show create procedure p1;
+show create function f1;
+show create trigger tr1;
+show procedure status;
+show procedure code p1;
+show function code f1;
+show create event e1;
+show status like 'slow_queries';
+Variable_name	Value
+Slow_queries	0
+drop view v1;
+drop table t1;
+drop procedure p1;
+drop function f1;
+drop event e1;
 DROP DATABASE IF EXISTS mysqltest1;
 DROP TABLE IF EXISTS t1;
 DROP VIEW IF EXISTS v1;
@@ -1157,7 +1217,7 @@ select 1 from information_schema.tables limit 1;
 1
 show status like 'slow_queries';
 Variable_name	Value
-Slow_queries	2
+Slow_queries	1
 set global log_queries_not_using_indexes=OFF;
 show variables like "log_queries_not_using_indexes";
 Variable_name	Value
@@ -1167,7 +1227,7 @@ select 1 from information_schema.tables limit 1;
 1
 show status like 'slow_queries';
 Variable_name	Value
-Slow_queries	2
+Slow_queries	1
 set global log_queries_not_using_indexes=ON;
 show variables like "log_queries_not_using_indexes";
 Variable_name	Value
@@ -1177,7 +1237,7 @@ select 1 from information_schema.tables limit 1;
 1
 show status like 'slow_queries';
 Variable_name	Value
-Slow_queries	4
+Slow_queries	2
 End of 5.0 tests
 SHOW AUTHORS;
 create database mysqltest;
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index f2dba49f455..89eac15ccfc 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -549,6 +549,70 @@ show status like 'slow_queries';
 # (mysqld is started with --log-queries-not-using-indexes)
 select 1 from information_schema.tables limit 1;
 show status like 'slow_queries';
+
+create table t1 (a int);
+create trigger tr1 before insert on t1 for each row 
+begin
+end;
+create view v1 as select a from t1;
+create procedure p1()
+begin
+end;
+create function f1()
+returns int
+return 0;
+create event e1 on schedule every 1 year starts now()
+  ends date_add(now(), interval 5 hour) do
+begin
+end;
+
+--disable_result_log
+flush status;
+show databases;
+show tables;
+show events;
+show table status;
+show open tables;
+show plugins;
+show columns in t1;
+show slave hosts;
+show keys in t1;
+show column types;
+show table types;
+show storage engines;
+show authors;
+show contributors;
+show privileges;
+show count(*) warnings;
+show count(*) errors;
+show warnings;
+show status;
+show processlist;
+show variables;
+show charset;
+show collation;
+show grants;
+show create database test;
+show create table t1;
+show create view v1;
+show master status;
+show slave status;
+show create procedure p1;
+show create function f1;
+show create trigger tr1;
+show procedure status;
+show procedure code p1;
+show function code f1;
+show create event e1;
+--enable_result_log
+
+show status like 'slow_queries';
+
+drop view v1;
+drop table t1;
+drop procedure p1;
+drop function f1;
+drop event e1;
 #
 # BUG#10491: Server returns data as charset binary SHOW CREATE TABLE or SELECT
 # FROM I_S.
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 93887db88e1..63971609794 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -223,7 +223,6 @@ void init_update_queries(void)
   sql_command_flags[SQLCOM_REPLACE_SELECT]= CF_CHANGES_DATA | CF_HAS_ROW_COUNT;
 
   sql_command_flags[SQLCOM_SHOW_STATUS_PROC]= CF_STATUS_COMMAND;
-  sql_command_flags[SQLCOM_SHOW_STATUS_FUNC]= CF_STATUS_COMMAND;
   sql_command_flags[SQLCOM_SHOW_STATUS]=      CF_STATUS_COMMAND;
   sql_command_flags[SQLCOM_SHOW_DATABASES]=   CF_STATUS_COMMAND;
   sql_command_flags[SQLCOM_SHOW_TRIGGERS]=    CF_STATUS_COMMAND;
@@ -235,10 +234,36 @@ void init_update_queries(void)
   sql_command_flags[SQLCOM_SHOW_VARIABLES]=   CF_STATUS_COMMAND;
   sql_command_flags[SQLCOM_SHOW_CHARSETS]=    CF_STATUS_COMMAND;
   sql_command_flags[SQLCOM_SHOW_COLLATIONS]=  CF_STATUS_COMMAND;
-  sql_command_flags[SQLCOM_SHOW_STATUS_PROC]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_NEW_MASTER]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_BINLOGS]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_SLAVE_HOSTS]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_BINLOG_EVENTS]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_COLUMN_TYPES]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_STORAGE_ENGINES]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_AUTHORS]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_CONTRIBUTORS]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_PRIVILEGES]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_WARNS]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_ERRORS]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_ENGINE_STATUS]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_ENGINE_MUTEX]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_ENGINE_LOGS]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_PROCESSLIST]= CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_GRANTS]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_CREATE_DB]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_CREATE]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_MASTER_STAT]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_SLAVE_STAT]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_CREATE_PROC]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_CREATE_FUNC]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_CREATE_TRIGGER]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_STATUS_FUNC]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_PROC_CODE]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_FUNC_CODE]=  CF_STATUS_COMMAND;
+  sql_command_flags[SQLCOM_SHOW_CREATE_EVENT]=  CF_STATUS_COMMAND;
 
-  sql_command_flags[SQLCOM_SHOW_TABLES]=       (CF_STATUS_COMMAND |
-                                                CF_SHOW_TABLE_COMMAND);
+   sql_command_flags[SQLCOM_SHOW_TABLES]=       (CF_STATUS_COMMAND |
+                                               CF_SHOW_TABLE_COMMAND);
   sql_command_flags[SQLCOM_SHOW_TABLE_STATUS]= (CF_STATUS_COMMAND |
                                                 CF_SHOW_TABLE_COMMAND);
 
@@ -1323,7 +1348,8 @@ void log_slow_statement(THD *thd)
 	thd->variables.long_query_time ||
 	((thd->server_status &
 	  (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) &&
-	 opt_log_queries_not_using_indexes))
+         opt_log_queries_not_using_indexes &&
+          !(sql_command_flags[thd->lex->sql_command] & CF_STATUS_COMMAND)))
     {
       thd->status_var.long_query_count++;
       slow_log_print(thd, thd->query, thd->query_length, start_of_query);

From 07955aea2dc369be7637f28331bd1072a995d572 Mon Sep 17 00:00:00 2001
From: unknown <thek@adventure.(none)>
Date: Fri, 27 Jul 2007 16:56:29 +0200
Subject: [PATCH 082/139] Bug #29929 LOCK TABLES does not pre-lock tables used
 in triggers of the locked tables

When a table was explicitly locked with LOCK TABLES no associated
tables from any related trigger on the subject table were locked.
As a result of this the user could experience unexpected locking
behavior and statement failures similar to "failed: 1100: Table'xx'
was not locked with LOCK TABLES".

This patch fixes this problem by making sure triggers are
pre-loaded on any statement if the subject table was explicitly
locked with LOCK TABLES.


mysql-test/r/sp-prelocking.result:
  Added test case
mysql-test/t/sp-prelocking.test:
  Added test case
sql/sql_lex.cc:
  - Moved some conditional logic out of the table iteration.
  - Added event map values for LOCK TABLE command.
sql/table.cc:
  - Refactored set_trg_event_tpye into the two simpler functions set_trg_event_map
    and set_trg_event_map as methods for manipulating the table event map.
    The original function was only called from st_lex::set_trg_event_type_for_tables
    so it was possible to move the event map creation logic to this function as
    a loop optimization.
sql/table.h:
  - Refactored set_trg_event_tpye into the two simpler functions set_trg_event_map
    and set_trg_event_map as methods for manipulating the table event map.
    The original function was only called from st_lex::set_trg_event_type_for_tables
    so it was possible to move the event map creation logic to this function as
    a loop optimization.
---
 mysql-test/r/sp-prelocking.result |  30 +++++++
 mysql-test/t/sp-prelocking.test   |  31 +++++++
 sql/sql_lex.cc                    | 135 +++++++++++++++++++++++++++++-
 sql/table.cc                      | 129 ----------------------------
 sql/table.h                       |   1 -
 5 files changed, 193 insertions(+), 133 deletions(-)

diff --git a/mysql-test/r/sp-prelocking.result b/mysql-test/r/sp-prelocking.result
index c19bd1abd26..186b2c05d34 100644
--- a/mysql-test/r/sp-prelocking.result
+++ b/mysql-test/r/sp-prelocking.result
@@ -289,4 +289,34 @@ create table t1 select f_bug22427() as i;
 ERROR 42S01: Table 't1' already exists
 drop table t1;
 drop function f_bug22427;
+#
+# Bug #29929 LOCK TABLES does not pre-lock tables used in triggers of the locked tables
+#
+DROP table IF EXISTS t1,t2;
+CREATE TABLE t1 (c1 INT);
+CREATE TABLE t2 (c2 INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (2);
+CREATE TRIGGER t1_ai AFTER INSERT ON t1 FOR EACH ROW
+BEGIN
+UPDATE t2 SET c2= c2 + 1;
+END//
+# Take a table lock on t1.
+# This should pre-lock t2 through the trigger.
+LOCK TABLE t1 WRITE;
+INSERT INTO t1 VALUES (3);
+UNLOCK TABLES;
+LOCK TABLE t1 READ;
+INSERT INTO t2 values(4);
+ERROR HY000: Table 't2' was not locked with LOCK TABLES
+UNLOCK TABLES;
+SELECT * FROM t1;
+c1
+1
+3
+SELECT * FROM t2;
+c2
+3
+DROP TRIGGER t1_ai;
+DROP TABLE t1, t2;
 End of 5.0 tests
diff --git a/mysql-test/t/sp-prelocking.test b/mysql-test/t/sp-prelocking.test
index 60e97260839..966c59a5789 100644
--- a/mysql-test/t/sp-prelocking.test
+++ b/mysql-test/t/sp-prelocking.test
@@ -356,4 +356,35 @@ create table t1 select f_bug22427() as i;
 drop table t1;
 drop function f_bug22427;
 
+--echo #
+--echo # Bug #29929 LOCK TABLES does not pre-lock tables used in triggers of the locked tables
+--echo #
+--disable_warnings
+DROP table IF EXISTS t1,t2;
+--enable_warnings
+CREATE TABLE t1 (c1 INT);
+CREATE TABLE t2 (c2 INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (2);
+DELIMITER //;
+CREATE TRIGGER t1_ai AFTER INSERT ON t1 FOR EACH ROW
+BEGIN
+UPDATE t2 SET c2= c2 + 1;
+END//
+DELIMITER ;//
+--echo # Take a table lock on t1.
+--echo # This should pre-lock t2 through the trigger.
+LOCK TABLE t1 WRITE;
+INSERT INTO t1 VALUES (3);
+UNLOCK TABLES;
+LOCK TABLE t1 READ;
+--error ER_TABLE_NOT_LOCKED
+INSERT INTO t2 values(4);
+UNLOCK TABLES;
+SELECT * FROM t1;
+SELECT * FROM t2;
+DROP TRIGGER t1_ai;
+DROP TABLE t1, t2;
+
 --echo End of 5.0 tests
+
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index c37d77345b6..106dcf88a84 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -2035,12 +2035,131 @@ void st_select_lex_unit::set_limit(SELECT_LEX *sl)
 
 
 /**
-  Update the parsed tree with information about triggers that
-  may be fired when executing this statement.
+  @brief Set the initial purpose of this TABLE_LIST object in the list of used
+    tables.
+
+  We need to track this information on table-by-table basis, since when this
+  table becomes an element of the pre-locked list, it's impossible to identify
+  which SQL sub-statement it has been originally used in.
+
+  E.g.:
+
+  User request:                 SELECT * FROM t1 WHERE f1();
+  FUNCTION f1():                DELETE FROM t2; RETURN 1;
+  BEFORE DELETE trigger on t2:  INSERT INTO t3 VALUES (old.a);
+
+  For this user request, the pre-locked list will contain t1, t2, t3
+  table elements, each needed for different DML.
+
+  The trigger event map is updated to reflect INSERT, UPDATE, DELETE,
+  REPLACE, LOAD DATA, CREATE TABLE .. SELECT, CREATE TABLE ..
+  REPLACE SELECT statements, and additionally ON DUPLICATE KEY UPDATE
+  clause.
 */
 
 void st_lex::set_trg_event_type_for_tables()
 {
+  enum trg_event_type trg_event;
+
+  uint8 new_trg_event_map= 0;
+
+  /*
+    Some auxiliary operations
+    (e.g. GRANT processing) create TABLE_LIST instances outside
+    the parser. Additionally, some commands (e.g. OPTIMIZE) change
+    the lock type for a table only after parsing is done. Luckily,
+    these do not fire triggers and do not need to pre-load them.
+    For these TABLE_LISTs set_trg_event_type is never called, and
+    trg_event_map is always empty. That means that the pre-locking
+    algorithm will ignore triggers defined on these tables, if
+    any, and the execution will either fail with an assert in
+    sql_trigger.cc or with an error that a used table was not
+    pre-locked, in case of a production build.
+
+    TODO: this usage pattern creates unnecessary module dependencies
+    and should be rewritten to go through the parser.
+    Table list instances created outside the parser in most cases
+    refer to mysql.* system tables. It is not allowed to have
+    a trigger on a system table, but keeping track of
+    initialization provides extra safety in case this limitation
+    is circumvented.
+  */
+
+  switch (sql_command) {
+  case SQLCOM_LOCK_TABLES:
+  /*
+    On a LOCK TABLE, all triggers must be pre-loaded for this TABLE_LIST
+    when opening an associated TABLE.
+  */
+    new_trg_event_map= static_cast<uint8>
+                        (1 << static_cast<int>(TRG_EVENT_INSERT)) |
+                      static_cast<uint8>
+                        (1 << static_cast<int>(TRG_EVENT_UPDATE)) |
+                      static_cast<uint8>
+                        (1 << static_cast<int>(TRG_EVENT_DELETE));
+    break;
+  /*
+    Basic INSERT. If there is an additional ON DUPLIATE KEY UPDATE
+    clause, it will be handled later in this method.
+  */
+  case SQLCOM_INSERT:                           /* fall through */
+  case SQLCOM_INSERT_SELECT:
+  /*
+    LOAD DATA ... INFILE is expected to fire BEFORE/AFTER INSERT
+    triggers.
+    If the statement also has REPLACE clause, it will be
+    handled later in this method.
+  */
+  case SQLCOM_LOAD:                             /* fall through */
+  /*
+    REPLACE is semantically equivalent to INSERT. In case
+    of a primary or unique key conflict, it deletes the old
+    record and inserts a new one. So we also may need to
+    fire ON DELETE triggers. This functionality is handled
+    later in this method.
+  */
+  case SQLCOM_REPLACE:                          /* fall through */
+  case SQLCOM_REPLACE_SELECT:
+  /*
+    CREATE TABLE ... SELECT defaults to INSERT if the table or
+    view already exists. REPLACE option of CREATE TABLE ...
+    REPLACE SELECT is handled later in this method.
+  */
+  case SQLCOM_CREATE_TABLE:
+    new_trg_event_map|= static_cast<uint8>
+                          (1 << static_cast<int>(TRG_EVENT_INSERT));
+    break;
+  /* Basic update and multi-update */
+  case SQLCOM_UPDATE:                           /* fall through */
+  case SQLCOM_UPDATE_MULTI:
+    new_trg_event_map|= static_cast<uint8>
+                          (1 << static_cast<int>(TRG_EVENT_UPDATE));
+    break;
+  /* Basic delete and multi-delete */
+  case SQLCOM_DELETE:                           /* fall through */
+  case SQLCOM_DELETE_MULTI:
+    new_trg_event_map|= static_cast<uint8>
+                          (1 << static_cast<int>(TRG_EVENT_DELETE));
+    break;
+  default:
+    break;
+  }
+
+  switch (duplicates) {
+  case DUP_UPDATE:
+    new_trg_event_map|= static_cast<uint8>
+                          (1 << static_cast<int>(TRG_EVENT_UPDATE));
+    break;
+  case DUP_REPLACE:
+    new_trg_event_map|= static_cast<uint8>
+                          (1 << static_cast<int>(TRG_EVENT_DELETE));
+    break;
+  case DUP_ERROR:
+  default:
+    break;
+  }
+
+
   /*
     Do not iterate over sub-selects, only the tables in the outermost
     SELECT_LEX can be modified, if any.
@@ -2049,7 +2168,17 @@ void st_lex::set_trg_event_type_for_tables()
 
   while (tables)
   {
-    tables->set_trg_event_type(this);
+    /*
+      This is a fast check to filter out statements that do
+      not change data, or tables  on the right side, in case of
+      INSERT .. SELECT, CREATE TABLE .. SELECT and so on.
+      Here we also filter out OPTIMIZE statement and non-updateable
+      views, for which lock_type is TL_UNLOCK or TL_READ after
+      parsing.
+    */
+    if (static_cast<int>(tables->lock_type) >=
+        static_cast<int>(TL_WRITE_ALLOW_WRITE))
+      tables->trg_event_map= new_trg_event_map;
     tables= tables->next_local;
   }
 }
diff --git a/sql/table.cc b/sql/table.cc
index f24f5c6fbcc..f27076076bf 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1776,135 +1776,6 @@ void st_table::reset_item_list(List<Item> *item_list) const
   }
 }
 
-
-/**
-  Set the initial purpose of this TABLE_LIST object in the list of
-  used tables. We need to track this information on table-by-
-  table basis, since when this table becomes an element of the
-  pre-locked list, it's impossible to identify which SQL
-  sub-statement it has been originally used in.
-
-  E.g.:
-
-  User request:                 SELECT * FROM t1 WHERE f1();
-  FUNCTION f1():                DELETE FROM t2; RETURN 1;
-  BEFORE DELETE trigger on t2:  INSERT INTO t3 VALUES (old.a);
-
-  For this user request, the pre-locked list will contain t1, t2, t3
-  table elements, each needed for different DML.
-
-  This method is called immediately after parsing for tables
-  of the table list of the top-level select lex.
-
-  The trigger event map is updated to reflect INSERT, UPDATE, DELETE,
-  REPLACE, LOAD DATA, CREATE TABLE .. SELECT, CREATE TABLE ..
-  REPLACE SELECT statements, and additionally ON DUPLICATE KEY UPDATE
-  clause.
-*/
-
-void
-TABLE_LIST::set_trg_event_type(const st_lex *lex)
-{
-  enum trg_event_type trg_event;
-
-  /*
-    Some auxiliary operations
-    (e.g. GRANT processing) create TABLE_LIST instances outside
-    the parser. Additionally, some commands (e.g. OPTIMIZE) change
-    the lock type for a table only after parsing is done. Luckily,
-    these do not fire triggers and do not need to pre-load them.
-    For these TABLE_LISTs set_trg_event_type is never called, and
-    trg_event_map is always empty. That means that the pre-locking
-    algorithm will ignore triggers defined on these tables, if
-    any, and the execution will either fail with an assert in
-    sql_trigger.cc or with an error that a used table was not
-    pre-locked, in case of a production build.
-
-    TODO: this usage pattern creates unnecessary module dependencies
-    and should be rewritten to go through the parser.
-    Table list instances created outside the parser in most cases
-    refer to mysql.* system tables. It is not allowed to have
-    a trigger on a system table, but keeping track of
-    initialization provides extra safety in case this limitation
-    is circumvented.
-  */
-
-  /*
-    This is a fast check to filter out statements that do
-    not change data, or tables  on the right side, in case of
-    INSERT .. SELECT, CREATE TABLE .. SELECT and so on.
-    Here we also filter out OPTIMIZE statement and non-updateable
-    views, for which lock_type is TL_UNLOCK or TL_READ after
-    parsing.
-  */
-  if (static_cast<int>(lock_type) < static_cast<int>(TL_WRITE_ALLOW_WRITE))
-    return;
-
-  switch (lex->sql_command) {
-  /*
-    Basic INSERT. If there is an additional ON DUPLIATE KEY UPDATE
-    clause, it will be handled later in this method.
-  */
-  case SQLCOM_INSERT:                           /* fall through */
-  case SQLCOM_INSERT_SELECT:
-  /*
-    LOAD DATA ... INFILE is expected to fire BEFORE/AFTER INSERT
-    triggers.
-    If the statement also has REPLACE clause, it will be
-    handled later in this method.
-  */
-  case SQLCOM_LOAD:                             /* fall through */
-  /*
-    REPLACE is semantically equivalent to INSERT. In case
-    of a primary or unique key conflict, it deletes the old
-    record and inserts a new one. So we also may need to
-    fire ON DELETE triggers. This functionality is handled
-    later in this method.
-  */
-  case SQLCOM_REPLACE:                          /* fall through */
-  case SQLCOM_REPLACE_SELECT:
-  /*
-    CREATE TABLE ... SELECT defaults to INSERT if the table or
-    view already exists. REPLACE option of CREATE TABLE ...
-    REPLACE SELECT is handled later in this method.
-  */
-  case SQLCOM_CREATE_TABLE:
-    trg_event= TRG_EVENT_INSERT;
-    break;
-  /* Basic update and multi-update */
-  case SQLCOM_UPDATE:                           /* fall through */
-  case SQLCOM_UPDATE_MULTI:
-    trg_event= TRG_EVENT_UPDATE;
-    break;
-  /* Basic delete and multi-delete */
-  case SQLCOM_DELETE:                           /* fall through */
-  case SQLCOM_DELETE_MULTI:
-    trg_event= TRG_EVENT_DELETE;
-    break;
-  default:
-    /*
-      OK to return, since value of 'duplicates' is irrelevant
-      for non-updating commands.
-    */
-    return;
-  }
-  trg_event_map|= static_cast<uint8>(1 << static_cast<int>(trg_event));
-
-  switch (lex->duplicates) {
-  case DUP_UPDATE:
-    trg_event= TRG_EVENT_UPDATE;
-    break;
-  case DUP_REPLACE:
-    trg_event= TRG_EVENT_DELETE;
-    break;
-  case DUP_ERROR:
-  default:
-    return;
-  }
-  trg_event_map|= static_cast<uint8>(1 << static_cast<int>(trg_event));
-}
-
-
 /*
   calculate md5 of query
 
diff --git a/sql/table.h b/sql/table.h
index f8f7d7f06b7..f411ce489c4 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -770,7 +770,6 @@ struct TABLE_LIST
   void reinit_before_use(THD *thd);
   Item_subselect *containing_subselect();
 
-  void set_trg_event_type(const st_lex *lex);
 private:
   bool prep_check_option(THD *thd, uint8 check_opt_type);
   bool prep_where(THD *thd, Item **conds, bool no_where_clause);

From 987ef94079b87101562de07475a7f1983a160ed7 Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com/kent-amd64.(none)>
Date: Fri, 27 Jul 2007 17:39:07 +0200
Subject: [PATCH 083/139] SSL/Makefile.am mysql-test/Makefile.am:   Moved CERT
 files to where they are used, avoids conflict   between two make files trying
 to install the same CERTs SSL/*.pem,   Move: SSL/*.pem ->
 mysql-test/std_data/

mysql-test/std_data/cacert.pem:
  Rename: SSL/cacert.pem -> mysql-test/std_data/cacert.pem
mysql-test/std_data/client-cert.pem:
  Rename: SSL/client-cert.pem -> mysql-test/std_data/client-cert.pem
mysql-test/std_data/client-key.pem:
  Rename: SSL/client-key.pem -> mysql-test/std_data/client-key.pem
mysql-test/std_data/server-cert.pem:
  Rename: SSL/server-cert.pem -> mysql-test/std_data/server-cert.pem
mysql-test/std_data/server-key.pem:
  Rename: SSL/server-key.pem -> mysql-test/std_data/server-key.pem
SSL/Makefile.am:
  Moved CERT files to where they are used, avoids conflict
  between two make files trying to install the same CERTs
---
 SSL/Makefile.am                              |  4 +---
 mysql-test/Makefile.am                       | 18 +-----------------
 {SSL => mysql-test/std_data}/cacert.pem      |  0
 {SSL => mysql-test/std_data}/client-cert.pem |  0
 {SSL => mysql-test/std_data}/client-key.pem  |  0
 {SSL => mysql-test/std_data}/server-cert.pem |  0
 {SSL => mysql-test/std_data}/server-key.pem  |  0
 7 files changed, 2 insertions(+), 20 deletions(-)
 rename {SSL => mysql-test/std_data}/cacert.pem (100%)
 rename {SSL => mysql-test/std_data}/client-cert.pem (100%)
 rename {SSL => mysql-test/std_data}/client-key.pem (100%)
 rename {SSL => mysql-test/std_data}/server-cert.pem (100%)
 rename {SSL => mysql-test/std_data}/server-key.pem (100%)

diff --git a/SSL/Makefile.am b/SSL/Makefile.am
index 5fc44d3a247..30a6fc3c995 100644
--- a/SSL/Makefile.am
+++ b/SSL/Makefile.am
@@ -15,9 +15,7 @@
 
 ## Process this file with automake to create Makefile.in
 
-EXTRA_DIST=	NOTES cacert.pem client-cert.pem client-key.pem \
-		run-client run-server server-cert.pem \
-		server-key.pem
+EXTRA_DIST= NOTES run-client run-server
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 1920a68b21b..439b13af779 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -37,12 +37,7 @@ EXTRA_DIST = 		$(EXTRA_SCRIPTS) suite
 GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr
 PRESCRIPTS =		mysql-test-run.pl mysql-stress-test.pl
 test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)
-test_DATA = 		std_data/client-key.pem \
-			std_data/client-cert.pem \
-			std_data/cacert.pem \
-			std_data/server-cert.pem \
-			std_data/server-key.pem
-CLEANFILES = 		$(GENSCRIPTS) $(test_DATA)
+CLEANFILES = 		$(GENSCRIPTS)
 
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include -I..
 
@@ -111,17 +106,6 @@ install-data-local:
 uninstall-local:
 	@RM@ -f -r $(DESTDIR)$(testdir)
 
-std_data/client-key.pem: $(top_srcdir)/SSL/$(@F)
-	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
-std_data/client-cert.pem: $(top_srcdir)/SSL/$(@F)
-	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
-std_data/cacert.pem: $(top_srcdir)/SSL/$(@F)
-	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
-std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F)
-	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
-std_data/server-key.pem: $(top_srcdir)/SSL/$(@F)
-	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
-
 # mtr - a shortcut for executing mysql-test-run.pl
 mtr:
 	$(RM) -f mtr
diff --git a/SSL/cacert.pem b/mysql-test/std_data/cacert.pem
similarity index 100%
rename from SSL/cacert.pem
rename to mysql-test/std_data/cacert.pem
diff --git a/SSL/client-cert.pem b/mysql-test/std_data/client-cert.pem
similarity index 100%
rename from SSL/client-cert.pem
rename to mysql-test/std_data/client-cert.pem
diff --git a/SSL/client-key.pem b/mysql-test/std_data/client-key.pem
similarity index 100%
rename from SSL/client-key.pem
rename to mysql-test/std_data/client-key.pem
diff --git a/SSL/server-cert.pem b/mysql-test/std_data/server-cert.pem
similarity index 100%
rename from SSL/server-cert.pem
rename to mysql-test/std_data/server-cert.pem
diff --git a/SSL/server-key.pem b/mysql-test/std_data/server-key.pem
similarity index 100%
rename from SSL/server-key.pem
rename to mysql-test/std_data/server-key.pem

From 32cc0694bf6d5c8673f4c270793dedb5a8a8ab1e Mon Sep 17 00:00:00 2001
From: unknown <iggy@alf.(none)>
Date: Fri, 27 Jul 2007 11:54:54 -0400
Subject: [PATCH 084/139] Bug#30103 CMake build solution does not remove
 auto-generated resources - Add CMake rule to remove files.

---
 sql/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 0cbeb97184f..b0553f622f8 100755
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -138,6 +138,10 @@ ADD_CUSTOM_COMMAND(
 )
 ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} gen_lex_hash)
 
+# Remove the auto-generated files as part of 'Clean Solution'
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES 
+                         "lex_hash.h;message.rc;message.h;sql_yacc.h;sql_yacc.cc")
+
 ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
 ADD_DEPENDENCIES(udf_example strings)
 TARGET_LINK_LIBRARIES(udf_example wsock32)

From 818b0b84e0268e38a563dcf2c6ce0c3c2cf2f7f7 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Fri, 27 Jul 2007 21:06:50 +0400
Subject: [PATCH 085/139] Fix test so that it will be environment-independent.

mysql-test/r/mysqldump.result:
  Update result file.
---
 mysql-test/r/mysqldump.result | 4 ++--
 mysql-test/t/mysqldump.test   | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 88ec05bc788..05f795f4e68 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -3952,12 +3952,12 @@ CREATE VIEW mysqldump_test_db.v2 AS SELECT 1 AS 
 CREATE VIEW mysqldump_test_db.v1 AS SELECT ËÏÌÏÎËÁ1 FROM mysqldump_test_db.v2;
 set names latin1;
 
-# Dump mysqldump_test_db to /dev/shm/t1/var/tmp/bug30027.sql.
+# Dump mysqldump_test_db to bug30027.sql.
 
 # Drop mysqldump_test_db.
 DROP DATABASE mysqldump_test_db;
 
-# Restore mysqldump_test_db from /dev/shm/t1/var/tmp/bug30027.sql.
+# Restore mysqldump_test_db from bug30027.sql.
 
 # Check the view.
 set names utf8;
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index a0d1195addc..3d3420b46b4 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1702,10 +1702,9 @@ CREATE VIEW mysqldump_test_db.v1 AS SELECT 
 set names latin1;
 
 --echo
---echo # Dump mysqldump_test_db to $MYSQLTEST_VARDIR/tmp/bug30027.sql.
+--echo # Dump mysqldump_test_db to bug30027.sql.
 
 --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --default-character-set=latin1 --databases mysqldump_test_db > $MYSQLTEST_VARDIR/tmp/bug30027.sql
-# --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --databases mysqldump_test_db > $MYSQLTEST_VARDIR/tmp/bug30027.sql
 
 --echo
 --echo # Drop mysqldump_test_db.
@@ -1713,7 +1712,7 @@ set names latin1;
 DROP DATABASE mysqldump_test_db;
 
 --echo
---echo # Restore mysqldump_test_db from $MYSQLTEST_VARDIR/tmp/bug30027.sql.
+--echo # Restore mysqldump_test_db from bug30027.sql.
 
 --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug30027.sql
 

From e42805fbebb8f5dcf26c60484fa0e5f0531112a2 Mon Sep 17 00:00:00 2001
From: unknown <df@pippilotta.erinye.com>
Date: Fri, 27 Jul 2007 19:14:08 +0200
Subject: [PATCH 086/139] BUG#20815 for the 5.1 branch

CMakeLists.txt:
  BUG#20815 do not use 10MB of stack space per thread, enforce the previous 5.0 default of 1M
---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bdb1e01612..bda71a7a10c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,9 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
 	# generate .map files  
 	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
 
+  # set stack size (see bug#20815)
+  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1048576")
+
 	# remove support for Exception handling
 	STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

From 5a03bfbbce3f8bb9b7a3e9655d167ea6625e654e Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Fri, 27 Jul 2007 21:50:37 +0400
Subject: [PATCH 087/139] Fix merge.

---
 mysql-test/r/mysqldump.result  | 54 +++++++++++++++++++++++++++++-----
 mysql-test/r/show_check.result | 20 +++++++++++++
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index c42272d612b..9b3f4efe119 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -1812,14 +1812,21 @@ SET character_set_client = utf8;
 CREATE TABLE `t3` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1849,9 +1856,12 @@ mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manu
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
@@ -1882,12 +1892,15 @@ insert into t1 values (0815, 4711, 2006);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t1" (
   "a b" int(11) NOT NULL DEFAULT '0',
   "c""d" int(11) NOT NULL DEFAULT '0',
   "e`f" int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY ("a b","c""d","e`f")
 );
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
@@ -1913,12 +1926,15 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a b` int(11) NOT NULL DEFAULT '0',
   `c"d` int(11) NOT NULL DEFAULT '0',
   `e``f` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`a b`,`c"d`,`e``f`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -1964,10 +1980,13 @@ create view v2 as select * from t2 where a like 'a%' with check option;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` varchar(30) DEFAULT NULL,
   KEY `a` (`a`(5))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -3131,9 +3150,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3187,10 +3209,13 @@ insert into t1 values ('','');
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` binary(1) DEFAULT NULL,
   `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3219,10 +3244,13 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` binary(1) DEFAULT NULL,
   `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3543,14 +3571,6 @@ grant RELOAD on *.* to mysqltest_1@localhost;
 mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227)
 mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227)
 grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=537;
-CREATE TABLE `t1` (
-  `a` int(11) default NULL,
-  `b` varchar(34) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
 drop table t1;
 drop user mysqltest_1@localhost;
 #
@@ -3639,22 +3659,31 @@ CREATE TABLE t1 (a int) ENGINE=merge UNION=(t2, t3);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t2`,`t3`);
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `t3`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t3` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t3` WRITE;
 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
@@ -3734,10 +3763,13 @@ drop database mysqldump_test_db;
 #
 CREATE TABLE t1 (c1 INT, c2 LONGBLOB);
 INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` longblob
 );
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171);
 DROP TABLE t1;
 #
@@ -3770,10 +3802,13 @@ INSERT INTO t1 VALUES (3,4), (4,5);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -4037,9 +4072,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CH
 
 USE `mysqldump_test_db`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `id` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 2bdd29602fb..2914384aa29 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1148,6 +1148,26 @@ DROP TABLE t1;
 DROP VIEW v1;
 DROP PROCEDURE p1;
 DROP FUNCTION f1;
+set names koi8r;
+DROP DATABASE IF EXISTS mysqltest1;
+CREATE DATABASE mysqltest1;
+use mysqltest1;
+CREATE TABLE t1(ËÏÌÏÎËÁ1 INT);
+
+---> Dumping mysqltest1 to show_check.mysqltest1.sql
+
+
+DROP DATABASE mysqltest1;
+
+
+---> Restoring mysqltest1...
+SHOW CREATE TABLE mysqltest1.t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `ËÏÌÏÎËÁ1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP DATABASE mysqltest1;
+use test;
 flush status;
 show variables like "log_queries_not_using_indexes";
 Variable_name	Value

From cc5b3745661bdf5328c87e7045abe8ec7d9b1522 Mon Sep 17 00:00:00 2001
From: unknown <malff/marcsql@weblab.(none)>
Date: Fri, 27 Jul 2007 12:19:36 -0600
Subject: [PATCH 088/139] Code review changes

---
 sql/handler.cc   |  2 ++
 sql/lock.cc      | 41 ++++++++++++++++++++++++++++++-----------
 sql/log.cc       | 42 +++++++++++++++++-------------------------
 sql/log.h        |  3 ---
 sql/sql_parse.cc |  2 +-
 5 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index e0ec2962d17..c4abfeea0a8 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -3658,6 +3658,8 @@ int handler::ha_write_row(uchar *buf)
   Write a record to the engine bypassing row-level binary logging.
   This method is used internally by the server for writing to
   performance schema tables, which are never replicated.
+  TODO: Merge this function with ha_write_row(), and provide a way
+  to disable the binlog there.
 */
 int handler::ha_write_row_no_binlog(uchar *buf)
 {
diff --git a/sql/lock.cc b/sql/lock.cc
index 34a2e202f8f..acb34c0d66a 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -111,21 +111,23 @@ static void print_lock_error(int error, const char *);
 static int thr_lock_errno_to_mysql[]=
 { 0, 1, ER_LOCK_WAIT_TIMEOUT, ER_LOCK_DEADLOCK };
 
-MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count,
-                              uint flags, bool *need_reopen)
+/**
+  Perform semantic checks for mysql_lock_tables.
+  @param thd The current thread
+  @param tables The tables to lock
+  @param count The number of tables to lock
+  @param flags Lock flags
+  @return 0 if all the check passed, non zero if a check failed.
+*/
+int mysql_lock_tables_check(THD *thd, TABLE **tables, uint count, uint flags)
 {
-  MYSQL_LOCK *sql_lock;
-  TABLE *write_lock_used;
-  int rc;
-  uint i;
   bool log_table_write_query;
   uint system_count;
+  uint i;
 
-  DBUG_ENTER("mysql_lock_tables");
+  DBUG_ENTER("mysql_lock_tables_check");
 
-  *need_reopen= FALSE;
   system_count= 0;
-
   log_table_write_query= (is_log_table_write_query(thd->lex->sql_command)
                          || ((flags & MYSQL_LOCK_PERF_SCHEMA) != 0));
 
@@ -154,7 +156,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count,
           || (thd->lex->sql_command == SQLCOM_LOCK_TABLES))
       {
         my_error(ER_CANT_LOCK_LOG_TABLE, MYF(0));
-        DBUG_RETURN(0);
+        DBUG_RETURN(1);
       }
     }
 
@@ -173,9 +175,26 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count,
   if ((system_count > 0) && (system_count < count))
   {
     my_error(ER_WRONG_LOCK_OF_SYSTEM_TABLE, MYF(0));
-    DBUG_RETURN(0);
+    DBUG_RETURN(1);
   }
 
+  DBUG_RETURN(0);
+}
+
+MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count,
+                              uint flags, bool *need_reopen)
+{
+  MYSQL_LOCK *sql_lock;
+  TABLE *write_lock_used;
+  int rc;
+
+  DBUG_ENTER("mysql_lock_tables");
+
+  *need_reopen= FALSE;
+
+  if (mysql_lock_tables_check(thd, tables, count, flags))
+    DBUG_RETURN (NULL);
+
   for (;;)
   {
     if (! (sql_lock= get_lock_data(thd, tables, count, GET_LOCK_STORE_LOCKS,
diff --git a/sql/log.cc b/sql/log.cc
index af039c15ffc..c7a8037d4b5 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -708,19 +708,10 @@ bool Log_to_file_event_handler::
            longlong query_time, longlong lock_time, bool is_command,
            const char *sql_text, uint sql_text_len)
 {
-  bool res;
-
-  (void) pthread_mutex_lock(mysql_slow_log.get_log_lock());
-
-  /* TODO: MYSQL_QUERY_LOG::write is not thread-safe */
-  res= mysql_slow_log.write(thd, current_time, query_start_arg,
-                            user_host, user_host_len,
-                            query_time, lock_time, is_command,
-                            sql_text, sql_text_len);
-
-  (void) pthread_mutex_unlock(mysql_slow_log.get_log_lock());
-
-  return res;
+  return mysql_slow_log.write(thd, current_time, query_start_arg,
+                              user_host, user_host_len,
+                              query_time, lock_time, is_command,
+                              sql_text, sql_text_len);
 }
 
 
@@ -736,18 +727,9 @@ bool Log_to_file_event_handler::
               const char *sql_text, uint sql_text_len,
               CHARSET_INFO *client_cs)
 {
-  bool res;
-
-  (void) pthread_mutex_lock (mysql_log.get_log_lock());
-
-  /* TODO: MYSQL_QUERY_LOG::write is not thread-safe */
-  res= mysql_log.write(event_time, user_host, user_host_len,
-                       thread_id, command_type, command_type_len,
-                       sql_text, sql_text_len);
-
-  (void) pthread_mutex_unlock (mysql_log.get_log_lock());
-
-  return res;
+  return mysql_log.write(event_time, user_host, user_host_len,
+                         thread_id, command_type, command_type_len,
+                         sql_text, sql_text_len);
 }
 
 
@@ -1959,6 +1941,8 @@ bool MYSQL_QUERY_LOG::write(time_t event_time, const char *user_host,
   struct tm start;
   uint time_buff_len= 0;
 
+  (void) pthread_mutex_lock(&LOCK_log);
+
   /* Test if someone closed between the is_open test and lock */
   if (is_open())
   {
@@ -2003,6 +1987,7 @@ bool MYSQL_QUERY_LOG::write(time_t event_time, const char *user_host,
       goto err;
   }
 
+  (void) pthread_mutex_unlock(&LOCK_log);
   return FALSE;
 err:
 
@@ -2011,6 +1996,7 @@ err:
     write_error= 1;
     sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);
   }
+  (void) pthread_mutex_unlock(&LOCK_log);
   return TRUE;
 }
 
@@ -2053,8 +2039,13 @@ bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
   bool error= 0;
   DBUG_ENTER("MYSQL_QUERY_LOG::write");
 
+  (void) pthread_mutex_lock(&LOCK_log);
+
   if (!is_open())
+  {
+    (void) pthread_mutex_unlock(&LOCK_log);
     DBUG_RETURN(0);
+  }
 
   if (is_open())
   {						// Safety agains reopen
@@ -2158,6 +2149,7 @@ bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
       }
     }
   }
+  (void) pthread_mutex_unlock(&LOCK_log);
   DBUG_RETURN(error);
 }
 
diff --git a/sql/log.h b/sql/log.h
index faf6ead450c..3b1a0950daa 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -213,9 +213,6 @@ public:
                 WRITE_CACHE);
   }
 
-  /* TODO: fix MYSQL_LOG::write to be thread safe instead. */
-  inline pthread_mutex_t* get_log_lock() { return &LOCK_log; }
-
 private:
   time_t last_time;
 };
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index c2820581d71..848d9e2c066 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -210,7 +210,7 @@ void init_update_queries(void)
   sql_command_flags[SQLCOM_CREATE_VIEW]=    CF_CHANGES_DATA;
   sql_command_flags[SQLCOM_DROP_VIEW]=      CF_CHANGES_DATA;
   sql_command_flags[SQLCOM_CREATE_EVENT]=   CF_CHANGES_DATA;
-  sql_command_flags[SQLCOM_ALTER_EVENT]=    CF_CHANGES_DATA | CF_WRITE_LOGS_COMMAND;
+  sql_command_flags[SQLCOM_ALTER_EVENT]=    CF_CHANGES_DATA;
   sql_command_flags[SQLCOM_DROP_EVENT]=     CF_CHANGES_DATA;
 
   sql_command_flags[SQLCOM_UPDATE]=	    CF_CHANGES_DATA | CF_HAS_ROW_COUNT;

From 2e23c6f09051ba86fe46d471cc37628097b8c367 Mon Sep 17 00:00:00 2001
From: unknown <malff/marcsql@weblab.(none)>
Date: Fri, 27 Jul 2007 12:30:02 -0600
Subject: [PATCH 089/139] manual merge

---
 sql/table.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/table.cc b/sql/table.cc
index fef63170ea6..b3d49830149 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -19,7 +19,7 @@
 #include "mysql_priv.h"
 #include "sql_trigger.h"
 #include <m_ctype.h>
-#include "md5.h"
+#include "my_md5.h"
 
 /* INFORMATION_SCHEMA name */
 LEX_STRING INFORMATION_SCHEMA_NAME= {C_STRING_WITH_LEN("information_schema")};

From 2302a30254d0aa3289d57fcc3b2c7f1fd196e2b3 Mon Sep 17 00:00:00 2001
From: unknown <iggy@alf.(none)>
Date: Fri, 27 Jul 2007 17:41:34 -0400
Subject: [PATCH 090/139] Bug#30103 CMake build solution does not remove
 auto-generated resources - Add CMake rule to remove files. - Manual merge.

sql/CMakeLists.txt:
  Bug#30103 CMake build solution does not remove auto-generated resources
  - Add CMake rule to remove files.
---
 sql/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index a8aa7d70586..c792e10c3af 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -143,6 +143,10 @@ ADD_CUSTOM_COMMAND(
 )
 ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} gen_lex_hash)
 
+# Remove the auto-generated files as part of 'Clean Solution'
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES 
+                         "lex_hash.h;message.rc;message.h;sql_yacc.h;sql_yacc.cc")
+
 ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
 ADD_DEPENDENCIES(udf_example strings)
 TARGET_LINK_LIBRARIES(udf_example wsock32)

From 17f98499e86055efaf643d815f8adce08c3800af Mon Sep 17 00:00:00 2001
From: unknown <tsmith@ramayana.hindu.god>
Date: Fri, 27 Jul 2007 17:20:43 -0600
Subject: [PATCH 091/139] Bug #29992: syslog error logging does not flush

Don't use syslog by default; user will have to request it explicitly with the --syslog option.

Use "sed -u" to get unbuffered output from sed, if it's supported.

Otherwise, don't use sed at all - don't strip the timestamp from mysqld messages.

Also, add new --syslog-tag=FOO option, which adds "-FOO" to the tag used when logging messages to syslog (i.e., mysqld-FOO or mysqld_safe-FOO)

Also, explicitly mention where log messages are going, so user can more easily find them.

Also, check if 'logger' is in the PATH, and log to the error log file if it can't be found.
---
 scripts/mysqld_safe.sh | 116 ++++++++++++++++++++++++++++++++---------
 1 file changed, 91 insertions(+), 25 deletions(-)

diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 597bf38a518..2a592a6fbf5 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -14,12 +14,17 @@
 KILL_MYSQLD=1;
 MYSQLD=
 niceness=0
-# Default on, unless --log-error is specified (and before options are parsed)
-syslog=2
+# Initial logging status: error log is not open, and not using syslog
+logging=init
+want_syslog=0
+syslog_tag=
 user=@MYSQLD_USER@
 pid_file=
 err_log=
 
+syslog_tag_mysqld=mysqld
+syslog_tag_mysqld_safe=mysqld_safe
+
 trap '' 1 2 3 15			# we shouldn't let anyone kill us
 
 umask 007
@@ -46,7 +51,8 @@ Usage: $0 [OPTIONS]
   --nice=NICE                Set the scheduling priority of mysqld
   --skip-kill-mysqld         Don't try to kill stray mysqld processes
   --syslog                   Log messages to syslog with 'logger'
-  --skip-syslog              Log messages to error log
+  --skip-syslog              Log messages to error log (default)
+  --syslog-tag=TAG           Pass -t "mysqld-TAG" to 'logger'
 
 All other options are passed to the mysqld program.
 
@@ -54,18 +60,46 @@ EOF
         exit 1
 }
 
+my_which ()
+{
+  save_ifs="${IFS-UNSET}"
+  IFS=:
+  for file
+  do
+    for dir in $PATH
+    do
+      if [ -f "$dir/$file" ]
+      then
+        echo "$dir/$file"
+        continue 2
+      fi
+    done
+    return 1  # Failure, didn't find file in path
+  done
+  if [ "$save_ifs" = UNSET ]
+  then
+    unset IFS
+  else
+    IFS="$save_ifs"
+  fi
+  return 0  # Success
+}
+
 log_generic () {
   priority="$1"
   shift
 
   msg="`date +'%y%m%d %H:%M:%S'` mysqld_safe $*"
   echo "$msg"
-  if [ $syslog -eq 0 ]
-  then
-    echo "$msg" >> "$err_log"
-  else
-    logger -i -t mysqld_safe -p "$priority" "$*"
-  fi
+  case $logging in
+    init) ;;  # Just echo the message, don't save it anywhere
+    file) echo "$msg" >> "$err_log" ;;
+    syslog) logger -t "$syslog_tag_mysqld_safe" -p "$priority" "$*" ;;
+    *)
+      echo "Internal program error (non-fatal):" \
+           " unknown logging method '$logging'" >&2
+      ;;
+  esac
 }
 
 log_error () {
@@ -78,15 +112,23 @@ log_notice () {
 
 eval_log_error () {
   cmd="$1"
-  if [ $syslog -eq 0 ]
-  then
-    cmd="$cmd >> "`shell_quote_string "$err_log"`" 2>&1"
-  else
-    # mysqld often (not always) prefixes messages on stdout with a
-    # timestamp in the form of '%y%m%d %H:%M:%S '; this is redundant
-    # when logging via syslog, so strip it
-    cmd="$cmd 2>&1 | sed -e 's/^[0-9]\{6\} [0-9:]\{8\}  *//' | logger -i -t mysqld -p daemon.error"
-  fi
+  case $logging in
+    file) cmd="$cmd >> "`shell_quote_string "$err_log"`" 2>&1" ;;
+    syslog)
+      # mysqld often prefixes its messages with a timestamp, which is
+      # redundant when logging to syslog (which adds its own timestamp)
+      # However, we don't strip the timestamp with sed here, because
+      # sed buffers output (only GNU sed supports a -u (unbuffered) option)
+      # which means that messages may not get sent to syslog until the
+      # mysqld process quits.
+      cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error"
+      ;;
+    *)
+      echo "Internal program error (non-fatal):" \
+           " unknown logging method '$logging'" >&2
+      ;;
+  esac
+
   #echo "Running mysqld: [$cmd]"
   eval "$cmd"
 }
@@ -138,8 +180,9 @@ parse_arguments() {
       --nice=*) niceness="$val" ;;
       --open-files-limit=*) open_files="$val" ;;
       --skip-kill-mysqld*) KILL_MYSQLD=0 ;;
-      --syslog) syslog=1 ;;
-      --skip-syslog) syslog=0 ;;
+      --syslog) want_syslog=1 ;;
+      --skip-syslog) want_syslog=0 ;;
+      --syslog-tag=*) syslog_tag="$val" ;;
       --timezone=*) TZ="$val"; export TZ; ;;
 
       --help) usage ;;
@@ -252,7 +295,19 @@ parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysq
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
 # Determine what logging facility to use
-if [ -n "$err_log" -o $syslog -eq 0 ]
+
+# Ensure that 'logger' exists, if it's requested
+if [ $want_syslog -eq 1 ]
+then
+  my_which logger > /dev/null 2>&1
+  if [ $? -ne 0 ]
+  then
+    log_error "--syslog requested, but no 'logger' program found."
+    want_syslog=0
+  fi
+fi
+
+if [ -n "$err_log" -o $want_syslog -eq 0 ]
 then
   if [ -n "$err_log" ]
   then
@@ -279,14 +334,25 @@ then
 
   append_arg_to_args "--log-error=$err_log"
 
-  if [ $syslog -eq 1 ]
+  if [ $want_syslog -eq 1 ]
   then
     # User explicitly asked for syslog, so warn that it isn't used
-    log_error "Can't log to error log and syslog at the same time.  Remove all --log-error configuration options for --syslog to take effect.  Logging to '$err_log'."
+    log_error "Can't log to error log and syslog at the same time.  Remove all --log-error configuration options for --syslog to take effect."
   fi
 
-  # Don't use syslog since syslog and error log don't mix well
-  syslog=0
+  # Log to err_log file
+  log_notice "Logging to '$err_log'."
+  logging=file
+else
+  if [ -n "$syslog_tag" ]
+  then
+    # Sanitize the syslog tag
+    syslog_tag=`echo "$syslog_tag" | sed -e 's/[^a-zA-Z0-9_-]/_/g'`
+    syslog_tag_mysqld_safe="${syslog_tag_mysqld_safe}-$syslog_tag"
+    syslog_tag_mysqld="${syslog_tag_mysqld}-$syslog_tag"
+  fi
+  log_notice "Logging to syslog."
+  logging=syslog
 fi
 
 USER_OPTION=""

From 9c79db318c689e97186170207f315b8accb296d9 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Sat, 28 Jul 2007 08:42:43 +0300
Subject: [PATCH 092/139] show_check.result:   Addendum to thr fix for bug
 30000:   show procedure/function code defined only in debug builds
 show_check.test:   Addendum to thr fix for bug 30000:   show
 procedure/function code defined only in debug builds

mysql-test/t/show_check.test:
  Addendum to thr fix for bug 30000:
  show procedure/function code defined only in debug builds
mysql-test/r/show_check.result:
  Addendum to thr fix for bug 30000:
  show procedure/function code defined only in debug builds
---
 mysql-test/r/show_check.result | 2 --
 mysql-test/t/show_check.test   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index f84d4f3882c..f4b5f2689f6 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -846,8 +846,6 @@ show create procedure p1;
 show create function f1;
 show create trigger tr1;
 show procedure status;
-show procedure code p1;
-show function code f1;
 show create event e1;
 show status like 'slow_queries';
 Variable_name	Value
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 89eac15ccfc..5856803d390 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -601,8 +601,6 @@ show create procedure p1;
 show create function f1;
 show create trigger tr1;
 show procedure status;
-show procedure code p1;
-show function code f1;
 show create event e1;
 --enable_result_log
 

From 5fb351ae072416d2ffa0209277cf9bafe10cd9e7 Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Sat, 28 Jul 2007 14:10:56 +0500
Subject: [PATCH 093/139] rpl_session_var.test fixed to not depend on
 mysql_test_run parameters

mysql-test/suite/rpl/r/rpl_session_var.result:
  result fixed
mysql-test/suite/rpl/t/rpl_session_var.test:
  test fixed
---
 mysql-test/suite/rpl/r/rpl_session_var.result | 6 +++---
 mysql-test/suite/rpl/t/rpl_session_var.test   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/suite/rpl/r/rpl_session_var.result b/mysql-test/suite/rpl/r/rpl_session_var.result
index 787899932d6..297a18a5931 100644
--- a/mysql-test/suite/rpl/r/rpl_session_var.result
+++ b/mysql-test/suite/rpl/r/rpl_session_var.result
@@ -47,7 +47,7 @@ CREATE TABLE t1 (
 PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM;
 INSERT INTO t1(data) VALUES(SESSION_USER());
-SELECT * FROM t1;
-id	data
-1	
+SELECT length(data) < 100 FROM t1;
+length(data) < 100
+1
 drop table t1;
diff --git a/mysql-test/suite/rpl/t/rpl_session_var.test b/mysql-test/suite/rpl/t/rpl_session_var.test
index 8231a0dbefd..2491611e23d 100644
--- a/mysql-test/suite/rpl/t/rpl_session_var.test
+++ b/mysql-test/suite/rpl/t/rpl_session_var.test
@@ -56,7 +56,7 @@ INSERT INTO t1(data) VALUES(SESSION_USER());
 save_master_pos;
 connection slave;
 sync_with_master;
-SELECT * FROM t1;
+SELECT length(data) < 100 FROM t1;
 connection master;
 drop table t1;
 save_master_pos;

From 40d596c200bd03b5fb01ba5b9af5912d65cc586d Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Sat, 28 Jul 2007 15:01:29 +0400
Subject: [PATCH 094/139] Bug#29856: Insufficient buffer space led to a server
 crash.

The subst_spvars function is used to create query string with SP variables
substituted with their values. This string is used later for the binary log
and for the query cache. The problem is that the
query_cache_send_result_to_client function requires some additional space
after the query to store database name and query cache flags. This
space wasn't reserved by the subst_spvars function which led to a memory
corruption and crash.

Now the subst_spvars function reserves additional space for the query cache.


mysql-test/t/query_cache.test:
  Added a test case for the bug#29856: Insufficient buffer space led to a server crash.
mysql-test/r/query_cache.result:
  Added a test case for the bug#29856: Insufficient buffer space led to a server crash.
sql/sp_head.cc:
  Bug#29856: Insufficient buffer space led to a server crash.
  Now the subst_spvars function reserves additional space for the query cache.
---
 mysql-test/r/query_cache.result | 119 ++++++++++++++++++++++++
 mysql-test/t/query_cache.test   | 124 +++++++++++++++++++++++++
 sql/sp_head.cc                  | 156 +++++++++++++++++---------------
 3 files changed, 327 insertions(+), 72 deletions(-)

diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index b0f3fb77c0e..327d9531bc6 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -1467,3 +1467,122 @@ insert into t1 values ('c');
 a
 drop table t1;
 set GLOBAL query_cache_size= default;
+SET GLOBAL query_cache_size=64*1024*1024;
+CREATE TABLE t1 (id INT);
+CREATE PROCEDURE proc29856(IN theUPC TEXT)
+BEGIN
+SET @stmtStr := '';
+SELECT CONCAT("SELECT id FROM t1 WHERE id IN (",theUPC,")") INTO @stmtStr;
+PREPARE stmt FROM @stmtStr;
+EXECUTE stmt;
+END |
+CALL proc29856('1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,
+25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,
+51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,
+77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,
+102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,
+121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,
+140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,
+159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,
+178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,
+197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,
+216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,
+235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,
+254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,
+273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,
+292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,
+311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,
+330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,
+349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,
+368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,
+387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,
+406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,
+425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,
+444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,
+463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,
+482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,
+501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,
+520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,
+539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,
+558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,
+577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,
+596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,
+615,616,617,618,619,620,621,622,623,624,625,626,627,628,629,630,631,632,633,
+634,635,636,637,638,639,640,641,642,643,644,645,646,647,648,649,650,651,652,
+653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,
+672,673,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,
+691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,
+710,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,
+729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,
+748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,764,765,766,
+767,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,
+786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,
+805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,
+824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,
+843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,
+862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,880,
+881,882,883,884,885,886,887,888,889,890,891,892,893,894,895,896,897,898,899,
+900,901,902,903,904,905,906,907,908,909,910,911,912,913,914,915,916,917,918,
+919,920,921,922,923,924,925,926,927,928,929,930,931,932,933,934,935,936,937,
+938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,
+957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,
+976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,
+995,996,997,998,999,1000,1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,
+1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,
+1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,
+1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,
+1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,
+1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,
+1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,
+1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,
+1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,
+1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,
+1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,1160,
+1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,
+1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,
+1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,
+1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1216,1217,1218,1219,1220,
+1221,1222,1223,1224,1225,1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,
+1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,
+1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,
+1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,
+1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,
+1296,1297,1298,1299,1300,1301,1302,1303,1304,1305,1306,1307,1308,1309,1310,
+1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,
+1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,
+1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,
+1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,
+1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,
+1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,
+1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,
+1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,
+1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,
+1446,1447,1448,1449,1450,1451,1452,1453,1454,1455,1456,1457,1458,1459,1460,
+1461,1462,1463,1464,1465,1466,1467,1468,1469,1470,1471,1472,1473,1474,1475,
+1476,1477,1478,1479,1480,1481,1482,1483,1484,1485,1486,1487,1488,1489,1490,
+1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,
+1506,1507,1508,1509,1510,1511,1512,1513,1514,1515,1516,1517,1518,1519,1520,
+1521,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,
+1536,1537,1538,1539,1540,1541,1542,1543,1544,1545,1546,1547,1548,1549,1550,
+1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,
+1566,1567,1568,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,
+1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595,
+1596,1597,1598,1599,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,
+1611,1612,1613,1614,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,
+1626,1627,1628,1629,1630,1631,1632,1633,1634,1635,1636,1637,1638,1639,1640,
+1641,1642,1643,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,
+1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,
+1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1682,1683,1684,1685,
+1686,1687,1688,1689,1690,1691,1692,1693,1694,1695,1696,1697,1698,1699,1700,
+1701,1702,1703,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,
+1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1729,1730,
+1731,1732,1733,1734,1735,1736,1737,1738,1739,1740,1741,1742,1743,1744,1745,
+1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,
+1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,
+1776,1777,1778,1779,1780,1781,1782,1783,1784,1785,1786,1787,1788,1789,1790,
+1791,1792,1793,1794,1795,1796,1797,1798,1799,1800,1801,1802,1803,1804,1805,
+1806,1807,1808,1809,1810,1811');
+id
+DROP PROCEDURE proc29856;
+DROP TABLE t1;
+SET GLOBAL query_cache_size= default;
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index 965ebf5df62..2f4896513f5 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -1028,4 +1028,128 @@ drop table t1;
 
 set GLOBAL query_cache_size= default;
 
+#
+# Bug#29856: Insufficient buffer space led to a server crash.
+#
+SET GLOBAL query_cache_size=64*1024*1024;
+CREATE TABLE t1 (id INT);
+DELIMITER |;
+CREATE PROCEDURE proc29856(IN theUPC TEXT)
+BEGIN
+  SET @stmtStr := '';
+  SELECT CONCAT("SELECT id FROM t1 WHERE id IN (",theUPC,")") INTO @stmtStr;
+  PREPARE stmt FROM @stmtStr;
+  EXECUTE stmt;
+END |
+DELIMITER ;|
+CALL proc29856('1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,
+25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,
+51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,
+77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,
+102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,
+121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,
+140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,
+159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,
+178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,
+197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,
+216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,
+235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,
+254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,
+273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,
+292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,
+311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,
+330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,
+349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,
+368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,
+387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,
+406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,
+425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,
+444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,
+463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,
+482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,
+501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,
+520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,
+539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,
+558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,
+577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,
+596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,
+615,616,617,618,619,620,621,622,623,624,625,626,627,628,629,630,631,632,633,
+634,635,636,637,638,639,640,641,642,643,644,645,646,647,648,649,650,651,652,
+653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,
+672,673,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,
+691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,
+710,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,
+729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,
+748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,764,765,766,
+767,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,
+786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,
+805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,
+824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,
+843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,
+862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,880,
+881,882,883,884,885,886,887,888,889,890,891,892,893,894,895,896,897,898,899,
+900,901,902,903,904,905,906,907,908,909,910,911,912,913,914,915,916,917,918,
+919,920,921,922,923,924,925,926,927,928,929,930,931,932,933,934,935,936,937,
+938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,
+957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,
+976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,
+995,996,997,998,999,1000,1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,
+1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,
+1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,
+1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,
+1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,
+1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,
+1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,
+1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,
+1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,
+1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,
+1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,1160,
+1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,
+1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,
+1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,
+1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1216,1217,1218,1219,1220,
+1221,1222,1223,1224,1225,1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,
+1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,
+1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,
+1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,
+1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,
+1296,1297,1298,1299,1300,1301,1302,1303,1304,1305,1306,1307,1308,1309,1310,
+1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,
+1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,
+1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,
+1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,
+1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,
+1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,
+1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,
+1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,
+1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,
+1446,1447,1448,1449,1450,1451,1452,1453,1454,1455,1456,1457,1458,1459,1460,
+1461,1462,1463,1464,1465,1466,1467,1468,1469,1470,1471,1472,1473,1474,1475,
+1476,1477,1478,1479,1480,1481,1482,1483,1484,1485,1486,1487,1488,1489,1490,
+1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,
+1506,1507,1508,1509,1510,1511,1512,1513,1514,1515,1516,1517,1518,1519,1520,
+1521,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,
+1536,1537,1538,1539,1540,1541,1542,1543,1544,1545,1546,1547,1548,1549,1550,
+1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,
+1566,1567,1568,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,
+1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595,
+1596,1597,1598,1599,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,
+1611,1612,1613,1614,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,
+1626,1627,1628,1629,1630,1631,1632,1633,1634,1635,1636,1637,1638,1639,1640,
+1641,1642,1643,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,
+1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,
+1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1682,1683,1684,1685,
+1686,1687,1688,1689,1690,1691,1692,1693,1694,1695,1696,1697,1698,1699,1700,
+1701,1702,1703,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,
+1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1729,1730,
+1731,1732,1733,1734,1735,1736,1737,1738,1739,1740,1741,1742,1743,1744,1745,
+1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,
+1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,
+1776,1777,1778,1779,1780,1781,1782,1783,1784,1785,1786,1787,1788,1789,1790,
+1791,1792,1793,1794,1795,1796,1797,1798,1799,1800,1801,1802,1803,1804,1805,
+1806,1807,1808,1809,1810,1811');
+DROP PROCEDURE proc29856;
+DROP TABLE t1;
+SET GLOBAL query_cache_size= default;
+
 # End of 5.0 tests
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index d939fd20b9b..94d3a967b8c 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -767,7 +767,8 @@ int cmp_splocal_locations(Item_splocal * const *a, Item_splocal * const *b)
 
 
 /*
-  Replace thd->query{_length} with a string that one can write to the binlog.
+  Replace thd->query{_length} with a string that one can write to the binlog
+  or the query cache.
  
   SYNOPSIS
     subst_spvars()
@@ -779,7 +780,9 @@ int cmp_splocal_locations(Item_splocal * const *a, Item_splocal * const *b)
   DESCRIPTION
 
   The binlog-suitable string is produced by replacing references to SP local 
-  variables with NAME_CONST('sp_var_name', value) calls.
+  variables with NAME_CONST('sp_var_name', value) calls. To make this string
+  suitable for the query cache this function allocates some additional space
+  for the query cache flags.
  
   RETURN
     FALSE  on success
@@ -792,80 +795,89 @@ static bool
 subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str)
 {
   DBUG_ENTER("subst_spvars");
-  if (thd->prelocked_mode == NON_PRELOCKED && mysql_bin_log.is_open())
+
+  Dynamic_array<Item_splocal*> sp_vars_uses;
+  char *pbuf, *cur, buffer[512];
+  String qbuf(buffer, sizeof(buffer), &my_charset_bin);
+  int prev_pos, res, buf_len;
+
+  /* Find all instances of Item_splocal used in this statement */
+  for (Item *item= instr->free_list; item; item= item->next)
   {
-    Dynamic_array<Item_splocal*> sp_vars_uses;
-    char *pbuf, *cur, buffer[512];
-    String qbuf(buffer, sizeof(buffer), &my_charset_bin);
-    int prev_pos, res;
-
-    /* Find all instances of Item_splocal used in this statement */
-    for (Item *item= instr->free_list; item; item= item->next)
+    if (item->is_splocal())
     {
-      if (item->is_splocal())
-      {
-        Item_splocal *item_spl= (Item_splocal*)item;
-        if (item_spl->pos_in_query)
-          sp_vars_uses.append(item_spl);
-      }
+      Item_splocal *item_spl= (Item_splocal*)item;
+      if (item_spl->pos_in_query)
+        sp_vars_uses.append(item_spl);
     }
-    if (!sp_vars_uses.elements())
-      DBUG_RETURN(FALSE);
-      
-    /* Sort SP var refs by their occurences in the query */
-    sp_vars_uses.sort(cmp_splocal_locations);
-
-    /* 
-      Construct a statement string where SP local var refs are replaced
-      with "NAME_CONST(name, value)"
-    */
-    qbuf.length(0);
-    cur= query_str->str;
-    prev_pos= res= 0;
-    for (Item_splocal **splocal= sp_vars_uses.front(); 
-         splocal < sp_vars_uses.back(); splocal++)
-    {
-      Item *val;
-
-      char str_buffer[STRING_BUFFER_USUAL_SIZE];
-      String str_value_holder(str_buffer, sizeof(str_buffer),
-                              &my_charset_latin1);
-      String *str_value;
-      
-      /* append the text between sp ref occurences */
-      res|= qbuf.append(cur + prev_pos, (*splocal)->pos_in_query - prev_pos);
-      prev_pos= (*splocal)->pos_in_query + (*splocal)->m_name.length;
-      
-      /* append the spvar substitute */
-      res|= qbuf.append(STRING_WITH_LEN(" NAME_CONST('"));
-      res|= qbuf.append((*splocal)->m_name.str, (*splocal)->m_name.length);
-      res|= qbuf.append(STRING_WITH_LEN("',"));
-      res|= (*splocal)->fix_fields(thd, (Item **) splocal);
-
-      if (res)
-        break;
-
-      val= (*splocal)->this_item();
-      DBUG_PRINT("info", ("print %p", val));
-      str_value= sp_get_item_value(thd, val, &str_value_holder);
-      if (str_value)
-        res|= qbuf.append(*str_value);
-      else
-        res|= qbuf.append(STRING_WITH_LEN("NULL"));
-      res|= qbuf.append(')');
-      if (res)
-        break;
-    }
-    res|= qbuf.append(cur + prev_pos, query_str->length - prev_pos);
-    if (res)
-      DBUG_RETURN(TRUE);
-
-    if (!(pbuf= thd->strmake(qbuf.ptr(), qbuf.length())))
-      DBUG_RETURN(TRUE);
-
-    thd->query= pbuf;
-    thd->query_length= qbuf.length();
   }
+  if (!sp_vars_uses.elements())
+    DBUG_RETURN(FALSE);
+    
+  /* Sort SP var refs by their occurences in the query */
+  sp_vars_uses.sort(cmp_splocal_locations);
+
+  /* 
+    Construct a statement string where SP local var refs are replaced
+    with "NAME_CONST(name, value)"
+  */
+  qbuf.length(0);
+  cur= query_str->str;
+  prev_pos= res= 0;
+  for (Item_splocal **splocal= sp_vars_uses.front(); 
+       splocal < sp_vars_uses.back(); splocal++)
+  {
+    Item *val;
+
+    char str_buffer[STRING_BUFFER_USUAL_SIZE];
+    String str_value_holder(str_buffer, sizeof(str_buffer),
+                            &my_charset_latin1);
+    String *str_value;
+    
+    /* append the text between sp ref occurences */
+    res|= qbuf.append(cur + prev_pos, (*splocal)->pos_in_query - prev_pos);
+    prev_pos= (*splocal)->pos_in_query + (*splocal)->m_name.length;
+    
+    /* append the spvar substitute */
+    res|= qbuf.append(STRING_WITH_LEN(" NAME_CONST('"));
+    res|= qbuf.append((*splocal)->m_name.str, (*splocal)->m_name.length);
+    res|= qbuf.append(STRING_WITH_LEN("',"));
+    res|= (*splocal)->fix_fields(thd, (Item **) splocal);
+
+    if (res)
+      break;
+
+    val= (*splocal)->this_item();
+    DBUG_PRINT("info", ("print %p", val));
+    str_value= sp_get_item_value(thd, val, &str_value_holder);
+    if (str_value)
+      res|= qbuf.append(*str_value);
+    else
+      res|= qbuf.append(STRING_WITH_LEN("NULL"));
+    res|= qbuf.append(')');
+    if (res)
+      break;
+  }
+  res|= qbuf.append(cur + prev_pos, query_str->length - prev_pos);
+  if (res)
+    DBUG_RETURN(TRUE);
+
+  /*
+    Allocate additional space at the end of the new query string for the
+    query_cache_send_result_to_client function.
+  */
+  buf_len= qbuf.length() + thd->db_length + 1 + QUERY_CACHE_FLAGS_SIZE + 1;
+  if ((pbuf= alloc_root(thd->mem_root, buf_len)))
+  {
+    memcpy(pbuf, qbuf.ptr(), qbuf.length());
+    pbuf[qbuf.length()]= 0;
+  }
+  else
+    DBUG_RETURN(TRUE);
+
+  thd->query= pbuf;
+  thd->query_length= qbuf.length();
+
   DBUG_RETURN(FALSE);
 }
 

From aa4a3c9ad0a1d1c7e1ac036c7ac160a80a051219 Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Sat, 28 Jul 2007 16:02:29 +0400
Subject: [PATCH 095/139] Bug#30020: Insufficient check led to a wrong info
 provided by the information schema table.

The get_schema_views_record() function fills records in the view table of
the informations schema with data about given views. Among other info
the is_updatable flag is set. But the check whether the view is updatable or
not wasn't covering all cases thus sometimes providing wrong info.
This might led to a user confusion.

Now the get_schema_views_record function additionally calls to the
view->can_be_merge() function to find out whether the view can be updated or
not.


mysql-test/t/view.test:
  Added a test case for the bug#30020: Insufficient check led to a wrong info
  provided by the information schema table.
mysql-test/r/view.result:
  Added a test case for the bug#30020: Insufficient check led to a wrong info
  provided by the information schema table.
sql/sql_show.cc:
  Bug#30020: Insufficient check led to a wrong info provided by the
  information schema table.
  Now the get_schema_views_record function additionally calls to the
  view->can_be_merge() function to find out whether the view can be updated or
  not.
---
 mysql-test/r/view.result | 15 +++++++++++++++
 mysql-test/t/view.test   | 13 +++++++++++++
 sql/sql_show.cc          |  4 +++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index c51a4c30960..c5c6b675146 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -3547,4 +3547,19 @@ a	b
 6	6
 DROP VIEW v1;
 DROP TABLE t1,t2,t3;
+create table t1 (i int);
+insert into t1 values (1), (2), (1), (3), (2), (4);
+create view v1 as select distinct i from t1;
+select * from v1;
+i
+1
+2
+3
+4
+select table_name, is_updatable from information_schema.views 
+where table_name = 'v1';
+table_name	is_updatable
+v1	NO
+drop view v1;
+drop table t1;
 End of 5.0 tests.
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index c7f722a18a5..fc3fdc932ba 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -3402,5 +3402,18 @@ SELECT t.person_id AS a, t.person_id AS b FROM v1 t WHERE t.person_id=6;
 DROP VIEW v1;
 DROP TABLE t1,t2,t3;
 
+#
+# Bug#30020: Insufficient check led to a wrong info provided by the
+#            information schema table.
+#
+create table t1 (i int);
+insert into t1 values (1), (2), (1), (3), (2), (4);
+create view v1 as select distinct i from t1;
+select * from v1;
+select table_name, is_updatable from information_schema.views 
+   where table_name = 'v1';
+drop view v1;
+drop table t1;
+
 --echo End of 5.0 tests.
 
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index b91412390bc..05a847b3830 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -3211,7 +3211,7 @@ static int get_schema_views_record(THD *thd, TABLE_LIST *tables,
       Item *item;
       Item_field *field;
       /*
-        chech that at least one coulmn in view is updatable
+        check that at least one column in view is updatable
       */
       while ((item= it++))
       {
@@ -3222,6 +3222,8 @@ static int get_schema_views_record(THD *thd, TABLE_LIST *tables,
           break;
         }
       }
+      if (updatable_view && !tables->view->can_be_merged())
+        updatable_view= 0;
     }
     if (updatable_view)
       table->field[5]->store(STRING_WITH_LEN("YES"), cs);

From 90c5621d6c22ce86354ffe8ccd244007a5e4d846 Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Sat, 28 Jul 2007 23:10:38 +0500
Subject: [PATCH 096/139] Fixed bug #29834. Using view columns by their names
 during an execution of a prepared SELECT statement or a SELECT statement
 inside a SP caused a memory leak.

sql/sql_base.cc:
  Fixed bug #29834.
  The find_field_in_view function has been modified to
  use the execution memory root for the Item_direct_view_ref
  objects allocation at non-first executions of
  a PS/SP instead of the statement memory.
mysql-test/t/sp.test:
  Updated test case for bug #29834.
mysql-test/r/sp.result:
  Updated test case for bug #29834.
---
 mysql-test/r/sp.result | 71 ++++++++++++++++++++++++++++++++++++++++
 mysql-test/t/sp.test   | 74 ++++++++++++++++++++++++++++++++++++++++++
 sql/sql_base.cc        |  6 ++--
 3 files changed, 148 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index b411c65faee..313fdca7f82 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -1,5 +1,9 @@
 use test;
 drop table if exists t1,t2,t3,t4;
+drop view if exists v1;
+drop procedure if exists p1;
+drop procedure if exists p2;
+drop function if exists f1;
 create table t1 (
 id   char(16) not null default '',
 data int not null
@@ -6176,4 +6180,71 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 DROP VIEW v1;
 DROP FUNCTION metered;
 DROP TABLE t1;
+SET @p1_p2_cnt= 2;
+CREATE TABLE t1 (c1 INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+PREPARE s1 FROM 'SELECT c1 FROM v1';
+EXECUTE s1;
+c1
+EXECUTE s1;
+c1
+CREATE PROCEDURE p1(IN loops BIGINT(19) UNSIGNED)
+BEGIN
+WHILE loops > 0 DO
+SELECT c1 FROM v1;
+SET loops = loops - 1;
+END WHILE;
+END|
+CREATE PROCEDURE p2(IN loops BIGINT(19) UNSIGNED)
+BEGIN
+WHILE loops > 0 DO
+SELECT c1 FROM v1;
+CALL p1(@p1_p2_cnt);
+SET loops = loops - 1;
+END WHILE;
+END|
+CREATE FUNCTION f1(loops INT UNSIGNED)
+RETURNS INT
+BEGIN
+DECLARE tmp INT;
+WHILE loops > 0 DO
+SELECT c1 INTO tmp FROM v1;
+SET loops = loops - 1;
+END WHILE;
+RETURN loops;
+END|
+CALL p1(2);
+c1
+c1
+CALL p2(2);
+c1
+c1
+c1
+c1
+c1
+c1
+SELECT f1(2);
+f1(2)
+0
+Warnings:
+Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data - zero rows fetched, selected, or processed
+PREPARE s1 FROM 'SELECT f1(2)';
+EXECUTE s1;
+f1(2)
+0
+Warnings:
+Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data - zero rows fetched, selected, or processed
+EXECUTE s1;
+f1(2)
+0
+Warnings:
+Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data - zero rows fetched, selected, or processed
+DROP PROCEDURE p1;
+DROP PROCEDURE p2;
+DROP FUNCTION f1;
+DROP VIEW v1;
+DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 2f82482bdf7..088ce9b72ff 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -23,6 +23,10 @@ use test;
 #
 --disable_warnings
 drop table if exists t1,t2,t3,t4;
+drop view if exists v1;
+drop procedure if exists p1;
+drop procedure if exists p2;
+drop function if exists f1;
 --enable_warnings
 create table t1 (
 	id   char(16) not null default '',
@@ -7134,5 +7138,75 @@ DROP VIEW v1;
 DROP FUNCTION metered;
 DROP TABLE t1;
 
+#
+# Bug#29834: Accessing a view column by name in SP/PS causes a memory leak.
+#
+# This is leak test. Run with large number assigned to $execute_cnt,
+# $p1_cnt, $p2_cnt, @p1_p2_cnt, $f1_normal_cnt or $f1_prep_cnt variables.
+#
+
+let $execute_cnt= 2;
+let $p1_cnt= 2;
+let $p2_cnt= 2;
+SET @p1_p2_cnt= 2;
+let $f1_normal_cnt= 2;
+let $f1_prep_cnt= 2;
+
+CREATE TABLE t1 (c1 INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+
+PREPARE s1 FROM 'SELECT c1 FROM v1';
+while ($execute_cnt)
+{
+  EXECUTE s1;
+  dec $execute_cnt;
+}
+
+DELIMITER |;
+
+CREATE PROCEDURE p1(IN loops BIGINT(19) UNSIGNED)
+BEGIN
+  WHILE loops > 0 DO
+    SELECT c1 FROM v1;
+    SET loops = loops - 1;
+  END WHILE;
+END|
+
+CREATE PROCEDURE p2(IN loops BIGINT(19) UNSIGNED)
+BEGIN
+  WHILE loops > 0 DO
+    SELECT c1 FROM v1;
+    CALL p1(@p1_p2_cnt);
+    SET loops = loops - 1;
+  END WHILE;
+END|
+
+CREATE FUNCTION f1(loops INT UNSIGNED)
+  RETURNS INT
+BEGIN
+  DECLARE tmp INT;
+  WHILE loops > 0 DO
+    SELECT c1 INTO tmp FROM v1;
+    SET loops = loops - 1;
+  END WHILE;
+  RETURN loops;
+END|
+
+DELIMITER ;|
+
+eval CALL p1($p1_cnt);
+eval CALL p2($p2_cnt);
+
+eval SELECT f1($f1_normal_cnt);
+
+eval PREPARE s1 FROM 'SELECT f1($f1_prep_cnt)';
+EXECUTE s1;
+EXECUTE s1;
+
+DROP PROCEDURE p1;
+DROP PROCEDURE p2;
+DROP FUNCTION f1;
+DROP VIEW v1;
+DROP TABLE t1;
 
 --echo End of 5.0 tests
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index ed006714143..deb46f0d932 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -3435,7 +3435,7 @@ find_field_in_view(THD *thd, TABLE_LIST *table_list,
               table_list->alias, name, item_name, (ulong) ref));
   Field_iterator_view field_it;
   field_it.set(table_list);
-  Query_arena *arena, backup;  
+  Query_arena *arena= 0, backup;  
   
   DBUG_ASSERT(table_list->schema_table_reformed ||
               (ref != 0 && table_list->view != 0));
@@ -3444,14 +3444,14 @@ find_field_in_view(THD *thd, TABLE_LIST *table_list,
     if (!my_strcasecmp(system_charset_info, field_it.name(), name))
     {
       // in PS use own arena or data will be freed after prepare
-      if (register_tree_change)
+      if (register_tree_change && thd->stmt_arena->is_stmt_prepare_or_first_sp_execute())
         arena= thd->activate_stmt_arena_if_needed(&backup);
       /*
         create_item() may, or may not create a new Item, depending on
         the column reference. See create_view_field() for details.
       */
       Item *item= field_it.create_item(thd);
-      if (register_tree_change && arena)
+      if (arena)
         thd->restore_active_arena(arena, &backup);
       
       if (!item)

From eac42d5ac0bb9b9f082c3008da9f55213c581845 Mon Sep 17 00:00:00 2001
From: unknown <thek@adventure.(none)>
Date: Sun, 29 Jul 2007 14:01:16 +0200
Subject: [PATCH 097/139] Cleanup patch - Removed unused variable.

sql/sql_lex.cc:
  - Removed unused variable
---
 sql/sql_lex.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 9194b133df4..e7fa3317cd2 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -2391,8 +2391,6 @@ void st_select_lex_unit::set_limit(SELECT_LEX *sl)
 
 void st_lex::set_trg_event_type_for_tables()
 {
-  enum trg_event_type trg_event;
-
   uint8 new_trg_event_map= 0;
 
   /*

From 151e6aba09c20314c13a410b3c90cb79c1701fce Mon Sep 17 00:00:00 2001
From: unknown <thek@adventure.(none)>
Date: Sun, 29 Jul 2007 14:05:03 +0200
Subject: [PATCH 098/139] Clean up patch - Removed unused variable.

sql/sql_lex.cc:
  - Removed unused variable
---
 sql/sql_lex.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 106dcf88a84..a62d8b383a5 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -2059,8 +2059,6 @@ void st_select_lex_unit::set_limit(SELECT_LEX *sl)
 
 void st_lex::set_trg_event_type_for_tables()
 {
-  enum trg_event_type trg_event;
-
   uint8 new_trg_event_map= 0;
 
   /*

From 11816452bc097c3e5273137a1d012a321e12a9c1 Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Sun, 29 Jul 2007 21:12:54 +0500
Subject: [PATCH 099/139] sp_head.cc:   Post-merge fix.

sql/sp_head.cc:
  Post-merge fix.
---
 sql/sp_head.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index d08d1dd3930..74714a42591 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -958,7 +958,7 @@ subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str)
     query_cache_send_result_to_client function.
   */
   buf_len= qbuf.length() + thd->db_length + 1 + QUERY_CACHE_FLAGS_SIZE + 1;
-  if ((pbuf= alloc_root(thd->mem_root, buf_len)))
+  if ((pbuf= (char *) alloc_root(thd->mem_root, buf_len)))
   {
     memcpy(pbuf, qbuf.ptr(), qbuf.length());
     pbuf[qbuf.length()]= 0;

From c0b65fb77dcb7010056dff7e476b7397dd912c89 Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Mon, 30 Jul 2007 03:20:45 +0500
Subject: [PATCH 100/139] disabled.def:   ddl_i18n_koi8r.test has been disabled
 to ignore bug #30120.

mysql-test/t/disabled.def:
  ddl_i18n_koi8r.test has been disabled to ignore bug #30120.
---
 mysql-test/t/disabled.def | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 368a659d939..fff651e54c9 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -25,3 +25,4 @@ ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Do
 
 mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
 federated_transactions   : Bug#29523 Transactions do not work
+ddl_i18n_koi8r           : Bug #30120 SP with local variables with non-ASCII names crashes server

From 33fc4ad4e124413ef617a1a073bb50135f6a12af Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Mon, 30 Jul 2007 04:35:16 +0500
Subject: [PATCH 101/139] Fixed bug #30120. SP with local variables with
 non-ASCII names crashed the server.

The server replaces SP local variable names with NAME_CONST calls
when putting statements into the binary log. It used UTF8-encoded
item names as variable names for the replacement inside NAME_CONST
calls. However, statement string may be encoded by any
known character set by the SET NAMES statement.
The server used byte length of UTF8-encoded names to increment
the position in the query string that led to array index overrun.


sql/item.cc:
  Fixed bug #30120.
  The Item_splocal class constructor has been modified to
  accept new parameter `len_in_q': the byte length of
  variable name in the query string.
sql/item.h:
  Fixed bug #30120.
  The Item_splocal class has been modified to keep new
  field `len_in_query': the byte length of variable name in
  the query string.
sql/sp_head.cc:
  Fixed bug #30120.
  The subst_spvars function has been modified to increment
  position in the query string by the lengths of not
  encoded variable names instead of byte length of names
  encoded to UTF-8.
sql/sql_yacc.yy:
  Fixed bug #30120.
  The simple_ident rule action has been modified to
  pass the byte length of the local variable name token
  to the Item_splocal object constructor.
mysql-test/t/sp.test:
  Updated test case for bug #30120.
mysql-test/r/sp.result:
  Updated test case for bug #30120.
---
 mysql-test/r/sp.result | 11 +++++++++++
 mysql-test/t/sp.test   | 21 +++++++++++++++++++++
 sql/item.cc            |  4 ++--
 sql/item.h             | 11 ++++++++++-
 sql/sp_head.cc         |  2 +-
 sql/sql_yacc.yy        |  3 ++-
 6 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index a7b6d8aa3fd..4a278cd4aec 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -6303,4 +6303,15 @@ DROP VIEW v1;
 DROP FUNCTION f1;
 DROP FUNCTION f2;
 DROP TABLE t1;
+SET NAMES latin1;
+CREATE PROCEDURE p1()
+BEGIN
+DECLARE áâä INT;
+SELECT áâä;
+END|
+CALL p1();
+áâä
+NULL
+SET NAMES default;
+DROP PROCEDURE p1;
 End of 5.0 tests
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index ddf33b285f5..46a1b1dc740 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -7278,4 +7278,25 @@ DROP FUNCTION f1;
 DROP FUNCTION f2;
 DROP TABLE t1;
 
+#
+# Bug #30120 SP with local variables with non-ASCII names crashes server.
+#
+
+SET NAMES latin1;
+
+DELIMITER |;
+
+CREATE PROCEDURE p1()
+BEGIN
+  DECLARE áâä INT;
+  SELECT áâä;
+END|
+
+DELIMITER ;|
+
+CALL p1();
+
+SET NAMES default;
+DROP PROCEDURE p1;
+
 --echo End of 5.0 tests
diff --git a/sql/item.cc b/sql/item.cc
index bd47fb706a6..9612fbc5243 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1053,9 +1053,9 @@ bool Item_sp_variable::is_null()
 Item_splocal::Item_splocal(const LEX_STRING &sp_var_name,
                            uint sp_var_idx,
                            enum_field_types sp_var_type,
-                           uint pos_in_q)
+                           uint pos_in_q, uint len_in_q)
   :Item_sp_variable(sp_var_name.str, sp_var_name.length),
-   m_var_idx(sp_var_idx), pos_in_query(pos_in_q)
+   m_var_idx(sp_var_idx), pos_in_query(pos_in_q), len_in_query(len_in_q)
 {
   maybe_null= TRUE;
 
diff --git a/sql/item.h b/sql/item.h
index 72236cb5e63..23f6977a0f8 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -960,9 +960,18 @@ public:
     SP variable in query text.
   */
   uint pos_in_query;
+  /*
+    Byte length of SP variable name in the statement (see pos_in_query).
+    The value of this field may differ from the name_length value because
+    name_length contains byte length of UTF8-encoded item name, but
+    the query string (see sp_instr_stmt::m_query) is currently stored with
+    a charset from the SET NAMES statement.
+  */
+  uint len_in_query;
 
   Item_splocal(const LEX_STRING &sp_var_name, uint sp_var_idx,
-               enum_field_types sp_var_type, uint pos_in_q= 0);
+               enum_field_types sp_var_type,
+               uint pos_in_q= 0, uint len_in_q= 0);
 
   bool is_splocal() { return 1; } /* Needed for error checking */
 
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index fd8724b2171..8f4d407a5b0 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -864,7 +864,7 @@ subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str)
     
     /* append the text between sp ref occurences */
     res|= qbuf.append(cur + prev_pos, (*splocal)->pos_in_query - prev_pos);
-    prev_pos= (*splocal)->pos_in_query + (*splocal)->m_name.length;
+    prev_pos= (*splocal)->pos_in_query + (*splocal)->len_in_query;
     
     /* append the spvar substitute */
     res|= qbuf.append(STRING_WITH_LEN(" NAME_CONST('"));
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 6fbd521e302..b0e59d0f8dc 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -7708,7 +7708,8 @@ simple_ident:
             Item_splocal *splocal;
             splocal= new Item_splocal($1, spv->offset, spv->type,
                                       lip->tok_start_prev - 
-                                      lex->sphead->m_tmp_query);
+                                      lex->sphead->m_tmp_query,
+                                      lip->tok_end - lip->tok_start_prev);
 #ifndef DBUG_OFF
             if (splocal)
               splocal->m_sp= lex->sphead;

From d803c8663be28432c50fca8940fcd2fee6925a14 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Mon, 30 Jul 2007 14:03:47 +0400
Subject: [PATCH 102/139] Fix merge: update result files.

mysql-test/r/ddl_i18n_koi8r.result:
  Update result file.
mysql-test/r/ddl_i18n_utf8.result:
  Update result file.
---
 mysql-test/r/ddl_i18n_koi8r.result | 12 ++++++++++++
 mysql-test/r/ddl_i18n_utf8.result  | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/mysql-test/r/ddl_i18n_koi8r.result b/mysql-test/r/ddl_i18n_koi8r.result
index 9e5931330e2..3d38319df21 100644
--- a/mysql-test/r/ddl_i18n_koi8r.result
+++ b/mysql-test/r/ddl_i18n_koi8r.result
@@ -1689,12 +1689,18 @@ DELETE FROM mysqltest2.log|
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `log` (
   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES (1),(0),(1);
 ALTER DATABASE mysqltest1 CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -1762,12 +1768,18 @@ ALTER DATABASE mysqltest1 CHARACTER SET cp866 COLLATE cp866_general_ci ;
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `log` (
   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES (1),(0),(1);
 ALTER DATABASE mysqltest2 CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
diff --git a/mysql-test/r/ddl_i18n_utf8.result b/mysql-test/r/ddl_i18n_utf8.result
index d74d014d755..b8e690bfeb7 100644
--- a/mysql-test/r/ddl_i18n_utf8.result
+++ b/mysql-test/r/ddl_i18n_utf8.result
@@ -1689,12 +1689,18 @@ DELETE FROM mysqltest2.log|
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `log` (
   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES (1),(0),(1);
 ALTER DATABASE mysqltest1 CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -1762,12 +1768,18 @@ ALTER DATABASE mysqltest1 CHARACTER SET cp866 COLLATE cp866_general_ci ;
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `log` (
   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES (1),(0),(1);
 ALTER DATABASE mysqltest2 CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;

From eb6c85e7552dcf63f2b2ed065051f571425d8426 Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.(none)>
Date: Mon, 30 Jul 2007 14:22:29 +0400
Subject: [PATCH 103/139] Fix a compilation warning.

sql/handler.h:
  Fix a warning.
---
 sql/handler.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sql/handler.h b/sql/handler.h
index cd9f9a91008..2caf9b20945 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -624,7 +624,6 @@ public:
 
   int ha_external_lock(THD *thd, int lock_type)
   {
-    int rc;
     DBUG_ENTER("ha_external_lock");
     locked= lock_type != F_UNLCK;
     DBUG_RETURN(external_lock(thd, lock_type));

From b9097abf00983f479f8e4b9f0ee82ac7fde74adc Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Mon, 30 Jul 2007 16:03:52 +0300
Subject: [PATCH 104/139] Moved the DBUG_ASSERT from bug 28983 to a place where
 it would not obstruct correct multithreading.

---
 sql/log.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/log.cc b/sql/log.cc
index 744d2a3ca65..6992f6c10ef 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1833,6 +1833,7 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event)
   /* NULL would represent nothing to replicate after ROLLBACK */
   DBUG_ASSERT(commit_event != NULL);
 
+  DBUG_ASSERT(is_open());
   if (likely(is_open()))                       // Should always be true
   {
     uint length, group, carry, hdr_offs, val;

From 9246c3720103caa421d5e0c5d7ad81bf570e071d Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Mon, 30 Jul 2007 17:14:34 +0400
Subject: [PATCH 105/139] Bug#24989: The DEADLOCK error is improperly handled
 by InnoDB.

When innodb detects a deadlock it calls ha_rollback_trans() to rollback the
main transaction. But such action isn't allowed from inside of triggers and
functions. When it happen the 'Explicit or implicit commit' error is thrown
even if there is no commit/rollback statements in the trigger/function. This
leads to the user confusion.

Now the convert_error_code_to_mysql() function doesn't call the
ha_rollback_trans() function directly but rather calls the
mark_transaction_to_rollback function and returns an error.
The sp_rcontext::find_handler() now doesn't allow errors to be caught by the
trigger/function error handlers when the thd->is_fatal_sub_stmt_error flag
is set. Procedures are still allowed to catch such errors.
The sp_rcontext::find_handler function now accepts a THD handle as a parameter.
The transaction_rollback_request and the is_fatal_sub_stmt_error flags are
added to the THD class. The are initialized by the THD class constructor.
Now the ha_autocommit_or_rollback function rolls back main transaction
when not in a sub statement and the thd->transaction_rollback_request
is set.
The THD::restore_sub_statement_state function now resets the
thd->is_fatal_sub_stmt_error flag on exit from a sub-statement.


sql/ha_innodb.cc:
  Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
  Now the convert_error_code_to_mysql() function doesn't call the
  ha_rollback_trans() function directly but rather calls the
  mark_transaction_to_rollback function and returns an error.
sql/handler.cc:
  Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
  Now the ha_autocommit_or_rollback function rolls back main transaction
  when not in a sub statement and the thd->transaction_rollback_request
  is set.
mysql-test/r/innodb-big.result:
  Added a test case for the bug#24989: The DEADLOCK error is improperly handled by
  InnoDB.
mysql-test/t/innodb-big.test:
  Added a test case for the bug#24989: The DEADLOCK error is improperly handled by
  InnoDB.
sql/sql_class.h:
  Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
  The transaction_rollback_request and the is_fatal_sub_stmt_error flags are
  added to the THD class.
sql/sql_class.cc:
  Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
  Initialization of the transaction_rollback_request and the
  is_fatal_sub_stmt_error flags are added to the THD class constructor.
  The mark_transaction_to_rollback function is added.
  The THD::restore_sub_statement_state function now resets the
  thd->is_fatal_sub_stmt_error flag on exit from a sub-statement.
sql/sp_rcontext.h:
  Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
  The sp_rcontext::find_handler function now accepts a THD handle as a parameter.
  The in_sub_stmt flag is added to the sp_rcontext class.
sql/sp_rcontext.cc:
  Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
  The sp_rcontext::find_handler() now doesn't allow errors to be caught by the
  trigger/function error handlers when the thd->is_fatal_sub_stmt_error flag
  is set. Instead it tries to find a most inner procedure that isn't called
  directly or indirectly from any function/trigger.
  Procedures are still allowed to catch such errors.
  The sp_rcontext::find_handler function now accepts a THD handle as a parameter.
---
 mysql-test/r/innodb-big.result |  66 ++++++++++++++++++++
 mysql-test/t/innodb-big.test   | 106 +++++++++++++++++++++++++++++++++
 sql/ha_innodb.cc               |  12 +---
 sql/handler.cc                 |   5 ++
 sql/sp_rcontext.cc             |  18 +++++-
 sql/sp_rcontext.h              |   6 +-
 sql/sql_class.cc               |  22 ++++++-
 sql/sql_class.h                |  30 +++++++++-
 8 files changed, 250 insertions(+), 15 deletions(-)

diff --git a/mysql-test/r/innodb-big.result b/mysql-test/r/innodb-big.result
index 19204b7cc65..84bb02d445e 100644
--- a/mysql-test/r/innodb-big.result
+++ b/mysql-test/r/innodb-big.result
@@ -32,3 +32,69 @@ select sum(id) from t3;
 sum(id)
 2199024304128
 drop table t1,t2,t3,t4;
+CREATE TABLE t1 (f1 int NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t2 (f2 int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
+CREATE TRIGGER t1_bi before INSERT
+ON t1 FOR EACH ROW
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLSTATE '40001' SET @a:= 'deadlock';
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+INSERT INTO t2 (f2) VALUES (1);
+DELETE FROM t2 WHERE f2 = 1;
+END;|
+CREATE PROCEDURE proc24989()
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLSTATE '40001' SET @b:= 'deadlock';
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+INSERT INTO t2 (f2) VALUES (1);
+DELETE FROM t2 WHERE f2 = 1;
+END;|
+create procedure proc24989_2()
+deterministic
+begin
+declare continue handler for sqlexception
+select 'Outer handler' as 'exception';
+insert into t1 values(1);
+select "continued";
+end|
+start transaction;
+insert into t1 values(1);
+start transaction;
+insert into t2 values(123);
+insert into t1 values(1);
+insert into t1 values(1);
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+select @a;
+@a
+NULL
+select * from t2;
+f2
+commit;
+start transaction;
+insert into t1 values(1);
+start transaction;
+insert into t2 values(123);
+call proc24989();
+insert into t1 values(1);
+select @a,@b;
+@a	@b
+exception	deadlock
+select * from t2;
+f2
+commit;
+start transaction;
+insert into t1 values(1);
+start transaction;
+insert into t2 values(123);
+call proc24989_2();
+insert into t1 values(1);
+commit;
+exception
+Outer handler
+continued
+continued
+select * from t2;
+f2
+drop procedure proc24989;
+drop procedure proc24989_2;
+drop table t1,t2;
diff --git a/mysql-test/t/innodb-big.test b/mysql-test/t/innodb-big.test
index ade69ffdb45..dcb32cd8e71 100644
--- a/mysql-test/t/innodb-big.test
+++ b/mysql-test/t/innodb-big.test
@@ -44,3 +44,109 @@ INSERT INTO t3 SELECT concat(id),id from t2 ORDER BY -id;
 INSERT INTO t4 SELECT * from t3 ORDER BY concat(a);
 select sum(id) from t3;
 drop table t1,t2,t3,t4;
+
+#
+# Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
+#
+CREATE TABLE t1 (f1 int NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t2 (f2 int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
+DELIMITER |;
+CREATE TRIGGER t1_bi before INSERT
+    ON t1 FOR EACH ROW
+BEGIN
+  DECLARE CONTINUE HANDLER FOR SQLSTATE '40001' SET @a:= 'deadlock';
+  DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+  INSERT INTO t2 (f2) VALUES (1);
+  DELETE FROM t2 WHERE f2 = 1;
+END;|
+
+CREATE PROCEDURE proc24989()
+BEGIN
+  DECLARE CONTINUE HANDLER FOR SQLSTATE '40001' SET @b:= 'deadlock';
+  DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+  INSERT INTO t2 (f2) VALUES (1);
+  DELETE FROM t2 WHERE f2 = 1;
+END;|
+
+create procedure proc24989_2()
+    deterministic
+begin
+  declare continue handler for sqlexception
+    select 'Outer handler' as 'exception';
+
+  insert into t1 values(1);
+  select "continued";
+end|
+
+DELIMITER ;|
+
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+
+connection con1;
+start transaction;
+insert into t1 values(1);
+
+connection con2;
+start transaction;
+insert into t2 values(123);
+send insert into t1 values(1);
+
+connection con1;
+--sleep 1
+insert into t1 values(1);
+
+connection con2;
+--error 1213
+reap;
+select @a;
+# check that the whole transaction was rolled back
+select * from t2;
+
+connection con1;
+commit;
+start transaction;
+insert into t1 values(1);
+
+connection con2;
+start transaction;
+insert into t2 values(123);
+send call proc24989();
+
+connection con1;
+--sleep 1
+insert into t1 values(1);
+
+connection con2;
+reap;
+select @a,@b;
+# check that the whole transaction was rolled back
+select * from t2;
+
+connection con1;
+commit;
+start transaction;
+insert into t1 values(1);
+
+connection con2;
+start transaction;
+insert into t2 values(123);
+send call proc24989_2();
+
+connection con1;
+--sleep 1
+insert into t1 values(1);
+commit;
+
+connection con2;
+reap;
+# check that the whole transaction was rolled back
+select * from t2;
+
+disconnect con1;
+disconnect con2;
+connection default;
+drop procedure proc24989;
+drop procedure proc24989_2;
+drop table t1,t2;
+
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 455c0968050..d4a43dc4297 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -455,9 +455,7 @@ convert_error_code_to_mysql(
  		tell it also to MySQL so that MySQL knows to empty the
  		cached binlog for this transaction */
 
- 		if (thd) {
- 			ha_rollback(thd);
- 		}
+                mark_transaction_to_rollback(thd, TRUE);
 
     		return(HA_ERR_LOCK_DEADLOCK);
 
@@ -467,9 +465,7 @@ convert_error_code_to_mysql(
 		latest SQL statement in a lock wait timeout. Previously, we
 		rolled back the whole transaction. */
 
-		if (thd && row_rollback_on_timeout) {
-			ha_rollback(thd);
-		}
+                mark_transaction_to_rollback(thd, row_rollback_on_timeout);
 
    		return(HA_ERR_LOCK_WAIT_TIMEOUT);
 
@@ -521,9 +517,7 @@ convert_error_code_to_mysql(
  		tell it also to MySQL so that MySQL knows to empty the
  		cached binlog for this transaction */
 
- 		if (thd) {
- 			ha_rollback(thd);
- 		}
+                mark_transaction_to_rollback(thd, TRUE);
 
     		return(HA_ERR_LOCK_TABLE_FULL);
     	} else {
diff --git a/sql/handler.cc b/sql/handler.cc
index 867ac7ff778..e4a5e65b80c 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -821,6 +821,9 @@ int ha_rollback_trans(THD *thd, bool all)
     }
   }
 #endif /* USING_TRANSACTIONS */
+  if (all)
+    thd->transaction_rollback_request= FALSE;
+
   /*
     If a non-transactional table was updated, warn; don't warn if this is a
     slave thread (because when a slave thread executes a ROLLBACK, it has
@@ -858,6 +861,8 @@ int ha_autocommit_or_rollback(THD *thd, int error)
       if (ha_commit_stmt(thd))
 	error=1;
     }
+    else if (thd->transaction_rollback_request && !thd->in_sub_stmt)
+      (void) ha_rollback(thd);
     else
       (void) ha_rollback_stmt(thd);
 
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc
index e49c4eb1240..ac7c46c9fe5 100644
--- a/sql/sp_rcontext.cc
+++ b/sql/sp_rcontext.cc
@@ -37,6 +37,7 @@ sp_rcontext::sp_rcontext(sp_pcontext *root_parsing_ctx,
    m_var_items(0),
    m_return_value_fld(return_value_fld),
    m_return_value_set(FALSE),
+   in_sub_stmt(FALSE),
    m_hcount(0),
    m_hsp(0),
    m_ihsp(0),
@@ -67,6 +68,8 @@ sp_rcontext::~sp_rcontext()
 
 bool sp_rcontext::init(THD *thd)
 {
+  in_sub_stmt= thd->in_sub_stmt;
+
   if (init_var_table(thd) || init_var_items())
     return TRUE;
 
@@ -191,7 +194,7 @@ sp_rcontext::set_return_value(THD *thd, Item **return_value_item)
 */
 
 bool
-sp_rcontext::find_handler(uint sql_errno,
+sp_rcontext::find_handler(THD *thd, uint sql_errno,
                           MYSQL_ERROR::enum_warning_level level)
 {
   if (m_hfound >= 0)
@@ -200,6 +203,15 @@ sp_rcontext::find_handler(uint sql_errno,
   const char *sqlstate= mysql_errno_to_sqlstate(sql_errno);
   int i= m_hcount, found= -1;
 
+  /*
+    If this is a fatal sub-statement error, and this runtime
+    context corresponds to a sub-statement, no CONTINUE/EXIT
+    handlers from this context are applicable: try to locate one
+    in the outer scope.
+  */
+  if (thd->is_fatal_sub_stmt_error && in_sub_stmt)
+    i= 0;
+
   /* Search handlers from the latest (innermost) to the oldest (outermost) */
   while (i--)
   {
@@ -252,7 +264,7 @@ sp_rcontext::find_handler(uint sql_errno,
     */
     if (m_prev_runtime_ctx && IS_EXCEPTION_CONDITION(sqlstate) &&
         level == MYSQL_ERROR::WARN_LEVEL_ERROR)
-      return m_prev_runtime_ctx->find_handler(sql_errno, level);
+      return m_prev_runtime_ctx->find_handler(thd, sql_errno, level);
     return FALSE;
   }
   m_hfound= found;
@@ -298,7 +310,7 @@ sp_rcontext::handle_error(uint sql_errno,
     elevated_level= MYSQL_ERROR::WARN_LEVEL_ERROR;
   }
 
-  if (find_handler(sql_errno, elevated_level))
+  if (find_handler(thd, sql_errno, elevated_level))
   {
     if (elevated_level == MYSQL_ERROR::WARN_LEVEL_ERROR)
     {
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
index fbf479f52aa..0104b71a648 100644
--- a/sql/sp_rcontext.h
+++ b/sql/sp_rcontext.h
@@ -125,7 +125,7 @@ class sp_rcontext : public Sql_alloc
 
   // Returns 1 if a handler was found, 0 otherwise.
   bool
-  find_handler(uint sql_errno,MYSQL_ERROR::enum_warning_level level);
+  find_handler(THD *thd, uint sql_errno,MYSQL_ERROR::enum_warning_level level);
 
   // If there is an error handler for this error, handle it and return TRUE.
   bool
@@ -236,6 +236,10 @@ private:
     during execution.
   */
   bool m_return_value_set;
+  /**
+    TRUE if the context is created for a sub-statement.
+  */
+  bool in_sub_stmt;
 
   sp_handler_t *m_handler;      // Visible handlers
   uint m_hcount;                // Stack pointer for m_handler
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 010dc101e0d..33286e814aa 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -173,6 +173,7 @@ THD::THD()
    Open_tables_state(refresh_version),
    lock_id(&main_lock_id),
    user_time(0), in_sub_stmt(0), global_read_lock(0), is_fatal_error(0),
+   transaction_rollback_request(0), is_fatal_sub_stmt_error(0),
    rand_used(0), time_zone_used(0),
    last_insert_id_used(0), last_insert_id_used_bin_log(0), insert_id_used(0),
    clear_next_insert_id(0), in_lock_tables(0), bootstrap(0),
@@ -967,7 +968,7 @@ void select_send::abort()
 {
   DBUG_ENTER("select_send::abort");
   if (status && thd->spcont &&
-      thd->spcont->find_handler(thd->net.last_errno,
+      thd->spcont->find_handler(thd, thd->net.last_errno,
                                 MYSQL_ERROR::WARN_LEVEL_ERROR))
   {
     /*
@@ -2150,6 +2151,13 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
   limit_found_rows= backup->limit_found_rows;
   sent_row_count=   backup->sent_row_count;
   client_capabilities= backup->client_capabilities;
+  /*
+    If we've left sub-statement mode, reset the fatal error flag.
+    Otherwise keep the current value, to propagate it up the sub-statement
+    stack.
+  */
+  if (!in_sub_stmt)
+    is_fatal_sub_stmt_error= FALSE;
 
   if ((options & OPTION_BIN_LOG) && is_update_query(lex->sql_command))
     mysql_bin_log.stop_union_events(this);
@@ -2163,6 +2171,18 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
 }
 
 
+/**
+  Mark transaction to rollback and mark error as fatal to a sub-statement.
+
+  @param  thd   Thread handle
+  @param  all   TRUE <=> rollback main transaction.
+*/
+
+void mark_transaction_to_rollback(THD *thd, bool all)
+{
+  thd->is_fatal_sub_stmt_error= TRUE;
+  thd->transaction_rollback_request= all;
+}
 /***************************************************************************
   Handling of XA id cacheing
 ***************************************************************************/
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 5f813e82307..674409d6f08 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1406,7 +1406,33 @@ public:
   bool       slave_thread, one_shot_set;
   bool	     locked, some_tables_deleted;
   bool       last_cuted_field;
-  bool	     no_errors, password, is_fatal_error;
+  bool	     no_errors, password;
+  /**
+    Set to TRUE if execution of the current compound statement
+    can not continue. In particular, disables activation of
+    CONTINUE or EXIT handlers of stored routines.
+    Reset in the end of processing of the current user request, in
+    @see mysql_reset_thd_for_next_command().
+  */
+  bool is_fatal_error;
+  /**
+    Set by a storage engine to request the entire
+    transaction (that possibly spans multiple engines) to
+    rollback. Reset in ha_rollback.
+  */
+  bool       transaction_rollback_request;
+  /**
+    TRUE if we are in a sub-statement and the current error can
+    not be safely recovered until we left the sub-statement mode.
+    In particular, disables activation of CONTINUE and EXIT
+    handlers inside sub-statements. E.g. if it is a deadlock
+    error and requires a transaction-wide rollback, this flag is
+    raised (traditionally, MySQL first has to close all the reads
+    via @see handler::ha_index_or_rnd_end() and only then perform
+    the rollback).
+    Reset to FALSE when we leave the sub-statement mode.
+  */
+  bool       is_fatal_sub_stmt_error;
   bool	     query_start_used, rand_used, time_zone_used;
 
   /*
@@ -2338,3 +2364,5 @@ public:
 /* Functions in sql_class.cc */
 
 void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var);
+void mark_transaction_to_rollback(THD *thd, bool all);
+

From e0644f180ef6ba4699aebaf5f81f676082568b8c Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Mon, 30 Jul 2007 19:23:53 +0400
Subject: [PATCH 106/139] Disable IM tests.

---
 mysql-test/t/disabled.def | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index b41875fe740..b536d35c01e 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -11,17 +11,14 @@
 ##############################################################################
 user_limits     : Bug#23921 random failure of user_limits.test
 
-#
-# Temporary enable IM tests to catch the assert.
-#
-# im_options               : Bug#20294 2006-07-24 stewart   Instance manager test im_options fails randomly
-# im_daemon_life_cycle     : Bug#20294 2007-05-14 alik      Instance manager tests fail randomly
-# im_cmd_line              : Bug#20294 2007-05-14 alik      Instance manager tests fail randomly
-# im_utils                 : Bug#20294 2007-05-30 alik      Instance manager tests fail randomly
-# im_instance_conf         : Bug#20294 2007-05-30 alik      Instance manager tests fail randomly
-# im_life_cycle            : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance.
-# im_instance_conf         : BUG#28743 Instance manager generates warnings in test suite
-# im_utils                 : BUG#28743 Instance manager generates warnings in test suite
+im_options               : Bug#20294 2006-07-24 stewart   Instance manager test im_options fails randomly
+im_daemon_life_cycle     : Bug#20294 2007-05-14 alik      Instance manager tests fail randomly
+im_cmd_line              : Bug#20294 2007-05-14 alik      Instance manager tests fail randomly
+im_utils                 : Bug#20294 2007-05-30 alik      Instance manager tests fail randomly
+im_instance_conf         : Bug#20294 2007-05-30 alik      Instance manager tests fail randomly
+im_life_cycle            : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance.
+im_instance_conf         : BUG#28743 Instance manager generates warnings in test suite
+im_utils                 : BUG#28743 Instance manager generates warnings in test suite
 
 concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
 ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper

From 1307d3b8033985d842b900ec8ebe7be9f0a4e092 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Mon, 30 Jul 2007 18:27:36 +0300
Subject: [PATCH 107/139] (pushing for Andrei) Bug #27417
 thd->no_trans_update.stmt lost value inside of SF-exec-stack

Once had been set the flag might later got reset inside of a stored routine
execution stack.
The reason was in that there was no check if a new statement started at time
of resetting.
The artifact affects most of binlogable DML queries. Notice, that multi-update
is wrapped up within
  bug@27716 fix, multi-delete bug@29136.

Fixed with saving parent's statement flag of whether the statement modified
non-transactional table, and unioning (merging) the value with that was gained
in mysql_execute_command.

Resettling thd->no_trans_update members into thd->transaction.`member`;
Asserting code;
Effectively the following properties are held.

1. At the end of a substatement thd->transaction.stmt.modified_non_trans_table
   reflects the fact if such a table got modified by the substatement.
   That also respects THD::really_abort_on_warnin() requirements.
2. Eventually thd->transaction.stmt.modified_non_trans_table will be computed as
   the union of the values of all invoked sub-statements.
   That fixes this bug#27417;

Computing of thd->transaction.all.modified_non_trans_table is refined to base to
the stmt's value for all the case including insert .. select statement which
before the patch had an extra issue bug@28960.
Minor issues are covered with mysql_load, mysql_delete, and binloggin of insert in
to temp_table select.

The supplied test verifies limitely, mostly asserts. The ultimate testing is defered
for bug@13270, bug@23333.


mysql-test/r/mix_innodb_myisam_binlog.result:
  results changed
mysql-test/t/mix_innodb_myisam_binlog.test:
  regression test incl the related bug#28960.
sql/ha_ndbcluster.cc:
  thd->transaction.{all,stmt}.modified_non_trans_table
  instead of
  thd->no_trans_update.{all,stmt}
sql/handler.cc:
  thd->transaction.{all,stmt}.modified_non_trans_table
  instead of
  thd->no_trans_update.{all,stmt}
sql/handler.h:
  new member added
sql/log.cc:
  thd->transaction.{all,stmt}.modified_non_trans_table
  instead of
  thd->no_trans_update.{all,stmt}
sql/set_var.cc:
  thd->transaction.{all,stmt}.modified_non_trans_table
  instead of
  thd->no_trans_update.{all,stmt}
sql/sp_head.cc:
  thd->transaction.{all,stmt}.modified_non_trans_table
  instead of
  thd->no_trans_update.{all,stmt}

  and saving and merging stmt's flag at the end of a substatement.
sql/sql_class.cc:
  thd->transaction.{all,stmt}.modified_non_trans_table
  instead of
  thd->no_trans_update.{all,stmt}
sql/sql_class.h:
  thd->transaction.{all,stmt}.modified_non_trans_table
  instead of
  thd->no_trans_update.{all,stmt}
sql/sql_delete.cc:
  correcting basic delete incl truncate branch and multi-delete queries to set
  stmt.modified_non_trans_table;
  optimization to set the flag at the end of per-row loop;
  multi-delete still has an extra issue similar to bug#27716 of multi-update
  - to be address with bug_29136 fix.
sql/sql_insert.cc:
  thd->transaction.{all,stmt}.modified_non_trans_table
  instead of
  thd->no_trans_update.{all,stmt}
sql/sql_load.cc:
  eliminating a separate issue where the stmt flag was saved and re-stored after
  write_record that actually could change it and the change would be lost but
  should remain permanent;
  thd->transaction.{all,stmt}.modified_non_trans_table
  instead of
  thd->no_trans_update.{all,stmt}
sql/sql_parse.cc:
  initialization to transaction.stmt.modified_non_trans_table at the common part
  of all types of statements processing - mysql_execute_command().
sql/sql_table.cc:
  moving the reset up to the mysql_execute_command() caller
sql/sql_update.cc:
  correcting update query case (multi-update part of the issues covered by other
  bug#27716 fix)
  thd->transaction.{all,stmt}.modified_non_trans_table
  instead of
  thd->no_trans_update.{all,stmt}
---
 mysql-test/r/mix_innodb_myisam_binlog.result | 113 +++++++++++++++++
 mysql-test/t/mix_innodb_myisam_binlog.test   | 122 ++++++++++++++++++-
 sql/ha_ndbcluster.cc                         |   2 +-
 sql/handler.cc                               |   2 +-
 sql/handler.h                                |  29 +++++
 sql/log.cc                                   |   4 +-
 sql/set_var.cc                               |   4 +-
 sql/sp_head.cc                               |  20 ++-
 sql/sql_class.cc                             |   2 +-
 sql/sql_class.h                              |   6 +-
 sql/sql_delete.cc                            |  31 +++--
 sql/sql_insert.cc                            |  43 ++++---
 sql/sql_load.cc                              |  16 +--
 sql/sql_parse.cc                             |  22 ++--
 sql/sql_table.cc                             |   1 -
 sql/sql_update.cc                            |  41 +++----
 16 files changed, 368 insertions(+), 90 deletions(-)

diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result
index 8fc5bfca3ef..5777bd890b2 100644
--- a/mysql-test/r/mix_innodb_myisam_binlog.result
+++ b/mysql-test/r/mix_innodb_myisam_binlog.result
@@ -280,3 +280,116 @@ select
 @a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"
 1	1
 drop table t1, t2;
+create temporary table tt (a int unique);
+create table ti (a int) engine=innodb;
+reset master;
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	98		
+begin;
+insert into ti values (1);
+insert into ti values (2) ;
+insert into tt select * from ti;
+rollback;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
+select count(*) from tt /* 2 */;
+count(*)
+2
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	507		
+show binlog events from 98;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	1	#	use `test`; BEGIN
+master-bin.000001	#	Query	1	#	use `test`; insert into ti values (1)
+master-bin.000001	#	Query	1	#	use `test`; insert into ti values (2)
+master-bin.000001	#	Query	1	#	use `test`; insert into tt select * from ti
+master-bin.000001	#	Query	1	#	use `test`; ROLLBACK
+select count(*) from ti /* zero */;
+count(*)
+0
+insert into ti select * from tt;
+select * from ti /* that is what slave would miss - a bug */;
+a
+1
+2
+delete from ti;
+delete from tt where a=1;
+reset master;
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	98		
+begin;
+insert into ti values (1);
+insert into ti values (2) /* to make the dup error in the following */;
+insert into tt select * from ti /* one affected and error */;
+ERROR 23000: Duplicate entry '2' for key 1
+rollback;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	581		
+show binlog events from 98;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	1	#	use `test`; BEGIN
+master-bin.000001	#	Query	1	#	use `test`; insert into ti values (1)
+master-bin.000001	#	Query	1	#	use `test`; insert into ti values (2) /* to make the dup error in the following */
+master-bin.000001	#	Query	1	#	use `test`; insert into tt select * from ti /* one affected and error */
+master-bin.000001	#	Query	1	#	use `test`; ROLLBACK
+select count(*) from ti /* zero */;
+count(*)
+0
+insert into ti select * from tt;
+select * from tt /* that is what otherwise slave missed - the bug */;
+a
+1
+2
+drop table ti;
+drop function if exists bug27417;
+drop table if exists t1,t2;
+CREATE TABLE t1 (a int NOT NULL auto_increment primary key) ENGINE=MyISAM;
+CREATE TABLE t2 (a int NOT NULL auto_increment, PRIMARY KEY (a));
+create function bug27417(n int) 
+RETURNS int(11)
+begin
+insert into t1 values (null);
+return n;
+end|
+reset master;
+insert into t2 values (bug27417(1));
+insert into t2 select bug27417(2);
+reset master;
+insert into t2 values (bug27417(2));
+ERROR 23000: Duplicate entry '2' for key 1
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	98		
+/* only (!) with fixes for #23333 will show there is the query */;
+select count(*) from t1 /* must be 3 */;
+count(*)
+3
+reset master;
+select count(*) from t2;
+count(*)
+2
+delete from t2 where a=bug27417(3);
+select count(*) from t2 /* nothing got deleted */;
+count(*)
+2
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	195		
+/* the query must be in regardless of #23333 */;
+select count(*) from t1 /* must be 5 */;
+count(*)
+5
+delete t2 from t2 where t2.a=bug27417(100) /* must not affect t2 */;
+affected rows: 0
+select count(*) from t1 /* must be 7 */;
+count(*)
+7
+drop function bug27417;
+drop table t1,t2;
+end of tests
diff --git a/mysql-test/t/mix_innodb_myisam_binlog.test b/mysql-test/t/mix_innodb_myisam_binlog.test
index 428aba92342..f9d7235ff84 100644
--- a/mysql-test/t/mix_innodb_myisam_binlog.test
+++ b/mysql-test/t/mix_innodb_myisam_binlog.test
@@ -233,8 +233,6 @@ source include/show_binlog_events.inc;
 do release_lock("lock1");
 drop table t0,t2;
 
-# End of 4.1 tests
-
 # Test for BUG#16559 (ROLLBACK should always have a zero error code in
 # binlog). Has to be here and not earlier, as the SELECTs influence
 # XIDs differently between normal and ps-protocol (and SHOW BINLOG
@@ -267,3 +265,123 @@ eval select
 @a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",
 @a not like "%#%error_code=%error_code=%";
 drop table t1, t2;
+
+#
+# Bug #27417  	thd->no_trans_update.stmt lost value inside of SF-exec-stack
+# bug #28960    non-trans temp table changes with insert .. select
+#               not binlogged after rollback
+#
+# testing appearence of insert into temp_table in binlog.
+# There are two branches of execution that require different setup.
+
+## send_eof() branch
+
+# prepare
+
+create temporary table tt (a int unique);
+create table ti (a int) engine=innodb;
+reset master;
+show master status;
+
+# action
+
+begin; 
+insert into ti values (1); 
+insert into ti values (2) ; 
+insert into tt select * from ti;
+rollback;
+
+# check
+
+select count(*) from tt /* 2 */;
+show master status;
+--replace_column 2 # 5 #
+show binlog events from 98;
+select count(*) from ti /* zero */;
+insert into ti select * from tt;
+select * from ti /* that is what slave would miss - a bug */;
+
+
+## send_error() branch
+delete from ti;
+delete from tt where a=1;
+reset master;
+show master status;
+
+# action
+
+begin; 
+insert into ti values (1); 
+insert into ti values (2) /* to make the dup error in the following */; 
+--error ER_DUP_ENTRY
+insert into tt select * from ti /* one affected and error */;
+rollback;
+
+# check
+
+show master status;
+--replace_column 2 # 5 #
+show binlog events from 98;
+select count(*) from ti /* zero */;
+insert into ti select * from tt;
+select * from tt /* that is what otherwise slave missed - the bug */;
+
+drop table ti;
+
+
+#
+# Bug #27417 thd->no_trans_update.stmt lost value inside of SF-exec-stack
+#
+# Testing asserts: if there is a side effect of modifying non-transactional
+# table thd->no_trans_update.stmt must be TRUE;
+# the assert is active with debug build
+#
+
+--disable_warnings
+drop function if exists bug27417;
+drop table if exists t1,t2;
+--enable_warnings
+# side effect table
+CREATE TABLE t1 (a int NOT NULL auto_increment primary key) ENGINE=MyISAM;
+# target tables
+CREATE TABLE t2 (a int NOT NULL auto_increment, PRIMARY KEY (a));
+
+delimiter |;
+create function bug27417(n int) 
+RETURNS int(11)
+begin
+  insert into t1 values (null);
+  return n;
+end|
+delimiter ;|
+
+reset master;
+
+# execute
+
+insert into t2 values (bug27417(1));
+insert into t2 select bug27417(2);
+reset master;
+
+--error ER_DUP_ENTRY
+insert into t2 values (bug27417(2)); 
+show master status; /* only (!) with fixes for #23333 will show there is the query */;
+select count(*) from t1 /* must be 3 */;
+
+reset master;
+select count(*) from t2;
+delete from t2 where a=bug27417(3);
+select count(*) from t2 /* nothing got deleted */; 
+show master status; /* the query must be in regardless of #23333 */;
+select count(*) from t1 /* must be 5 */;
+
+--enable_info
+delete t2 from t2 where t2.a=bug27417(100) /* must not affect t2 */;
+--disable_info
+select count(*) from t1 /* must be 7 */;
+
+drop function bug27417;
+drop table t1,t2;
+
+--echo end of tests
+
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 357b797ec75..a00dd6c505c 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -3732,7 +3732,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
     {
       m_transaction_on= FALSE;
       /* Would be simpler if has_transactions() didn't always say "yes" */
-      thd->no_trans_update.all= thd->no_trans_update.stmt= TRUE;
+      thd->transaction.all.modified_non_trans_table= thd->transaction.stmt.modified_non_trans_table= TRUE;
     }
     else if (!thd->transaction.on)
       m_transaction_on= FALSE;
diff --git a/sql/handler.cc b/sql/handler.cc
index dcc9fde8b76..7b8625f6b3a 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -830,7 +830,7 @@ int ha_rollback_trans(THD *thd, bool all)
     the error log; but we don't want users to wonder why they have this
     message in the error log, so we don't send it.
   */
-  if (is_real_trans && thd->no_trans_update.all &&
+  if (is_real_trans && thd->transaction.all.modified_non_trans_table &&
       !thd->slave_thread)
     push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                  ER_WARNING_NOT_COMPLETE_ROLLBACK,
diff --git a/sql/handler.h b/sql/handler.h
index a3767573178..c44d7c7f846 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -420,6 +420,35 @@ typedef struct st_thd_trans
   bool        no_2pc;
   /* storage engines that registered themselves for this transaction */
   handlerton *ht[MAX_HA];
+  /* 
+    The purpose of this flag is to keep track of non-transactional
+    tables that were modified in scope of:
+    - transaction, when the variable is a member of
+    THD::transaction.all
+    - top-level statement or sub-statement, when the variable is a
+    member of THD::transaction.stmt
+    This member has the following life cycle:
+    * stmt.modified_non_trans_table is used to keep track of
+    modified non-transactional tables of top-level statements. At
+    the end of the previous statement and at the beginning of the session,
+    it is reset to FALSE.  If such functions
+    as mysql_insert, mysql_update, mysql_delete etc modify a
+    non-transactional table, they set this flag to TRUE.  At the
+    end of the statement, the value of stmt.modified_non_trans_table 
+    is merged with all.modified_non_trans_table and gets reset.
+    * all.modified_non_trans_table is reset at the end of transaction
+    
+    * Since we do not have a dedicated context for execution of a
+    sub-statement, to keep track of non-transactional changes in a
+    sub-statement, we re-use stmt.modified_non_trans_table. 
+    At entrance into a sub-statement, a copy of the value of
+    stmt.modified_non_trans_table (containing the changes of the
+    outer statement) is saved on stack. Then 
+    stmt.modified_non_trans_table is reset to FALSE and the
+    substatement is executed. Then the new value is merged with the
+    saved value.
+  */
+  bool modified_non_trans_table;
 } THD_TRANS;
 
 enum enum_tx_isolation { ISO_READ_UNCOMMITTED, ISO_READ_COMMITTED,
diff --git a/sql/log.cc b/sql/log.cc
index 6992f6c10ef..e9aa273676a 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -162,7 +162,7 @@ static int binlog_rollback(THD *thd, bool all)
     table. Such cases should be rare (updating a
     non-transactional table inside a transaction...)
   */
-  if (unlikely(thd->no_trans_update.all))
+  if (unlikely(thd->transaction.all.modified_non_trans_table))
   {
     Query_log_event qev(thd, STRING_WITH_LEN("ROLLBACK"), TRUE, FALSE);
     qev.error_code= 0; // see comment in MYSQL_LOG::write(THD, IO_CACHE)
@@ -217,7 +217,7 @@ static int binlog_savepoint_rollback(THD *thd, void *sv)
     non-transactional table. Otherwise, truncate the binlog cache starting
     from the SAVEPOINT command.
   */
-  if (unlikely(thd->no_trans_update.all))
+  if (unlikely(thd->transaction.all.modified_non_trans_table))
   {
     Query_log_event qinfo(thd, thd->query, thd->query_length, TRUE, FALSE);
     DBUG_RETURN(mysql_bin_log.write(&qinfo));
diff --git a/sql/set_var.cc b/sql/set_var.cc
index b30aa008366..e1246617d84 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -2901,14 +2901,14 @@ static bool set_option_autocommit(THD *thd, set_var *var)
     {
       /* We changed to auto_commit mode */
       thd->options&= ~(ulong) OPTION_BEGIN;
-      thd->no_trans_update.all= FALSE;
+      thd->transaction.all.modified_non_trans_table= FALSE;
       thd->server_status|= SERVER_STATUS_AUTOCOMMIT;
       if (ha_commit(thd))
 	return 1;
     }
     else
     {
-      thd->no_trans_update.all= FALSE;
+      thd->transaction.all.modified_non_trans_table= FALSE;
       thd->server_status&= ~SERVER_STATUS_AUTOCOMMIT;
     }
   }
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index fd8724b2171..589e59faca4 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -337,13 +337,13 @@ sp_eval_expr(THD *thd, Field *result_field, Item **expr_item_ptr)
   
   enum_check_fields save_count_cuted_fields= thd->count_cuted_fields;
   bool save_abort_on_warning= thd->abort_on_warning;
-  bool save_no_trans_update_stmt= thd->no_trans_update.stmt;
+  bool save_stmt_modified_non_trans_table= thd->transaction.stmt.modified_non_trans_table;
 
   thd->count_cuted_fields= CHECK_FIELD_ERROR_FOR_NULL;
   thd->abort_on_warning=
     thd->variables.sql_mode &
     (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES);
-  thd->no_trans_update.stmt= FALSE;
+  thd->transaction.stmt.modified_non_trans_table= FALSE;
 
   /* Save the value in the field. Convert the value if needed. */
 
@@ -351,7 +351,7 @@ sp_eval_expr(THD *thd, Field *result_field, Item **expr_item_ptr)
 
   thd->count_cuted_fields= save_count_cuted_fields;
   thd->abort_on_warning= save_abort_on_warning;
-  thd->no_trans_update.stmt= save_no_trans_update_stmt;
+  thd->transaction.stmt.modified_non_trans_table= save_stmt_modified_non_trans_table;
 
   if (thd->net.report_error)
   {
@@ -2400,7 +2400,13 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
                                        bool open_tables, sp_instr* instr)
 {
   int res= 0;
-
+  /* 
+    The flag is saved at the entry to the following substatement.
+    It's reset further in the common code part.
+    It's merged with the saved parent's value at the exit of this func.
+  */
+  bool parent_modified_non_trans_table= thd->transaction.stmt.modified_non_trans_table;
+  thd->transaction.stmt.modified_non_trans_table= FALSE;
   DBUG_ASSERT(!thd->derived_tables);
   DBUG_ASSERT(thd->change_list.is_empty());
   /*
@@ -2467,7 +2473,11 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
   /* Update the state of the active arena. */
   thd->stmt_arena->state= Query_arena::EXECUTED;
 
-
+  /*
+    Merge here with the saved parent's values
+    what is needed from the substatement gained
+  */
+  thd->transaction.stmt.modified_non_trans_table |= parent_modified_non_trans_table;
   /*
     Unlike for PS we should not call Item's destructors for newly created
     items after execution of each instruction in stored routine. This is
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index ee4e1ea149c..1866576aa3a 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -339,7 +339,7 @@ void THD::init(void)
   if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)
     server_status|= SERVER_STATUS_NO_BACKSLASH_ESCAPES;
   options= thd_startup_options;
-  no_trans_update.stmt= no_trans_update.all= FALSE;
+  transaction.all.modified_non_trans_table= transaction.stmt.modified_non_trans_table= FALSE;
   open_options=ha_open_options;
   update_lock_default= (variables.low_priority_updates ?
 			TL_WRITE_LOW_PRIORITY :
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 058f130d4e7..1c84fd32965 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1460,10 +1460,6 @@ public:
   bool	     charset_is_system_charset, charset_is_collation_connection;
   bool       charset_is_character_set_filesystem;
   bool       enable_slow_log;   /* enable slow log for current statement */
-  struct {
-    bool all:1;
-    bool stmt:1;
-  } no_trans_update;
   bool	     abort_on_warning;
   bool 	     got_warning;       /* Set on call to push_warning() */
   bool	     no_warnings_for_error; /* no warnings on call to my_error() */
@@ -1714,7 +1710,7 @@ public:
   inline bool really_abort_on_warning()
   {
     return (abort_on_warning &&
-            (!no_trans_update.stmt ||
+            (!transaction.stmt.modified_non_trans_table ||
              (variables.sql_mode & MODE_STRICT_ALL_TABLES)));
   }
   void set_status_var_init();
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index bccd4d4cafe..56edfa6c5b2 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -315,6 +315,9 @@ cleanup:
 
   delete select;
   transactional_table= table->file->has_transactions();
+  if (!transactional_table && deleted > 0)
+    thd->transaction.stmt.modified_non_trans_table= TRUE;
+  
   /* See similar binlogging code in sql_update.cc, for comments */
   if ((error < 0) || (deleted && !transactional_table))
   {
@@ -327,9 +330,10 @@ cleanup:
       if (mysql_bin_log.write(&qinfo) && transactional_table)
 	error=1;
     }
-    if (!transactional_table)
-      thd->no_trans_update.all= TRUE;
+    if (thd->transaction.stmt.modified_non_trans_table)
+      thd->transaction.all.modified_non_trans_table= TRUE;
   }
+  DBUG_ASSERT(transactional_table || !deleted || thd->transaction.stmt.modified_non_trans_table);
   free_underlaid_joins(thd, select_lex);
   if (transactional_table)
   {
@@ -642,20 +646,22 @@ bool multi_delete::send_data(List<Item> &values)
       if (table->triggers &&
           table->triggers->process_triggers(thd, TRG_EVENT_DELETE,
                                             TRG_ACTION_BEFORE, FALSE))
-	DBUG_RETURN(1);
+        DBUG_RETURN(1);
       table->status|= STATUS_DELETED;
       if (!(error=table->file->delete_row(table->record[0])))
       {
-	deleted++;
+        deleted++;
+        if (!table->file->has_transactions())
+          thd->transaction.stmt.modified_non_trans_table= TRUE;
         if (table->triggers &&
             table->triggers->process_triggers(thd, TRG_EVENT_DELETE,
                                               TRG_ACTION_AFTER, FALSE))
-	  DBUG_RETURN(1);
+          DBUG_RETURN(1);
       }
       else
       {
-	table->file->print_error(error,MYF(0));
-	DBUG_RETURN(1);
+        table->file->print_error(error,MYF(0));
+        DBUG_RETURN(1);
       }
     }
     else
@@ -705,6 +711,7 @@ void multi_delete::send_error(uint errcode,const char *err)
     error= 1;
     send_eof();
   }
+  DBUG_ASSERT(!normal_tables || !deleted || thd->transaction.stmt.modified_non_trans_table);
   DBUG_VOID_RETURN;
 }
 
@@ -732,6 +739,7 @@ int multi_delete::do_deletes()
   for (; table_being_deleted;
        table_being_deleted= table_being_deleted->next_local, counter++)
   { 
+    ha_rows last_deleted= deleted;
     TABLE *table = table_being_deleted->table;
     if (tempfiles[counter]->get(table))
     {
@@ -769,6 +777,8 @@ int multi_delete::do_deletes()
         break;
       }
     }
+    if (last_deleted != deleted && !table->file->has_transactions())
+      thd->transaction.stmt.modified_non_trans_table= TRUE;
     end_read_record(&info);
     if (thd->killed && !local_error)
       local_error= 1;
@@ -807,7 +817,6 @@ bool multi_delete::send_eof()
   {
     query_cache_invalidate3(thd, delete_tables, 1);
   }
-
   if ((local_error == 0) || (deleted && normal_tables))
   {
     if (mysql_bin_log.is_open())
@@ -819,9 +828,11 @@ bool multi_delete::send_eof()
       if (mysql_bin_log.write(&qinfo) && !normal_tables)
 	local_error=1;  // Log write failed: roll back the SQL statement
     }
-    if (!transactional_tables)
-      thd->no_trans_update.all= TRUE;
+    if (thd->transaction.stmt.modified_non_trans_table)
+      thd->transaction.all.modified_non_trans_table= TRUE;
   }
+  DBUG_ASSERT(!normal_tables || !deleted || thd->transaction.stmt.modified_non_trans_table);
+
   /* Commit or rollback the current SQL statement */
   if (transactional_tables)
     if (ha_autocommit_or_rollback(thd,local_error > 0))
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 5ba1e766947..5edce08e481 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -733,7 +733,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   if (lock_type != TL_WRITE_DELAYED && !thd->prelocked_mode)
     table->file->start_bulk_insert(values_list.elements);
 
-  thd->no_trans_update.stmt= FALSE;
   thd->abort_on_warning= (!ignore && (thd->variables.sql_mode &
                                        (MODE_STRICT_TRANS_TABLES |
                                         MODE_STRICT_ALL_TABLES)));
@@ -907,10 +906,12 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
           if (mysql_bin_log.write(&qinfo) && transactional_table)
             error=1;
         }
-        if (!transactional_table && changed)
-          thd->no_trans_update.all= TRUE;
+        if (thd->transaction.stmt.modified_non_trans_table)
+          thd->transaction.all.modified_non_trans_table= TRUE;
       }
     }
+    DBUG_ASSERT(transactional_table || !changed || 
+                thd->transaction.stmt.modified_non_trans_table);
     if (transactional_table)
       error=ha_autocommit_or_rollback(thd,error);
 
@@ -1311,7 +1312,7 @@ static int last_uniq_key(TABLE *table,uint keynr)
     then both on update triggers will work instead. Similarly both on
     delete triggers will be invoked if we will delete conflicting records.
 
-    Sets thd->no_trans_update.stmt to TRUE if table which is updated didn't have
+    Sets thd->transaction.stmt.modified_non_trans_table to TRUE if table which is updated didn't have
     transactions.
 
   RETURN VALUE
@@ -1478,7 +1479,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
             goto err;
           info->deleted++;
           if (!table->file->has_transactions())
-            thd->no_trans_update.stmt= TRUE;
+            thd->transaction.stmt.modified_non_trans_table= TRUE;
           if (table->triggers &&
               table->triggers->process_triggers(thd, TRG_EVENT_DELETE,
                                                 TRG_ACTION_AFTER, TRUE))
@@ -1510,7 +1511,7 @@ ok_or_after_trg_err:
   if (key)
     my_safe_afree(key,table->s->max_unique_length,MAX_KEY_LENGTH);
   if (!table->file->has_transactions())
-    thd->no_trans_update.stmt= TRUE;
+    thd->transaction.stmt.modified_non_trans_table= TRUE;
   DBUG_RETURN(trg_error);
 
 err:
@@ -2790,7 +2791,6 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   }
   if (info.handle_duplicates == DUP_UPDATE)
     table->file->extra(HA_EXTRA_INSERT_WITH_UPDATE);
-  thd->no_trans_update.stmt= FALSE;
   thd->abort_on_warning= (!info.ignore &&
                           (thd->variables.sql_mode &
                            (MODE_STRICT_TRANS_TABLES |
@@ -2927,7 +2927,8 @@ void select_insert::send_error(uint errcode,const char *err)
 
 bool select_insert::send_eof()
 {
-  int error,error2;
+  int error, error2;
+  bool changed, transactional_table= table->file->has_transactions();
   DBUG_ENTER("select_insert::send_eof");
 
   error= (!thd->prelocked_mode) ? table->file->end_bulk_insert():0;
@@ -2939,12 +2940,14 @@ bool select_insert::send_eof()
     and ha_autocommit_or_rollback
   */
 
-  if (info.copied || info.deleted || info.updated)
+  if (changed= (info.copied || info.deleted || info.updated))
   {
     query_cache_invalidate3(thd, table, 1);
-    if (!(table->file->has_transactions() || table->s->tmp_table))
-      thd->no_trans_update.all= TRUE;
+    if (thd->transaction.stmt.modified_non_trans_table)
+      thd->transaction.all.modified_non_trans_table= TRUE;
   }
+  DBUG_ASSERT(transactional_table || !changed || 
+              thd->transaction.stmt.modified_non_trans_table);
 
   if (last_insert_id)
     thd->insert_id(info.copied ? last_insert_id : 0);		// For binary log
@@ -2954,7 +2957,7 @@ bool select_insert::send_eof()
     if (!error)
       thd->clear_error();
     Query_log_event qinfo(thd, thd->query, thd->query_length,
-			  table->file->has_transactions(), FALSE);
+			  transactional_table, FALSE);
     mysql_bin_log.write(&qinfo);
   }
   if ((error2=ha_autocommit_or_rollback(thd,error)) && ! error)
@@ -2980,6 +2983,7 @@ bool select_insert::send_eof()
 
 void select_insert::abort()
 {
+  bool changed, transactional_table;
   DBUG_ENTER("select_insert::abort");
 
   if (!table)
@@ -2990,6 +2994,7 @@ void select_insert::abort()
     */
     DBUG_VOID_RETURN;
   }
+  transactional_table= table->file->has_transactions();
   if (!thd->prelocked_mode)
     table->file->end_bulk_insert();
   /*
@@ -2998,21 +3003,22 @@ void select_insert::abort()
     error while inserting into a MyISAM table) we must write to the binlog (and
     the error code will make the slave stop).
   */
-  if ((info.copied || info.deleted || info.updated) &&
-      !table->file->has_transactions())
+  if ((changed= info.copied || info.deleted || info.updated) &&
+      !transactional_table)
   {
     if (last_insert_id)
       thd->insert_id(last_insert_id);		// For binary log
     if (mysql_bin_log.is_open())
     {
       Query_log_event qinfo(thd, thd->query, thd->query_length,
-                            table->file->has_transactions(), FALSE);
+                            transactional_table, FALSE);
       mysql_bin_log.write(&qinfo);
     }
-    if (!table->s->tmp_table)
-      thd->no_trans_update.all= TRUE;
+    if (thd->transaction.stmt.modified_non_trans_table)
+      thd->transaction.all.modified_non_trans_table= TRUE;
   }
-  if (info.copied || info.deleted || info.updated)
+  DBUG_ASSERT(transactional_table || !changed || thd->transaction.stmt.modified_non_trans_table);
+  if (changed)
   {
     query_cache_invalidate3(thd, table, 1);
   }
@@ -3259,7 +3265,6 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
     table->file->extra(HA_EXTRA_INSERT_WITH_UPDATE);
   if (!thd->prelocked_mode)
     table->file->start_bulk_insert((ha_rows) 0);
-  thd->no_trans_update.stmt= FALSE;
   thd->abort_on_warning= (!info.ignore &&
                           (thd->variables.sql_mode &
                            (MODE_STRICT_TRANS_TABLES |
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 7b1799baaad..55cbbf1c540 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -377,7 +377,6 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
       table->file->start_bulk_insert((ha_rows) 0);
     table->copy_blobs=1;
 
-    thd->no_trans_update.stmt= FALSE;
     thd->abort_on_warning= (!ignore &&
                             (thd->variables.sql_mode &
                              (MODE_STRICT_TRANS_TABLES |
@@ -411,7 +410,6 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
     ha_autocommit_...
   */
   query_cache_invalidate3(thd, table_list, 0);
-
   if (error)
   {
     if (read_file_from_client)
@@ -466,8 +464,8 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   sprintf(name, ER(ER_LOAD_INFO), (ulong) info.records, (ulong) info.deleted,
 	  (ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
 
-  if (!transactional_table)
-    thd->no_trans_update.all= TRUE;
+  if (thd->transaction.stmt.modified_non_trans_table)
+    thd->transaction.all.modified_non_trans_table= TRUE;
 #ifndef EMBEDDED_LIBRARY
   if (mysql_bin_log.is_open())
   {
@@ -488,6 +486,8 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   /* ok to client sent only after binlog write and engine commit */
   send_ok(thd, info.copied + info.deleted, 0L, name);
 err:
+  DBUG_ASSERT(transactional_table || !(info.copied || info.deleted) ||
+              thd->transaction.stmt.modified_non_trans_table);
   if (thd->lock)
   {
     mysql_unlock_tables(thd, thd->lock);
@@ -532,7 +532,7 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
   Item_field *sql_field;
   TABLE *table= table_list->table;
   ulonglong id;
-  bool no_trans_update_stmt, err;
+  bool err;
   DBUG_ENTER("read_fixed_length");
 
   id= 0;
@@ -560,7 +560,6 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
 #ifdef HAVE_purify
     read_info.row_end[0]=0;
 #endif
-    no_trans_update_stmt= !table->file->has_transactions();
 
     restore_record(table, s->default_values);
     /*
@@ -630,7 +629,6 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
     table->auto_increment_field_not_null= FALSE;
     if (err)
       DBUG_RETURN(1);
-    thd->no_trans_update.stmt= no_trans_update_stmt;
    
     /*
       If auto_increment values are used, save the first one for
@@ -673,12 +671,11 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
   TABLE *table= table_list->table;
   uint enclosed_length;
   ulonglong id;
-  bool no_trans_update_stmt, err;
+  bool err;
   DBUG_ENTER("read_sep_field");
 
   enclosed_length=enclosed.length();
   id= 0;
-  no_trans_update_stmt= !table->file->has_transactions();
 
   for (;;it.rewind())
   {
@@ -821,7 +818,6 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
       We don't need to reset auto-increment field since we are restoring
       its default value at the beginning of each loop iteration.
     */
-    thd->no_trans_update.stmt= no_trans_update_stmt;
     if (read_info.next_line())			// Skip to next line
       break;
     if (read_info.line_cuted)
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index ae3bc0f5597..7d723d3cd5b 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -149,7 +149,7 @@ static bool end_active_trans(THD *thd)
     if (ha_commit(thd))
       error=1;
     thd->options&= ~(ulong) OPTION_BEGIN;
-    thd->no_trans_update.all= FALSE;
+    thd->transaction.all.modified_non_trans_table= FALSE;
   }
   DBUG_RETURN(error);
 }
@@ -173,7 +173,7 @@ static bool begin_trans(THD *thd)
   else
   {
     LEX *lex= thd->lex;
-    thd->no_trans_update.all= FALSE;
+    thd->transaction.all.modified_non_trans_table= FALSE;
     thd->options|= (ulong) OPTION_BEGIN;
     thd->server_status|= SERVER_STATUS_IN_TRANS;
     if (lex->start_transaction_opt & MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT)
@@ -1471,7 +1471,7 @@ int end_trans(THD *thd, enum enum_mysql_completiontype completion)
     thd->server_status&= ~SERVER_STATUS_IN_TRANS;
     res= ha_commit(thd);
     thd->options&= ~(ulong) OPTION_BEGIN;
-    thd->no_trans_update.all= FALSE;
+    thd->transaction.all.modified_non_trans_table= FALSE;
     break;
   case COMMIT_RELEASE:
     do_release= 1; /* fall through */
@@ -1489,7 +1489,7 @@ int end_trans(THD *thd, enum enum_mysql_completiontype completion)
     if (ha_rollback(thd))
       res= -1;
     thd->options&= ~(ulong) OPTION_BEGIN;
-    thd->no_trans_update.all= FALSE;
+    thd->transaction.all.modified_non_trans_table= FALSE;
     if (!res && (completion == ROLLBACK_AND_CHAIN))
       res= begin_trans(thd);
     break;
@@ -2600,6 +2600,8 @@ mysql_execute_command(THD *thd)
     statistic_increment(thd->status_var.com_stat[lex->sql_command],
                         &LOCK_status);
 
+  DBUG_ASSERT(thd->transaction.stmt.modified_non_trans_table == FALSE);
+  
   switch (lex->sql_command) {
   case SQLCOM_SELECT:
   {
@@ -2937,7 +2939,7 @@ mysql_execute_command(THD *thd)
     else 
     {
       /* So that CREATE TEMPORARY TABLE gets to binlog at commit/rollback */
-      thd->no_trans_update.all= TRUE;
+      thd->transaction.all.modified_non_trans_table= TRUE;
     }
     DBUG_ASSERT(first_table == all_tables && first_table != 0);
     bool link_to_local;
@@ -3720,7 +3722,7 @@ end_with_restore_list:
         lex->drop_if_exists= 1;
 
       /* So that DROP TEMPORARY TABLE gets to binlog at commit/rollback */
-      thd->no_trans_update.all= TRUE;
+      thd->transaction.all.modified_non_trans_table= TRUE;
     }
     /* DDL and binlog write order protected by LOCK_open */
     res= mysql_rm_table(thd, first_table, lex->drop_if_exists,
@@ -4322,7 +4324,7 @@ end_with_restore_list:
         res= TRUE; // cannot happen
       else
       {
-        if (thd->no_trans_update.all &&
+        if (thd->transaction.all.modified_non_trans_table &&
             !thd->slave_thread)
           push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                        ER_WARNING_NOT_COMPLETE_ROLLBACK,
@@ -4969,7 +4971,7 @@ create_sp_error:
     thd->transaction.xid_state.xa_state=XA_ACTIVE;
     thd->transaction.xid_state.xid.set(thd->lex->xid);
     xid_cache_insert(&thd->transaction.xid_state);
-    thd->no_trans_update.all= FALSE;
+    thd->transaction.all.modified_non_trans_table= FALSE;
     thd->options|= (ulong) OPTION_BEGIN;
     thd->server_status|= SERVER_STATUS_IN_TRANS;
     send_ok(thd);
@@ -5064,7 +5066,7 @@ create_sp_error:
       break;
     }
     thd->options&= ~(ulong) OPTION_BEGIN;
-    thd->no_trans_update.all= FALSE;
+    thd->transaction.all.modified_non_trans_table= FALSE;
     thd->server_status&= ~SERVER_STATUS_IN_TRANS;
     xid_cache_delete(&thd->transaction.xid_state);
     thd->transaction.xid_state.xa_state=XA_NOTR;
@@ -5095,7 +5097,7 @@ create_sp_error:
     else
       send_ok(thd);
     thd->options&= ~(ulong) OPTION_BEGIN;
-    thd->no_trans_update.all= FALSE;
+    thd->transaction.all.modified_non_trans_table= FALSE;
     thd->server_status&= ~SERVER_STATUS_IN_TRANS;
     xid_cache_delete(&thd->transaction.xid_state);
     thd->transaction.xid_state.xa_state=XA_NOTR;
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 7db79543016..d83100aa439 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4091,7 +4091,6 @@ copy_data_between_tables(TABLE *from,TABLE *to,
   alter_table_manage_keys(to, from->file->indexes_are_disabled(), keys_onoff);
 
   /* We can abort alter table for any table type */
-  thd->no_trans_update.stmt= FALSE;
   thd->abort_on_warning= !ignore && test(thd->variables.sql_mode &
                                          (MODE_STRICT_TRANS_TABLES |
                                           MODE_STRICT_ALL_TABLES));
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index f4239afc4cd..e20647dc808 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -430,7 +430,6 @@ int mysql_update(THD *thd,
   query_id=thd->query_id;
 
   transactional_table= table->file->has_transactions();
-  thd->no_trans_update.stmt= FALSE;
   thd->abort_on_warning= test(!ignore &&
                               (thd->variables.sql_mode &
                                (MODE_STRICT_TRANS_TABLES |
@@ -487,7 +486,6 @@ int mysql_update(THD *thd,
                                             (byte*) table->record[0])))
         {
           updated++;
-          thd->no_trans_update.stmt= !transactional_table;
           
           if (table->triggers &&
               table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
@@ -522,6 +520,10 @@ int mysql_update(THD *thd,
     thd->row_count++;
   }
 
+  if (!transactional_table && updated > 0)
+    thd->transaction.stmt.modified_non_trans_table= TRUE;
+
+
   /*
     todo bug#27571: to avoid asynchronization of `error' and
     `error_code' of binlog event constructor
@@ -589,9 +591,10 @@ int mysql_update(THD *thd,
       if (mysql_bin_log.write(&qinfo) && transactional_table)
 	error=1;				// Rollback update
     }
-    if (!transactional_table)
-      thd->no_trans_update.all= TRUE;
+    if (thd->transaction.stmt.modified_non_trans_table)
+      thd->transaction.all.modified_non_trans_table= TRUE;
   }
+  DBUG_ASSERT(transactional_table || !updated || thd->transaction.stmt.modified_non_trans_table);
   free_underlaid_joins(thd, select_lex);
   if (transactional_table)
   {
@@ -955,7 +958,6 @@ bool mysql_multi_update(THD *thd,
 				 handle_duplicates, ignore)))
     DBUG_RETURN(TRUE);
 
-  thd->no_trans_update.stmt= FALSE;
   thd->abort_on_warning= test(thd->variables.sql_mode &
                               (MODE_STRICT_TRANS_TABLES |
                                MODE_STRICT_ALL_TABLES));
@@ -1331,9 +1333,7 @@ multi_update::~multi_update()
   if (copy_field)
     delete [] copy_field;
   thd->count_cuted_fields= CHECK_FIELD_IGNORE;		// Restore this setting
-  if (!trans_safe)  // todo: remove since redundant
-    thd->no_trans_update.all= TRUE;
-  DBUG_ASSERT(trans_safe || thd->no_trans_update.all);
+  DBUG_ASSERT(trans_safe || thd->transaction.all.modified_non_trans_table);
 }
 
 
@@ -1426,7 +1426,7 @@ bool multi_update::send_data(List<Item> &not_used_values)
           else
           {
             trans_safe= 0;
-            thd->no_trans_update.stmt= TRUE;
+            thd->transaction.stmt.modified_non_trans_table= TRUE;
           }
           if (table->triggers &&
               table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
@@ -1489,7 +1489,6 @@ void multi_update::send_error(uint errcode,const char *err)
 
   /* Something already updated so we have to invalidate cache */
   query_cache_invalidate3(thd, update_tables, 1);
-
   /*
     If all tables that has been updated are trans safe then just do rollback.
     If not attempt to do remaining updates.
@@ -1502,7 +1501,7 @@ void multi_update::send_error(uint errcode,const char *err)
   }
   else
   { 
-    DBUG_ASSERT(thd->no_trans_update.stmt);
+    DBUG_ASSERT(thd->transaction.stmt.modified_non_trans_table);
     if (do_update && table_count > 1)
     {
       /* Add warning here */
@@ -1513,7 +1512,7 @@ void multi_update::send_error(uint errcode,const char *err)
       VOID(do_updates(0));
     }
   }
-  if (thd->no_trans_update.stmt)
+  if (thd->transaction.stmt.modified_non_trans_table)
   {
     /*
       The query has to binlog because there's a modified non-transactional table
@@ -1526,9 +1525,9 @@ void multi_update::send_error(uint errcode,const char *err)
       mysql_bin_log.write(&qinfo);
     }
     if (!trans_safe)
-      thd->no_trans_update.all= TRUE;
+      thd->transaction.all.modified_non_trans_table= TRUE;
   }
-  DBUG_ASSERT(trans_safe || !updated || thd->no_trans_update.stmt);
+  DBUG_ASSERT(trans_safe || !updated || thd->transaction.stmt.modified_non_trans_table);
   
   if (transactional_tables)
   {
@@ -1664,7 +1663,7 @@ int multi_update::do_updates(bool from_send_error)
       else
       {
         trans_safe= 0;				// Can't do safe rollback
-        thd->no_trans_update.stmt= TRUE;
+        thd->transaction.stmt.modified_non_trans_table= TRUE;
       }
     }
     (void) table->file->ha_rnd_end();
@@ -1697,7 +1696,7 @@ err2:
     else
     {
       trans_safe= 0;
-      thd->no_trans_update.stmt= TRUE;
+      thd->transaction.stmt.modified_non_trans_table= TRUE;
     }
   }
   DBUG_RETURN(1);
@@ -1722,7 +1721,6 @@ bool multi_update::send_eof()
   {
     query_cache_invalidate3(thd, update_tables, 1);
   }
-
   /*
     Write the SQL statement to the binlog if we updated
     rows and we succeeded or if we updated some non
@@ -1732,8 +1730,9 @@ bool multi_update::send_eof()
     either from the query's list or via a stored routine: bug#13270,23333
   */
 
-  DBUG_ASSERT(trans_safe || !updated || thd->no_trans_update.stmt);
-  if (local_error == 0 || thd->no_trans_update.stmt)
+  DBUG_ASSERT(trans_safe || !updated || 
+              thd->transaction.stmt.modified_non_trans_table);
+  if (local_error == 0 || thd->transaction.stmt.modified_non_trans_table)
   {
     if (mysql_bin_log.is_open())
     {
@@ -1746,8 +1745,8 @@ bool multi_update::send_eof()
       if (mysql_bin_log.write(&qinfo) && trans_safe)
         local_error= 1;				// Rollback update
     }
-    if (!trans_safe)
-      thd->no_trans_update.all= TRUE;
+    if (thd->transaction.stmt.modified_non_trans_table)
+      thd->transaction.all.modified_non_trans_table= TRUE;
   }
 
   if (transactional_tables)

From 77edfb16e8a699d87694a7b3aff95118c5104d83 Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Mon, 30 Jul 2007 21:05:56 +0500
Subject: [PATCH 108/139] bigint.test:   Fixing a typo in the test case.

mysql-test/t/bigint.test:
  Fixing a typo in the test case.
---
 mysql-test/t/bigint.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/t/bigint.test b/mysql-test/t/bigint.test
index 4aef7395184..002dfad9981 100644
--- a/mysql-test/t/bigint.test
+++ b/mysql-test/t/bigint.test
@@ -307,6 +307,6 @@ select -(9223372036854775808);
 select -((9223372036854775808));
 select -(-(9223372036854775808));
 --disable_metadata
---endble_ps_protocol
+--enable_ps_protocol
 select --9223372036854775808, ---9223372036854775808, ----9223372036854775808;
 select -(-9223372036854775808), -(-(-9223372036854775808));

From d9037b26e492a1bf56fcacb2358caa5850d0cc32 Mon Sep 17 00:00:00 2001
From: unknown <serg@janus.mylan>
Date: Mon, 30 Jul 2007 19:56:02 +0200
Subject: [PATCH 109/139] handler::ha_write_row_no_binlog() hack removed,
 existing table->no_replicate code is used instead

---
 sql/handler.cc  | 13 -------------
 sql/handler.h   |  1 -
 sql/log.cc      |  4 ++--
 sql/sql_base.cc |  1 +
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index c4abfeea0a8..0da56350de5 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -3654,19 +3654,6 @@ int handler::ha_write_row(uchar *buf)
 }
 
 
-/**
-  Write a record to the engine bypassing row-level binary logging.
-  This method is used internally by the server for writing to
-  performance schema tables, which are never replicated.
-  TODO: Merge this function with ha_write_row(), and provide a way
-  to disable the binlog there.
-*/
-int handler::ha_write_row_no_binlog(uchar *buf)
-{
-  return write_row(buf);
-}
-
-
 int handler::ha_update_row(const uchar *old_data, uchar *new_data)
 {
   int error;
diff --git a/sql/handler.h b/sql/handler.h
index 06f0a2cf035..1992af5b1ad 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1158,7 +1158,6 @@ public:
    */
   int ha_external_lock(THD *thd, int lock_type);
   int ha_write_row(uchar * buf);
-  int ha_write_row_no_binlog(uchar * buf);
   int ha_update_row(const uchar * old_data, uchar * new_data);
   int ha_delete_row(const uchar * buf);
 
diff --git a/sql/log.cc b/sql/log.cc
index c7a8037d4b5..4ca7e9d31fd 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -409,7 +409,7 @@ bool Log_to_csv_event_handler::
   }
 
   /* log table entries are not replicated */
-  if (table->file->ha_write_row_no_binlog(table->record[0]))
+  if (table->file->ha_write_row(table->record[0]))
   {
     struct tm start;
     localtime_r(&event_time, &start);
@@ -612,7 +612,7 @@ bool Log_to_csv_event_handler::
     goto err;
 
   /* log table entries are not replicated */
-  if (table->file->ha_write_row_no_binlog(table->record[0]))
+  if (table->file->ha_write_row(table->record[0]))
   {
     struct tm start;
     localtime_r(&current_time, &start);
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 5b63eac35dd..b471ff8a108 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -7716,6 +7716,7 @@ open_performance_schema_table(THD *thd, TABLE_LIST *one_table,
     DBUG_ASSERT(table->s->table_category == TABLE_CATEGORY_PERFORMANCE);
     /* Make sure all columns get assigned to a default value */
     table->use_all_columns();
+    table->no_replicate= 1;
   }
 
   DBUG_RETURN(table);

From 8d0526a82df90407578dfac4d57321d03f65a6f6 Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com/kent-amd64.(none)>
Date: Mon, 30 Jul 2007 20:40:49 +0200
Subject: [PATCH 110/139] my_pthread.c:   Backport of correction for Mac OS X
 build problem, global variable not   initiated is "common" and can't be used
 in shared libraries, unless   special flags are used (bug#26218)

mysys/my_pthread.c:
  Backport of correction for Mac OS X build problem, global variable not
  initiated is "common" and can't be used in shared libraries, unless
  special flags are used (bug#26218)
---
 mysys/my_pthread.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index 14ba6aabf0e..50c0a82d2d8 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -30,7 +30,7 @@
 #define SCHED_POLICY SCHED_OTHER
 #endif
 
-uint thd_lib_detected;
+uint thd_lib_detected= 0;
 
 #ifndef my_pthread_setprio
 void my_pthread_setprio(pthread_t thread_id,int prior)

From 16ff419b8ae86ccbf017d19ee00141e3e1c05988 Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com/kent-amd64.(none)>
Date: Mon, 30 Jul 2007 21:09:45 +0200
Subject: [PATCH 111/139] Generate "config.h" directly into the "include"
 directory, later copied to "my_config.h". Not to pollute the top directory,
 and to get more control over what is included. Made the include path for
 "libedit" pick up its own "config.h" first.

config/ac-macros/misc.m4:
  aclocal in automake 1.8 can't handle AC_REQUIRE on
  a user macro defined in the same included file.
cmd-line-utils/libedit/Makefile.am:
  Changed include path so that current directory is taken first, as there
  is a "config.h" there with the same name as the one in top "include".
configure.in:
  Generate "config.h" directly into "include", don't pollute top directory
include/Makefile.am:
  Copy "config.h" from current directory to "my_config.h", added note in
  the make file why there are two identical files with different name.
scripts/make_binary_distribution.sh:
  Removed copy of "config.h" from top directory, it is in "include" in a
  source tree.
---
 cmd-line-utils/libedit/Makefile.am  | 4 ++--
 config/ac-macros/misc.m4            | 1 -
 configure.in                        | 2 +-
 include/Makefile.am                 | 7 +++++--
 scripts/make_binary_distribution.sh | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am
index ae6755f1c5c..b7611193aea 100644
--- a/cmd-line-utils/libedit/Makefile.am
+++ b/cmd-line-utils/libedit/Makefile.am
@@ -5,8 +5,8 @@
 ASRC =			$(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
 AHDR =			vi.h emacs.h common.h
 
-INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
-			-I$(srcdir)/../.. -I..
+# Make sure to include stuff from this directory first, to get right "config.h"
+INCLUDES =		-I. -I$(top_builddir)/include -I$(top_srcdir)/include
 
 noinst_LIBRARIES =	libedit.a
 
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
index 09081fb3eac..60c0469e449 100644
--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -763,7 +763,6 @@ AC_SUBST(CXX_VERSION)
 ])
 
 AC_DEFUN([MYSQL_PROG_AR], [
-AC_REQUIRE([MYSQL_CHECK_CXX_VERSION])
 case $CXX_VERSION in
   MIPSpro*)
     AR=$CXX
diff --git a/configure.in b/configure.in
index 843837b9348..3db6d0bfb8d 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
 AM_INIT_AUTOMAKE(mysql, 5.0.48)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10
 DOT_FRM_VERSION=6
diff --git a/include/Makefile.am b/include/Makefile.am
index 2cd72052a15..c856b6398fe 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -49,8 +49,11 @@ link_sources:
 	@readline_h_ln_cmd@
 	@yassl_h_ln_cmd@
 
-my_config.h: ../config.h
-	$(CP) ../config.h my_config.h
+# We want both "my_config.h" and "config.h" that are identical, as
+# MySQL sources assumes the name "my_config.h", and 3rd party sources
+# assumes the name "config.h".
+my_config.h: config.h
+	$(CP) config.h my_config.h
 
 # These files should not be included in distributions since they are
 # generated by configure from the .h.in files
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index dab1bbec956..a87bb03526d 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -257,7 +257,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
     rm -f $BASE/lib/*.la
 fi
 
-copyfileto $BASE/include config.h include/*
+copyfileto $BASE/include include/*
 
 rm -f $BASE/include/Makefile* $BASE/include/*.in $BASE/include/config-win.h
 if [ $BASE_SYSTEM != "netware" ] ; then

From b635b2861f355844dfd5bac4d9400e0fbac9804b Mon Sep 17 00:00:00 2001
From: unknown <tsmith@ramayana.hindu.god>
Date: Mon, 30 Jul 2007 13:35:36 -0600
Subject: [PATCH 112/139] mysqld_safe.sh:   Post-review fix, if 'logger' can't
 be found, and --syslog is requested, exit with error message instead of fall
 back to logging to error file.

scripts/mysqld_safe.sh:
  Post-review fix, if 'logger' can't be found, and --syslog is requested, exit with error message instead of fall back to logging to error file.
---
 scripts/mysqld_safe.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 2a592a6fbf5..e6f7ff7b3cb 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -302,8 +302,8 @@ then
   my_which logger > /dev/null 2>&1
   if [ $? -ne 0 ]
   then
-    log_error "--syslog requested, but no 'logger' program found."
-    want_syslog=0
+    log_error "--syslog requested, but no 'logger' program found.  Please ensure that 'logger' is in your PATH, or do not specify the --syslog option to mysqld_safe."
+    exit 1
   fi
 fi
 

From 7a47324e11dc96fe127025c9b49149d693e96c5c Mon Sep 17 00:00:00 2001
From: unknown <malff/marcsql@weblab.(none)>
Date: Mon, 30 Jul 2007 23:01:44 -0600
Subject: [PATCH 113/139] Fixed ressource leak when activation of LOGGER
 failed.

---
 sql/log.cc | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/sql/log.cc b/sql/log.cc
index c7a8037d4b5..44804e09b38 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1096,37 +1096,46 @@ void LOGGER::init_general_log(uint general_log_printer)
 
 bool LOGGER::activate_log_handler(THD* thd, uint log_type)
 {
+  MYSQL_QUERY_LOG *file_log;
   bool res= FALSE;
   lock_exclusive();
   switch (log_type) {
   case QUERY_LOG_SLOW:
     if (!opt_slow_log)
     {
-      file_log_handler->get_mysql_slow_log()->
-        open_slow_log(sys_var_slow_log_path.value);
-      init_slow_log(log_output_options);
+      file_log= file_log_handler->get_mysql_slow_log();
+
+      file_log->open_slow_log(sys_var_slow_log_path.value);
       if (table_log_handler->activate_log(thd, QUERY_LOG_SLOW))
       {
         /* Error printed by open table in activate_log() */
         res= TRUE;
+        file_log->close(0);
       }
       else
+      {
+        init_slow_log(log_output_options);
         opt_slow_log= TRUE;
+      }
     }
     break;
   case QUERY_LOG_GENERAL:
     if (!opt_log)
     {
-      file_log_handler->get_mysql_log()->
-        open_query_log(sys_var_general_log_path.value);
-      init_general_log(log_output_options);
+      file_log= file_log_handler->get_mysql_log();
+
+      file_log->open_query_log(sys_var_general_log_path.value);
       if (table_log_handler->activate_log(thd, QUERY_LOG_GENERAL))
       {
         /* Error printed by open table in activate_log() */
         res= TRUE;
+        file_log->close(0);
       }
       else
+      {
+        init_general_log(log_output_options);
         opt_log= TRUE;
+      }
     }
     break;
   default:

From 791584ae0d57ce1f31b4652c1dd9cb4edee8526e Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Tue, 31 Jul 2007 10:46:04 +0500
Subject: [PATCH 114/139] Bug #29717 INSERT INTO SELECT inserts values even if 
 SELECT statement itself returns empty.

As a result of this bug 'SELECT AGGREGATE_FUNCTION(fld) ... GROUP BY'
can return one row instead of an empty result set.

When GROUP BY only has fields of constant tables
(with a single row), the optimizer deletes the group_list.
After that we lose the information about whether we had an
GROUP BY statement. Though it's important
as SELECT min(x) from empty_table; and
   SELECT min(x) from empty_table GROUP BY y; have to return
different results - the first query should return one row,
second - an empty result set.
So here we add the 'group_optimized_away' flag to remember this case
when GROUP BY exists in the query and is removed
by the optimizer, and check this flag in end_send_group()


mysql-test/r/group_by.result:
  Bug #29717 INSERT INTO SELECT inserts values even if
   SELECT statement itself returns empty.

  test result
mysql-test/r/insert_select.result:
  Bug #29717 INSERT INTO SELECT inserts values even if
   SELECT statement itself returns empty.

  test result
mysql-test/t/group_by.test:
  Bug #29717 INSERT INTO SELECT inserts values even if
   SELECT statement itself returns empty.

  This is additional testcase that is more basic than the
  original bug's testcase and has the same reason.
mysql-test/t/insert_select.test:
  Bug #29717 INSERT INTO SELECT inserts values even if
   SELECT statement itself returns empty.

  test case
sql/sql_select.cc:
  Bug #29717 INSERT INTO SELECT inserts values even if
   SELECT statement itself returns empty.

  Remember the 'GROUP BY was optimized away' case in the JOIN::group_optimized
  and check this in the end_send_group()
sql/sql_select.h:
  Bug #29717 INSERT INTO SELECT inserts values even if
   SELECT statement itself returns empty.

  JOIN::group_optimized member added to remember the 'GROUP BY optimied away'
  case
---
 mysql-test/r/group_by.result      | 17 +++++++++++++++++
 mysql-test/r/insert_select.result | 26 ++++++++++++++++++++++++++
 mysql-test/t/group_by.test        | 23 +++++++++++++++++++++++
 mysql-test/t/insert_select.test   | 28 ++++++++++++++++++++++++++++
 sql/sql_select.cc                 |  4 +++-
 sql/sql_select.h                  |  9 +++++++++
 6 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index 61b73dc7005..f717c16742f 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -818,3 +818,20 @@ a
 2
 1
 DROP TABLE t1;
+CREATE TABLE t1 (
+f1 int(10) unsigned NOT NULL auto_increment primary key,
+f2 varchar(100) NOT NULL default ''
+);
+CREATE TABLE t2 (
+f1 varchar(10) NOT NULL default '',
+f2 char(3) NOT NULL default '',
+PRIMARY KEY  (`f1`),
+KEY `k1` (`f2`,`f1`)
+);
+INSERT INTO t1 values(NULL, '');
+INSERT INTO `t2` VALUES ('486878','WDT'),('486910','WDT');
+SELECT SQL_BUFFER_RESULT avg(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+avg(t2.f1)
+SELECT avg(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+avg(t2.f1)
+DROP TABLE t1, t2;
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
index 1d7aef256e1..601eb2aa0bc 100644
--- a/mysql-test/r/insert_select.result
+++ b/mysql-test/r/insert_select.result
@@ -690,3 +690,29 @@ CREATE TABLE t1 (a int PRIMARY KEY);
 INSERT INTO t1 values (1), (2);
 INSERT INTO t1 SELECT a + 2 FROM t1 LIMIT 1;
 DROP TABLE t1;
+CREATE TABLE t1 (
+f1 int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+f2 varchar(100) NOT NULL default ''
+);
+CREATE TABLE t2 (
+f1 varchar(10) NOT NULL default '',
+f2 char(3) NOT NULL default '',
+PRIMARY KEY  (`f1`),
+KEY `k1` (`f2`, `f1`)
+);
+INSERT INTO t1 values(NULL, '');
+INSERT INTO `t2` VALUES ('486878','WDT'),('486910','WDT');
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+1
+SELECT min(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+min(t2.f1)
+INSERT INTO t1 (f2)
+SELECT min(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+1
+SELECT * FROM t1;
+f1	f2
+1	
+DROP TABLE t1, t2;
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index 064d46aa0c0..180299f7f4a 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -633,4 +633,27 @@ SELECT a FROM t1 ORDER BY 'a' DESC;
 SELECT a FROM t1 ORDER BY "a" DESC;
 SELECT a FROM t1 ORDER BY `a` DESC;
 DROP TABLE t1;
+
+
+#
+# Bug #29717 INSERT INTO SELECT inserts values even if SELECT statement itself
+# returns empty
+# 
+CREATE TABLE t1 (
+    f1 int(10) unsigned NOT NULL auto_increment primary key,
+    f2 varchar(100) NOT NULL default ''
+);
+CREATE TABLE t2 (
+    f1 varchar(10) NOT NULL default '',
+    f2 char(3) NOT NULL default '',
+    PRIMARY KEY  (`f1`),
+    KEY `k1` (`f2`,`f1`)
+);
+
+INSERT INTO t1 values(NULL, '');
+INSERT INTO `t2` VALUES ('486878','WDT'),('486910','WDT');
+SELECT SQL_BUFFER_RESULT avg(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+SELECT avg(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+DROP TABLE t1, t2;
+
 # End of 4.1 tests
diff --git a/mysql-test/t/insert_select.test b/mysql-test/t/insert_select.test
index fcea489fcff..dfb313706dd 100644
--- a/mysql-test/t/insert_select.test
+++ b/mysql-test/t/insert_select.test
@@ -239,4 +239,32 @@ INSERT INTO t1 SELECT a + 2 FROM t1 LIMIT 1;
 
 DROP TABLE t1;
 
+#
+# Bug #29717 INSERT INTO SELECT inserts values even if SELECT statement itself returns empty
+#
+
+CREATE TABLE t1 (
+    f1 int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+    f2 varchar(100) NOT NULL default ''
+);
+CREATE TABLE t2 (
+    f1 varchar(10) NOT NULL default '',
+    f2 char(3) NOT NULL default '',
+    PRIMARY KEY  (`f1`),
+    KEY `k1` (`f2`, `f1`)
+);
+
+INSERT INTO t1 values(NULL, '');
+INSERT INTO `t2` VALUES ('486878','WDT'),('486910','WDT');
+SELECT COUNT(*) FROM t1;
+
+SELECT min(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+
+INSERT INTO t1 (f2)
+  SELECT min(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+
+SELECT COUNT(*) FROM t1;
+SELECT * FROM t1;
+DROP TABLE t1, t2;
+
 # End of 4.1 tests
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8b5664a7f96..8f0ad359f43 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -777,6 +777,7 @@ JOIN::optimize()
     order=0;					// The output has only one row
     simple_order=1;
     select_distinct= 0;                       // No need in distinct for 1 row
+    group_optimized_away= 1;
   }
 
   calc_group_buffer(this, group_list);
@@ -6896,7 +6897,8 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
   if (!join->first_record || end_of_records ||
       (idx=test_if_group_changed(join->group_fields)) >= 0)
   {
-    if (join->first_record || (end_of_records && !join->group))
+    if (join->first_record || 
+        (end_of_records && !join->group && !join->group_optimized_away))
     {
       if (join->procedure)
 	join->procedure->end_group();
diff --git a/sql/sql_select.h b/sql/sql_select.h
index c61ef4fb92b..6227d6d2cc5 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -180,6 +180,14 @@ class JOIN :public Sql_alloc
   ROLLUP rollup;				// Used with rollup
 
   bool select_distinct;				// Set if SELECT DISTINCT
+  /*
+    If we have the GROUP BY statement in the query,
+    but the group_list was emptied by optimizer, this
+    flag is TRUE.
+    It happens when fields in the GROUP BY are from
+    constant table
+  */
+  bool group_optimized_away;
 
   /*
     simple_xxxxx is set if ORDER/GROUP BY doesn't include any references
@@ -276,6 +284,7 @@ class JOIN :public Sql_alloc
     ref_pointer_array_size= 0;
     zero_result_cause= 0;
     optimized= 0;
+    group_optimized_away= 0;
 
     fields_list= fields_arg;
     bzero((char*) &keyuse,sizeof(keyuse));

From 210243480cf0506809d28dd7502f73628483cd8b Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Tue, 31 Jul 2007 11:10:03 +0500
Subject: [PATCH 115/139] merging

---
 mysql-test/r/group_by.result      | 17 +++++++++++++++++
 mysql-test/r/insert_select.result | 26 ++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index 88f635595d6..d4ffbe43a91 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -824,6 +824,23 @@ a
 2
 1
 DROP TABLE t1;
+CREATE TABLE t1 (
+f1 int(10) unsigned NOT NULL auto_increment primary key,
+f2 varchar(100) NOT NULL default ''
+);
+CREATE TABLE t2 (
+f1 varchar(10) NOT NULL default '',
+f2 char(3) NOT NULL default '',
+PRIMARY KEY  (`f1`),
+KEY `k1` (`f2`,`f1`)
+);
+INSERT INTO t1 values(NULL, '');
+INSERT INTO `t2` VALUES ('486878','WDT'),('486910','WDT');
+SELECT SQL_BUFFER_RESULT avg(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+avg(t2.f1)
+SELECT avg(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+avg(t2.f1)
+DROP TABLE t1, t2;
 create table t1 (c1 char(3), c2 char(3));
 create table t2 (c3 char(3), c4 char(3));
 insert into t1 values ('aaa', 'bb1'), ('aaa', 'bb2');
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
index 8cb94072818..d16562d97e2 100644
--- a/mysql-test/r/insert_select.result
+++ b/mysql-test/r/insert_select.result
@@ -699,6 +699,32 @@ Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	1
 DROP TABLE t1;
+CREATE TABLE t1 (
+f1 int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+f2 varchar(100) NOT NULL default ''
+);
+CREATE TABLE t2 (
+f1 varchar(10) NOT NULL default '',
+f2 char(3) NOT NULL default '',
+PRIMARY KEY  (`f1`),
+KEY `k1` (`f2`, `f1`)
+);
+INSERT INTO t1 values(NULL, '');
+INSERT INTO `t2` VALUES ('486878','WDT'),('486910','WDT');
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+1
+SELECT min(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+min(t2.f1)
+INSERT INTO t1 (f2)
+SELECT min(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+1
+SELECT * FROM t1;
+f1	f2
+1	
+DROP TABLE t1, t2;
 CREATE TABLE t1 (x int, y int);
 CREATE TABLE t2 (z int, y int);
 CREATE TABLE t3 (a int, b int);

From 124ad9c6403eaf43086ac28426a89ee6df9729fb Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Tue, 31 Jul 2007 13:22:01 +0500
Subject: [PATCH 116/139] sql_yacc.yy, sp.result, disabled.def:   Post-merge
 fix.

mysql-test/t/disabled.def:
  Post-merge fix.
mysql-test/r/sp.result:
  Post-merge fix.
sql/sql_yacc.yy:
  Post-merge fix.
---
 mysql-test/r/sp.result    | 8 ++++----
 mysql-test/t/disabled.def | 1 -
 sql/sql_yacc.yy           | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 4ac88b995dd..ebdab4a3f89 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -6431,7 +6431,7 @@ select 1;
 select 3;
  select 4; 
 
-end	utf8	utf8_general_ci	latin1_swedish_ci
+end	latin1	latin1_swedish_ci	latin1_swedish_ci
 call proc_25411_a();
 1
 1
@@ -6451,7 +6451,7 @@ proc_25411_b		CREATE DEFINER=`root`@`localhost` PROCEDURE `proc_25411_b`(
 )
 begin
 select p1, p2;
-end	utf8	utf8_general_ci	latin1_swedish_ci
+end	latin1	latin1_swedish_ci	latin1_swedish_ci
 select name, param_list, body from mysql.proc where name like "%25411%";
 name	param_list	body
 proc_25411_a		begin
@@ -6489,7 +6489,7 @@ select 1 ,2 ,3;
 select 1,2 ,3 ;
 select 1 ,2  ,3 ;
 select 1 ,2 ,3  ;
-end	utf8	utf8_general_ci	latin1_swedish_ci
+end	latin1	latin1_swedish_ci	latin1_swedish_ci
 call proc_25411_c();
 1	2	3
 1	2	3
@@ -6510,7 +6510,7 @@ select 1 /* testing */;
 show create procedure proc_26302;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
 proc_26302		CREATE DEFINER=`root`@`localhost` PROCEDURE `proc_26302`()
-select 1 /* testing */	utf8	utf8_general_ci	latin1_swedish_ci
+select 1 /* testing */	latin1	latin1_swedish_ci	latin1_swedish_ci
 select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES
 where ROUTINE_NAME = "proc_26302";
 ROUTINE_NAME	ROUTINE_DEFINITION
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index fff651e54c9..368a659d939 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -25,4 +25,3 @@ ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Do
 
 mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
 federated_transactions   : Bug#29523 Transactions do not work
-ddl_i18n_koi8r           : Bug #30120 SP with local variables with non-ASCII names crashes server
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 5d665d5a6a2..855c8dede5f 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -9506,7 +9506,7 @@ simple_ident:
             splocal= new Item_splocal($1, spv->offset, spv->type,
                                       lip->get_tok_start_prev() -
                                       lex->sphead->m_tmp_query,
-                                      lip->tok_end - lip->tok_start_prev);
+                                      lip->get_tok_end() - lip->get_tok_start_prev());
 #ifndef DBUG_OFF
             if (splocal)
               splocal->m_sp= lex->sphead;

From 8a68e7d2dc67f9725325bb55ab451806b1f7ce7c Mon Sep 17 00:00:00 2001
From: unknown <sergefp@mysql.com>
Date: Tue, 31 Jul 2007 15:19:06 +0400
Subject: [PATCH 117/139] BUG#29582: huge memory consumption with union,
 subselect, joins: - Don't call mysql_select() several times for the select
 that enumerates   a temporary table with the results of the UNION. Making
 this call for   every subquery execution caused
 O(#enumerated-rows-in-the-outer-query)   memory allocations. - Instead, call
 join->reinit() and join->exec(), and   = disable constant table detection for
 such joins,   = provide special handling for table-less constant subqueries.

sql/sql_select.cc:
  BUG#29582: huge memory consumption with union, subselect, joins:
   - Don't mark tables as constant if JOIN::no_const_tables flag is set
sql/sql_select.h:
  BUG#29582: huge memory consumption with union, subselect, joins:
   - Don't mark tables as constant if JOIN::no_const_tables flag is set
sql/sql_union.cc:
  BUG#29582: huge memory consumption with union, subselect, joins:
  - Don't call mysql_select() several times for the select that enumerates
    a temporary table with UNION results.
  - Instead, call join->reinit() and join->exec().
  - Provide special handling for table-less constant subqueries.
---
 sql/sql_select.cc |  2 +-
 sql/sql_select.h  | 10 +++++++++
 sql/sql_union.cc  | 57 +++++++++++++++++++++++++++++++++--------------
 3 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c62a19b2752..ebc48c2967c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2416,7 +2416,7 @@ make_join_statistics(JOIN *join, TABLE_LIST *tables, COND *conds,
 
     if ((table->s->system || table->file->records <= 1) && ! s->dependent &&
 	!(table->file->table_flags() & HA_NOT_EXACT_COUNT) &&
-        !table->fulltext_searched)
+        !table->fulltext_searched && !join->no_const_tables)
     {
       set_position(join,const_count++,s,(KEYUSE*) 0);
     }
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 4f9f6e9ed48..5be4f111bef 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -277,6 +277,14 @@ public:
   SELECT_LEX_UNIT *unit;
   // select that processed
   SELECT_LEX *select_lex;
+  /* 
+    TRUE <=> optimizer must not mark any table as a constant table.
+    This is needed for subqueries in form "a IN (SELECT .. UNION SELECT ..):
+    when we optimize the select that reads the results of the union from a
+    temporary table, we must not mark the temp. table as constant because
+    the number of rows in it may vary from one subquery execution to another.
+  */
+  bool no_const_tables; 
   
   JOIN *tmp_join; // copy of this JOIN to be used with temporary tables
   ROLLUP rollup;				// Used with rollup
@@ -397,6 +405,8 @@ public:
     tmp_table_param.init();
     tmp_table_param.end_write_records= HA_POS_ERROR;
     rollup.state= ROLLUP::STATE_NONE;
+
+    no_const_tables= FALSE;
   }
 
   int prepare(Item ***rref_pointer_array, TABLE_LIST *tables, uint wind_num,
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 373b03d45e6..16c4eeab4bb 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -545,6 +545,10 @@ bool st_select_lex_unit::exec()
 	/*
 	  allocate JOIN for fake select only once (prevent
 	  mysql_select automatic allocation)
+          TODO: The above is nonsense. mysql_select() will not allocate the
+          join if one already exists. There must be some other reason why we
+          don't let it allocate the join. Perhaps this is because we need
+          some special parameter values passed to join constructor?
 	*/
 	if (!(fake_select_lex->join= new JOIN(thd, item_list,
 					      fake_select_lex->options, result)))
@@ -552,33 +556,52 @@ bool st_select_lex_unit::exec()
 	  fake_select_lex->table_list.empty();
 	  DBUG_RETURN(TRUE);
 	}
+        fake_select_lex->join->no_const_tables= TRUE;
 
 	/*
 	  Fake st_select_lex should have item list for correctref_array
 	  allocation.
 	*/
 	fake_select_lex->item_list= item_list;
+        saved_error= mysql_select(thd, &fake_select_lex->ref_pointer_array,
+                              &result_table_list,
+                              0, item_list, NULL,
+                              global_parameters->order_list.elements,
+                              (ORDER*)global_parameters->order_list.first,
+                              (ORDER*) NULL, NULL, (ORDER*) NULL,
+                              fake_select_lex->options | SELECT_NO_UNLOCK,
+                              result, this, fake_select_lex);
       }
       else
       {
-	JOIN_TAB *tab,*end;
-	for (tab=join->join_tab, end=tab+join->tables ;
-	     tab && tab != end ;
-	     tab++)
-	{
-	  delete tab->select;
-	  delete tab->quick;
-	}
-	join->init(thd, item_list, fake_select_lex->options, result);
+        if (describe)
+        {
+          /*
+            In EXPLAIN command, constant subqueries that do not use any
+            tables are executed two times:
+             - 1st time is a real evaluation to get the subquery value
+             - 2nd time is to produce EXPLAIN output rows.
+            1st execution sets certain members (e.g. select_result) to perform
+            subquery execution rather than EXPLAIN line production. In order 
+            to reset them back, we re-do all of the actions (yes it is ugly):
+          */
+	  join->init(thd, item_list, fake_select_lex->options, result);
+          saved_error= mysql_select(thd, &fake_select_lex->ref_pointer_array,
+                                &result_table_list,
+                                0, item_list, NULL,
+                                global_parameters->order_list.elements,
+                                (ORDER*)global_parameters->order_list.first,
+                                (ORDER*) NULL, NULL, (ORDER*) NULL,
+                                fake_select_lex->options | SELECT_NO_UNLOCK,
+                                result, this, fake_select_lex);
+        }
+        else
+        {
+          join->examined_rows= 0;
+          join->reinit();
+          saved_error= join->exec();
+        }
       }
-      saved_error= mysql_select(thd, &fake_select_lex->ref_pointer_array,
-                            &result_table_list,
-                            0, item_list, NULL,
-                            global_parameters->order_list.elements,
-                            (ORDER*)global_parameters->order_list.first,
-                            (ORDER*) NULL, NULL, (ORDER*) NULL,
-                            fake_select_lex->options | SELECT_NO_UNLOCK,
-                            result, this, fake_select_lex);
 
       fake_select_lex->table_list.empty();
       if (!saved_error)

From 21d639e573d483a354c8ddbf17471ee468cce926 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Tue, 31 Jul 2007 14:42:56 +0300
Subject: [PATCH 118/139] addendum for the fix for bug 27417: extend the assert
 so it will run the testsuite

---
 sql/sql_update.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index e20647dc808..c78e246f518 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1333,7 +1333,8 @@ multi_update::~multi_update()
   if (copy_field)
     delete [] copy_field;
   thd->count_cuted_fields= CHECK_FIELD_IGNORE;		// Restore this setting
-  DBUG_ASSERT(trans_safe || thd->transaction.all.modified_non_trans_table);
+  DBUG_ASSERT(trans_safe || !updated || 
+              thd->transaction.all.modified_non_trans_table);
 }
 
 

From 8e1ec7ab5e819aa3d42ba2f2b381c44253dc9021 Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Tue, 31 Jul 2007 14:58:04 +0300
Subject: [PATCH 119/139] merge of the fix for bug 17417 5.0-opt->5.1-opt

---
 .../mix_innodb_myisam_binlog.test             | 118 -----------------
 .../r/binlog_stm_mix_innodb_myisam.result     |  24 ++--
 .../t/binlog_stm_mix_innodb_myisam.test       | 120 ++++++++++++++++++
 sql/sql_class.cc                              |   2 +-
 sql/sql_insert.cc                             |   2 +-
 sql/sql_parse.cc                              |   2 +-
 6 files changed, 135 insertions(+), 133 deletions(-)

diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
index 831f13893a1..7141bd1abb9 100644
--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
@@ -316,121 +316,3 @@ disconnect con3;
 connection con4;
 select get_lock("a",10); # wait for rollback to finish
 
-#
-# Bug #27417  	thd->no_trans_update.stmt lost value inside of SF-exec-stack
-# bug #28960    non-trans temp table changes with insert .. select
-#               not binlogged after rollback
-#
-# testing appearence of insert into temp_table in binlog.
-# There are two branches of execution that require different setup.
-
-## send_eof() branch
-
-# prepare
-
-create temporary table tt (a int unique);
-create table ti (a int) engine=innodb;
-reset master;
-show master status;
-
-# action
-
-begin; 
-insert into ti values (1); 
-insert into ti values (2) ; 
-insert into tt select * from ti;
-rollback;
-
-# check
-
-select count(*) from tt /* 2 */;
-show master status;
---replace_column 2 # 5 #
-show binlog events from 98;
-select count(*) from ti /* zero */;
-insert into ti select * from tt;
-select * from ti /* that is what slave would miss - a bug */;
-
-
-## send_error() branch
-delete from ti;
-delete from tt where a=1;
-reset master;
-show master status;
-
-# action
-
-begin; 
-insert into ti values (1); 
-insert into ti values (2) /* to make the dup error in the following */; 
---error ER_DUP_ENTRY
-insert into tt select * from ti /* one affected and error */;
-rollback;
-
-# check
-
-show master status;
---replace_column 2 # 5 #
-show binlog events from 98;
-select count(*) from ti /* zero */;
-insert into ti select * from tt;
-select * from tt /* that is what otherwise slave missed - the bug */;
-
-drop table ti;
-
-
-#
-# Bug #27417 thd->no_trans_update.stmt lost value inside of SF-exec-stack
-#
-# Testing asserts: if there is a side effect of modifying non-transactional
-# table thd->no_trans_update.stmt must be TRUE;
-# the assert is active with debug build
-#
-
---disable_warnings
-drop function if exists bug27417;
-drop table if exists t1,t2;
---enable_warnings
-# side effect table
-CREATE TABLE t1 (a int NOT NULL auto_increment primary key) ENGINE=MyISAM;
-# target tables
-CREATE TABLE t2 (a int NOT NULL auto_increment, PRIMARY KEY (a));
-
-delimiter |;
-create function bug27417(n int) 
-RETURNS int(11)
-begin
-  insert into t1 values (null);
-  return n;
-end|
-delimiter ;|
-
-reset master;
-
-# execute
-
-insert into t2 values (bug27417(1));
-insert into t2 select bug27417(2);
-reset master;
-
---error ER_DUP_ENTRY
-insert into t2 values (bug27417(2)); 
-show master status; /* only (!) with fixes for #23333 will show there is the query */;
-select count(*) from t1 /* must be 3 */;
-
-reset master;
-select count(*) from t2;
-delete from t2 where a=bug27417(3);
-select count(*) from t2 /* nothing got deleted */; 
-show master status; /* the query must be in regardless of #23333 */;
-select count(*) from t1 /* must be 5 */;
-
---enable_info
-delete t2 from t2 where t2.a=bug27417(100) /* must not affect t2 */;
---disable_info
-select count(*) from t1 /* must be 7 */;
-
-drop function bug27417;
-drop table t1,t2;
-
---echo end of tests
diff --git a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
index 56dee7838cd..87641d6fae4 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
@@ -380,12 +380,12 @@ select
 @a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"
 1	1
 drop table t1, t2;
-create temporary table tt (a int unique);
+create table tt (a int unique);
 create table ti (a int) engine=innodb;
 reset master;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	98		
+master-bin.000001	106		
 begin;
 insert into ti values (1);
 insert into ti values (2) ;
@@ -398,8 +398,8 @@ count(*)
 2
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	507		
-show binlog events from 98;
+master-bin.000001	515		
+show binlog events from 106;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; BEGIN
 master-bin.000001	#	Query	1	#	use `test`; insert into ti values (1)
@@ -419,19 +419,19 @@ delete from tt where a=1;
 reset master;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	98		
+master-bin.000001	106		
 begin;
 insert into ti values (1);
 insert into ti values (2) /* to make the dup error in the following */;
 insert into tt select * from ti /* one affected and error */;
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'a'
 rollback;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	581		
-show binlog events from 98;
+master-bin.000001	589		
+show binlog events from 106;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; BEGIN
 master-bin.000001	#	Query	1	#	use `test`; insert into ti values (1)
@@ -446,7 +446,7 @@ select * from tt /* that is what otherwise slave missed - the bug */;
 a
 1
 2
-drop table ti;
+drop table ti,tt;
 drop function if exists bug27417;
 drop table if exists t1,t2;
 CREATE TABLE t1 (a int NOT NULL auto_increment primary key) ENGINE=MyISAM;
@@ -462,10 +462,10 @@ insert into t2 values (bug27417(1));
 insert into t2 select bug27417(2);
 reset master;
 insert into t2 values (bug27417(2));
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	98		
+master-bin.000001	218		
 /* only (!) with fixes for #23333 will show there is the query */;
 select count(*) from t1 /* must be 3 */;
 count(*)
@@ -480,7 +480,7 @@ count(*)
 2
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	195		
+master-bin.000001	223		
 /* the query must be in regardless of #23333 */;
 select count(*) from t1 /* must be 5 */;
 count(*)
diff --git a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
index 72651c13be7..fd2b948a35e 100644
--- a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
+++ b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
@@ -21,4 +21,124 @@ is not null;
 eval select
 @a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",
 @a not like "%#%error_code=%error_code=%";
+
 drop table t1, t2;
+
+#
+# Bug #27417  	thd->no_trans_update.stmt lost value inside of SF-exec-stack
+# bug #28960    non-trans temp table changes with insert .. select
+#               not binlogged after rollback
+#
+# testing appearence of insert into temp_table in binlog.
+# There are two branches of execution that require different setup.
+
+## send_eof() branch
+
+# prepare
+
+create table tt (a int unique);
+create table ti (a int) engine=innodb;
+reset master;
+show master status;
+
+# action
+
+begin; 
+insert into ti values (1); 
+insert into ti values (2) ; 
+insert into tt select * from ti;
+rollback;
+
+# check
+
+select count(*) from tt /* 2 */;
+show master status;
+--replace_column 2 # 5 #
+show binlog events from 106;
+select count(*) from ti /* zero */;
+insert into ti select * from tt;
+select * from ti /* that is what slave would miss - a bug */;
+
+
+## send_error() branch
+delete from ti;
+delete from tt where a=1;
+reset master;
+show master status;
+
+# action
+
+begin; 
+insert into ti values (1); 
+insert into ti values (2) /* to make the dup error in the following */; 
+--error ER_DUP_ENTRY
+insert into tt select * from ti /* one affected and error */;
+rollback;
+
+# check
+
+show master status;
+--replace_column 2 # 5 #
+show binlog events from 106;
+select count(*) from ti /* zero */;
+insert into ti select * from tt;
+select * from tt /* that is what otherwise slave missed - the bug */;
+
+drop table ti,tt;
+
+
+#
+# Bug #27417 thd->no_trans_update.stmt lost value inside of SF-exec-stack
+#
+# Testing asserts: if there is a side effect of modifying non-transactional
+# table thd->no_trans_update.stmt must be TRUE;
+# the assert is active with debug build
+#
+
+--disable_warnings
+drop function if exists bug27417;
+drop table if exists t1,t2;
+--enable_warnings
+# side effect table
+CREATE TABLE t1 (a int NOT NULL auto_increment primary key) ENGINE=MyISAM;
+# target tables
+CREATE TABLE t2 (a int NOT NULL auto_increment, PRIMARY KEY (a));
+
+delimiter |;
+create function bug27417(n int) 
+RETURNS int(11)
+begin
+  insert into t1 values (null);
+  return n;
+end|
+delimiter ;|
+
+reset master;
+
+# execute
+
+insert into t2 values (bug27417(1));
+insert into t2 select bug27417(2);
+reset master;
+
+--error ER_DUP_ENTRY
+insert into t2 values (bug27417(2)); 
+show master status; /* only (!) with fixes for #23333 will show there is the query */;
+select count(*) from t1 /* must be 3 */;
+
+reset master;
+select count(*) from t2;
+delete from t2 where a=bug27417(3);
+select count(*) from t2 /* nothing got deleted */; 
+show master status; /* the query must be in regardless of #23333 */;
+select count(*) from t1 /* must be 5 */;
+
+--enable_info
+delete t2 from t2 where t2.a=bug27417(100) /* must not affect t2 */;
+--disable_info
+select count(*) from t1 /* must be 7 */;
+
+drop function bug27417;
+drop table t1,t2;
+
+--echo end of tests
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index b64e74d5d36..b884b21b47c 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -2573,7 +2573,7 @@ extern "C" int thd_slave_thread(const MYSQL_THD thd)
 
 extern "C" int thd_non_transactional_update(const MYSQL_THD thd)
 {
-  return(thd->no_trans_update.all);
+  return(thd->transaction.all.modified_non_trans_table);
 }
 
 extern "C" int thd_binlog_format(const MYSQL_THD thd)
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index d77661ad367..6d7e69e9ffc 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -3188,7 +3188,7 @@ void select_insert::abort() {
                             table->file->has_transactions(), FALSE);
         if (!thd->current_stmt_binlog_row_based && !table->s->tmp_table &&
             !can_rollback_data())
-          thd->no_trans_update.all= TRUE;
+          thd->transaction.all.modified_non_trans_table= TRUE;
         query_cache_invalidate3(thd, table, 1);
       }
     }
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f9b857f56fd..da3a634ffd4 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5176,7 +5176,7 @@ void mysql_reset_thd_for_next_command(THD *thd)
   if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
   {
     thd->options&= ~OPTION_KEEP_LOG;
-    thd->no_trans_update.all= FALSE;
+    thd->transaction.all.modified_non_trans_table= FALSE;
   }
   DBUG_ASSERT(thd->security_ctx== &thd->main_security_ctx);
   thd->tmp_table_used= 0;

From 6c589f90846cbaaeea9f0ff86f4b6011aa8622a9 Mon Sep 17 00:00:00 2001
From: unknown <sergefp@mysql.com>
Date: Tue, 31 Jul 2007 16:15:56 +0400
Subject: [PATCH 120/139] Post-merge fixes

---
 sql/sql_union.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 16c4eeab4bb..25a0540e4dd 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -598,8 +598,8 @@ bool st_select_lex_unit::exec()
         else
         {
           join->examined_rows= 0;
-          join->reinit();
-          saved_error= join->exec();
+          saved_error= join->reinit();
+          join->exec();
         }
       }
 

From a0af9b7e63e14c76aac2a16a75928855f93b288f Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Tue, 31 Jul 2007 17:42:48 +0400
Subject: [PATCH 121/139] ha_innodb.cc:   Warning fixed.

sql/ha_innodb.cc:
  Warning fixed.
---
 sql/ha_innodb.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 585c825c710..f87d47174ac 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -465,7 +465,8 @@ convert_error_code_to_mysql(
 		latest SQL statement in a lock wait timeout. Previously, we
 		rolled back the whole transaction. */
 
-                mark_transaction_to_rollback(thd, row_rollback_on_timeout);
+                mark_transaction_to_rollback(thd,
+                                             (bool)row_rollback_on_timeout);
 
    		return(HA_ERR_LOCK_WAIT_TIMEOUT);
 

From 31e33aba7b48150abfb361d3fe754ba739e7457d Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Tue, 31 Jul 2007 18:04:05 +0300
Subject: [PATCH 122/139] Addendum to bug 27417: poor test results fixes.

mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Addendum to bug 27417: removed tests for another bug
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  Addendum to bug 27417: removed tests for another bug
mysql-test/suite/rpl/r/rpl_row_create_table.result:
  Addendum to bug 27417: changes to non-transactional tables
  should be logged even on rollback.
---
 .../suite/binlog/r/binlog_stm_mix_innodb_myisam.result    | 8 --------
 .../suite/binlog/t/binlog_stm_mix_innodb_myisam.test      | 6 ++++--
 mysql-test/suite/rpl/r/rpl_row_create_table.result        | 8 ++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
index 87641d6fae4..5ef36861c30 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
@@ -463,10 +463,6 @@ insert into t2 select bug27417(2);
 reset master;
 insert into t2 values (bug27417(2));
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show master status;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	218		
-/* only (!) with fixes for #23333 will show there is the query */;
 select count(*) from t1 /* must be 3 */;
 count(*)
 3
@@ -478,10 +474,6 @@ delete from t2 where a=bug27417(3);
 select count(*) from t2 /* nothing got deleted */;
 count(*)
 2
-show master status;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	223		
-/* the query must be in regardless of #23333 */;
 select count(*) from t1 /* must be 5 */;
 count(*)
 5
diff --git a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
index fd2b948a35e..1815f3deb34 100644
--- a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
+++ b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
@@ -123,14 +123,16 @@ reset master;
 
 --error ER_DUP_ENTRY
 insert into t2 values (bug27417(2)); 
-show master status; /* only (!) with fixes for #23333 will show there is the query */;
+#TODO: Andrei: enable this test after 23333 is pushed 
+#show master status; /* only (!) with fixes for #23333 will show there is the query */;
 select count(*) from t1 /* must be 3 */;
 
 reset master;
 select count(*) from t2;
 delete from t2 where a=bug27417(3);
 select count(*) from t2 /* nothing got deleted */; 
-show master status; /* the query must be in regardless of #23333 */;
+#TODO: Andrei: enable this test after 23333 is pushed 
+#show master status; /* the query must be in regardless of #23333 */;
 select count(*) from t1 /* must be 5 */;
 
 --enable_info
diff --git a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result
index f22881bd4a9..d6e4845b13f 100644
--- a/mysql-test/suite/rpl/r/rpl_row_create_table.result
+++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result
@@ -392,12 +392,20 @@ FROM t1
 WHERE a MOD 2 = 1;
 INSERT INTO t2 SELECT a+2 FROM tt2;
 ROLLBACK;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
 SELECT * FROM t2 ORDER BY a;
 a
 SHOW BINLOG EVENTS FROM 631;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 #	631	Query	#	711	use `test`; TRUNCATE TABLE t2
 #	711	Xid	#	738	COMMIT /* XID */
+#	738	Query	#	806	use `test`; BEGIN
+#	806	Table_map	#	845	table_id: # (test.t2)
+#	845	Write_rows	#	889	table_id: # flags: STMT_END_F
+#	889	Table_map	#	928	table_id: # (test.t2)
+#	928	Write_rows	#	967	table_id: # flags: STMT_END_F
+#	967	Query	#	1038	use `test`; ROLLBACK
 SELECT * FROM t2 ORDER BY a;
 a
 DROP TABLE t1,t2;

From 5404ba422e35d75054d3941b6e52f237fbb46e91 Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.(none)>
Date: Tue, 31 Jul 2007 20:52:43 +0400
Subject: [PATCH 123/139] Post-merge fixes.

sql/sql_base.cc:
  Fix an incorrect manual merge.
---
 sql/sql_base.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index f85f3a2884a..05c65d63d19 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1701,18 +1701,18 @@ TABLE *find_temporary_table(THD *thd, TABLE_LIST *table_list)
   @retval FALSE  the table was found and dropped successfully.
 */
 
-bool close_temporary_table(THD *thd, const char *db, const char *table_name)
+bool close_temporary_table(THD *thd, TABLE_LIST *table_list)
 {
   TABLE *table;
 
   if (!(table= find_temporary_table(thd, table_list)))
     return 1;
-  close_temporary_table(thd, table, 1, 1);
   /*
     If LOCK TABLES list is not empty and contains this table,
     unlock the table and remove the table from this list.
   */
   mysql_lock_remove(thd, thd->locked_tables, table, FALSE);
+  close_temporary_table(thd, table, 1, 1);
   return 0;
 }
 

From d0e8d1ab5401a2cc7ce8f75e15340b67fed6cfbf Mon Sep 17 00:00:00 2001
From: unknown <dkatz@damien-katzs-computer.local>
Date: Tue, 31 Jul 2007 16:36:29 -0400
Subject: [PATCH 124/139] Bug #29419 "Specifying a join_buffer > 4GB on 64 bit
 machines not possible."

Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4 GB.

The test case for this bug is a part of the test suite for bug #5731.


sql/sql_select.cc:
  Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4G.
---
 sql/sql_select.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index be6d1f74852..4c48c70dcca 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -13307,7 +13307,8 @@ static int
 join_init_cache(THD *thd,JOIN_TAB *tables,uint table_count)
 {
   reg1 uint i;
-  uint length,blobs,size;
+  uint length, blobs;
+  size_t size;
   CACHE_FIELD *copy,**blob_ptr;
   JOIN_CACHE  *cache;
   JOIN_TAB *join_tab;
@@ -13423,7 +13424,7 @@ store_record_in_cache(JOIN_CACHE *cache)
   length=cache->length;
   if (cache->blobs)
     length+=used_blob_length(cache->blob_ptr);
-  if ((last_record=(length+cache->length > (uint) (cache->end - pos))))
+  if ((last_record= (length + cache->length > (size_t) (cache->end - pos))))
     cache->ptr_record=cache->records;
 
   /*
@@ -13469,7 +13470,7 @@ store_record_in_cache(JOIN_CACHE *cache)
     }
   }
   cache->pos=pos;
-  return last_record || (uint) (cache->end -pos) < cache->length;
+  return last_record || (size_t) (cache->end - pos) < cache->length;
 }
 
 

From f5b95d0be141416c95a657d42ef39937d01c4c8e Mon Sep 17 00:00:00 2001
From: unknown <tnurnberg@sin.intern.azundris.com>
Date: Wed, 1 Aug 2007 04:56:58 +0200
Subject: [PATCH 125/139] Bug #10776: Failure to compile ndb ReadNodesConf.cpp
 on AIX 5.2

mysqld hasn't been built on AIX with ndb-everything in quite a while.
this allowed a variety of changes to be added that broke the AIX build
for both the GNU and IBM compilers (but the IBM suite in particular).
Changeset lets build to complete on AIX 5.2 for users of the GNU and
the IBM suite both. Tudo bem?


config/ac-macros/large_file.m4:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)

  we no longer declare anything large-file on AIX.  the
  GNU C++ compiler declares _LARGE_FILE_API all of its
  own, and either way we're now pulling in <standards.h>
  when on AIX, which defines _LARGE_FILE_API (if not
  already defined).
configure.in:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1)

  build NDB binaries as static on AIX. because that actually
  *works*.

  when building dynamic, with the IBM compiler (xlC_r), and
  the build breaks on AIX due to missing symbols
  (__vec__delete2 et al.), try adding -lhC to the Makefile.
include/mysql.h:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)

  we're now pulling in <standards.h> when on AIX, which
  defines _LARGE_FILE_API (if not already defined).
ndb/src/common/util/File.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3)

  do not de-scope the standards, for they may be funky macros
ndb/src/mgmclient/Makefile.am:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)

  make IBM C++ compiler happy on AIX
ndb/src/mgmsrv/Makefile.am:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (5)

  GNU compiler has no sense of humour about this
ndb/test/ndbapi/benchronja.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)

  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexAsynch.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)

  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexHammer.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)

  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexScan.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)

  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexTT.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)

  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexTimedAsynch.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)

  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/initronja.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)

  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/testOperations.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (7)

  IBM C compiler on AIX is not happy with the re-def.
ndb/test/ndbapi/testScanFilter.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (8)

  The IBM C++ compiler on AIX doesn't like initializing from pow().
  This works, but breaks a VAL (bool res_cal[TUPLE_NUM] ...) later on.
ndb/test/odbc/SQL99_test/SQL99_test.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)

  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
---
 config/ac-macros/large_file.m4          | 11 +++--------
 configure.in                            |  6 ++++++
 include/mysql.h                         |  4 ++++
 ndb/src/common/util/File.cpp            |  4 ++--
 ndb/src/mgmclient/Makefile.am           |  1 +
 ndb/src/mgmsrv/Makefile.am              |  2 +-
 ndb/test/ndbapi/benchronja.cpp          | 19 +++++++++++++------
 ndb/test/ndbapi/flexAsynch.cpp          | 19 +++++++++++++------
 ndb/test/ndbapi/flexHammer.cpp          | 15 +++++++++++----
 ndb/test/ndbapi/flexScan.cpp            | 11 +++++++++--
 ndb/test/ndbapi/flexTT.cpp              | 19 +++++++++++++------
 ndb/test/ndbapi/flexTimedAsynch.cpp     | 23 +++++++++++++++--------
 ndb/test/ndbapi/initronja.cpp           |  9 ++++++++-
 ndb/test/ndbapi/testOperations.cpp      |  5 -----
 ndb/test/ndbapi/testScanFilter.cpp      | 12 ++++++++++--
 ndb/test/odbc/SQL99_test/SQL99_test.cpp | 13 ++++++++++---
 16 files changed, 119 insertions(+), 54 deletions(-)

diff --git a/config/ac-macros/large_file.m4 b/config/ac-macros/large_file.m4
index 00c2fdf614e..2639cec5fb7 100644
--- a/config/ac-macros/large_file.m4
+++ b/config/ac-macros/large_file.m4
@@ -127,14 +127,9 @@ AC_DEFUN([MYSQL_SYS_LARGEFILE],
 	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
 	  ac_cv_sys_largefile_source=1 ;;
 	esac])
-     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
-       ac_cv_sys_large_files,
-       [Large files support on AIX-style hosts.],
-       [case "$host_os" in
-	# AIX 4.2 and later
-	aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
-	  ac_cv_sys_large_files=1 ;;
-	esac])
+
+     # AIX 4.2 and later -- do nothing, include standards.h instead.
+     # this goes for both GNU and IBM C and C++ compilers.
    fi
   ])
 
diff --git a/configure.in b/configure.in
index 1da39ac1aa3..a928bab236f 100644
--- a/configure.in
+++ b/configure.in
@@ -2890,6 +2890,12 @@ then
   ndb_opt_subdirs="$ndb_opt_subdirs docs"
   ndb_bin_am_ldflags=""
 fi
+# building dynamic breaks on AIX. (If you want to try it and get unresolved
+# __vec__delete2 and some such, try linking against libhC.)
+case "$host_os" in
+  aix3.* | aix4.0.* | aix4.1.*) ;;
+  *) ndb_bin_am_ldflags="-static";;
+esac
 AC_SUBST([ndb_bin_am_ldflags])
 AC_SUBST([ndb_opt_subdirs])
 
diff --git a/include/mysql.h b/include/mysql.h
index a153d0b51db..b3e0dc45496 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -27,6 +27,10 @@
 #ifndef _mysql_h
 #define _mysql_h
 
+#ifdef _AIX           /* large-file support will break without this */
+#include <standards.h>
+#endif
+
 #ifdef __CYGWIN__     /* CYGWIN implements a UNIX API */
 #undef WIN
 #undef _WIN
diff --git a/ndb/src/common/util/File.cpp b/ndb/src/common/util/File.cpp
index a75fa5ae463..fe0fdfd1c91 100644
--- a/ndb/src/common/util/File.cpp
+++ b/ndb/src/common/util/File.cpp
@@ -50,7 +50,7 @@ File_class::size(FILE* f)
   MY_STAT s;
 
   // Note that my_fstat behaves *differently* than my_stat. ARGGGHH!
-  if(my_fstat(::fileno(f), &s, MYF(0)))
+  if(my_fstat(fileno(f), &s, MYF(0)))
     return 0;
 
   return s.st_size;
@@ -196,7 +196,7 @@ File_class::flush() const
 {
 #if defined NDB_OSE || defined NDB_SOFTOSE
   ::fflush(m_file);
-  return ::fsync(::fileno(m_file));
+  return ::fsync(fileno(m_file));
 #else
   return ::fflush(m_file);;
 #endif
diff --git a/ndb/src/mgmclient/Makefile.am b/ndb/src/mgmclient/Makefile.am
index 99540160341..e1287532a07 100644
--- a/ndb/src/mgmclient/Makefile.am
+++ b/ndb/src/mgmclient/Makefile.am
@@ -36,6 +36,7 @@ INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi \
 LDADD_LOC = $(noinst_LTLIBRARIES) \
 	    ../common/portlib/libportlib.la \
             @readline_link@ \
+            $(top_builddir)/ndb/src/libndbclient.la \
             $(top_builddir)/dbug/libdbug.a \
             $(top_builddir)/mysys/libmysys.a \
             $(top_builddir)/strings/libmystrings.a \
diff --git a/ndb/src/mgmsrv/Makefile.am b/ndb/src/mgmsrv/Makefile.am
index 88622c08e53..3d1845957e6 100644
--- a/ndb/src/mgmsrv/Makefile.am
+++ b/ndb/src/mgmsrv/Makefile.am
@@ -38,7 +38,7 @@ INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi \
                -I$(top_srcdir)/ndb/src/common/mgmcommon \
                -I$(top_srcdir)/ndb/src/mgmclient
 
-LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CommandInterpreter.o \
+LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CommandInterpreter.lo \
             $(top_builddir)/ndb/src/libndbclient.la \
             $(top_builddir)/dbug/libdbug.a \
             $(top_builddir)/mysys/libmysys.a \
diff --git a/ndb/test/ndbapi/benchronja.cpp b/ndb/test/ndbapi/benchronja.cpp
index 4973e6e2487..73ee324a888 100644
--- a/ndb/test/ndbapi/benchronja.cpp
+++ b/ndb/test/ndbapi/benchronja.cpp
@@ -41,7 +41,14 @@
 #define MAXSTRLEN 16 
 #define MAXATTR 64
 #define MAXTABLES 64
-#define MAXTHREADS 256
+#define NDB_MAXTHREADS 256
+/*
+  NDB_MAXTHREADS used to be just MAXTHREADS, which collides with a
+  #define from <sys/thread.h> on AIX (IBM compiler).  We explicitly
+  #undef it here lest someone use it by habit and get really funny
+  results.  K&R says we may #undef non-existent symbols, so let's go.
+*/
+#undef MAXTHREADS
 #define MAXATTRSIZE 8000
 #define START_TIMER NdbTimer timer; timer.doStart();
 #define STOP_TIMER timer.doStop();
@@ -56,18 +63,18 @@ struct ThreadNdb
   Ndb* NdbRef;
 };
 
-static NdbThread* threadLife[MAXTHREADS];
+static NdbThread* threadLife[NDB_MAXTHREADS];
 static unsigned int tNoOfThreads;
 static unsigned int tNoOfOpsPerExecute;
 static unsigned int tNoOfRecords;
 static unsigned int tNoOfOperations;
-static int ThreadReady[MAXTHREADS];
-static int ThreadStart[MAXTHREADS];
+static int ThreadReady[NDB_MAXTHREADS];
+static int ThreadStart[NDB_MAXTHREADS];
 
 NDB_COMMAND(benchronja, "benchronja", "benchronja", "benchronja", 65535){
   ndb_init();
 
-  ThreadNdb		tabThread[MAXTHREADS];
+  ThreadNdb		tabThread[NDB_MAXTHREADS];
   int			i = 0 ;
   int			cont = 0 ;
   Ndb*			pMyNdb = NULL ; //( "TEST_DB" );	
@@ -84,7 +91,7 @@ NDB_COMMAND(benchronja, "benchronja", "benchronja", "benchronja", 65535){
   {
     if (strcmp(argv[i], "-t") == 0){
       tNoOfThreads = atoi(argv[i+1]);
-      if ((tNoOfThreads < 1) || (tNoOfThreads > MAXTHREADS)) goto error_input;
+      if ((tNoOfThreads < 1) || (tNoOfThreads > NDB_MAXTHREADS)) goto error_input;
     }else if (strcmp(argv[i], "-o") == 0){
       tNoOfOperations = atoi(argv[i+1]);
       if (tNoOfOperations < 1) goto error_input;
diff --git a/ndb/test/ndbapi/flexAsynch.cpp b/ndb/test/ndbapi/flexAsynch.cpp
index 20a157fc2f3..1f52315482f 100644
--- a/ndb/test/ndbapi/flexAsynch.cpp
+++ b/ndb/test/ndbapi/flexAsynch.cpp
@@ -35,7 +35,14 @@
 #define MAXSTRLEN 16 
 #define MAXATTR 64
 #define MAXTABLES 64
-#define MAXTHREADS 128
+#define NDB_MAXTHREADS 128
+/*
+  NDB_MAXTHREADS used to be just MAXTHREADS, which collides with a
+  #define from <sys/thread.h> on AIX (IBM compiler).  We explicitly
+  #undef it here lest someone use it by habit and get really funny
+  results.  K&R says we may #undef non-existent symbols, so let's go.
+*/
+#undef MAXTHREADS
 #define MAXPAR 1024
 #define MAXATTRSIZE 1000
 #define PKSIZE 2
@@ -76,10 +83,10 @@ struct ThreadNdb
   int ThreadNo;
 };
 
-static NdbThread*               threadLife[MAXTHREADS];
+static NdbThread*               threadLife[NDB_MAXTHREADS];
 static int                              tNodeId;
-static int                              ThreadReady[MAXTHREADS];
-static StartType                ThreadStart[MAXTHREADS];
+static int                              ThreadReady[NDB_MAXTHREADS];
+static StartType                ThreadStart[NDB_MAXTHREADS];
 static char                             tableName[MAXTABLES][MAXSTRLEN+1];
 static char                             attrName[MAXATTR][MAXSTRLEN+1];
 
@@ -160,7 +167,7 @@ NDB_COMMAND(flexAsynch, "flexAsynch", "flexAsynch", "flexAsynch", 65535)
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  pThreadData = new ThreadNdb[MAXTHREADS];
+  pThreadData = new ThreadNdb[NDB_MAXTHREADS];
 
   ndbout << endl << "FLEXASYNCH - Starting normal mode" << endl;
   ndbout << "Perform benchmark of insert, update and delete transactions";
@@ -844,7 +851,7 @@ readArguments(int argc, const char** argv){
   while (argc > 1){
     if (strcmp(argv[i], "-t") == 0){
       tNoOfThreads = atoi(argv[i+1]);
-      if ((tNoOfThreads < 1) || (tNoOfThreads > MAXTHREADS)){
+      if ((tNoOfThreads < 1) || (tNoOfThreads > NDB_MAXTHREADS)){
 	ndbout_c("Invalid no of threads");
         return -1;
       }
diff --git a/ndb/test/ndbapi/flexHammer.cpp b/ndb/test/ndbapi/flexHammer.cpp
index 9abac905f5a..3847bc38b35 100644
--- a/ndb/test/ndbapi/flexHammer.cpp
+++ b/ndb/test/ndbapi/flexHammer.cpp
@@ -69,7 +69,14 @@ ErrorData * flexHammerErrorData;
 #define MAXSTRLEN 16 
 #define MAXATTR 64
 #define MAXTABLES 64
-#define MAXTHREADS 256
+#define NDB_MAXTHREADS 256
+/*
+  NDB_MAXTHREADS used to be just MAXTHREADS, which collides with a
+  #define from <sys/thread.h> on AIX (IBM compiler).  We explicitly
+  #undef it here lest someone use it by habit and get really funny
+  results.  K&R says we may #undef non-existent symbols, so let's go.
+*/
+#undef MAXTHREADS
 #define MAXATTRSIZE 100
 // Max number of retries if something fails
 #define MaxNoOfAttemptsC 10 
@@ -122,8 +129,8 @@ static int			tAttributeSize;
 static int			tNoOfOperations;
 static int			tNoOfRecords;
 static int			tNoOfLoops;
-static				ReadyType ThreadReady[MAXTHREADS];
-static				StartType ThreadStart[MAXTHREADS];
+static				ReadyType ThreadReady[NDB_MAXTHREADS];
+static				StartType ThreadStart[NDB_MAXTHREADS];
 static char			tableName[MAXTABLES][MAXSTRLEN];
 static char			attrName[MAXATTR][MAXSTRLEN];
 static int			theSimpleFlag = 0;
@@ -643,7 +650,7 @@ readArguments (int argc, const char** argv)
   while (argc > 1) {
     if (strcmp(argv[i], "-t") == 0) {
       tNoOfThreads = atoi(argv[i+1]);
-      if ((tNoOfThreads < 1) || (tNoOfThreads > MAXTHREADS))
+      if ((tNoOfThreads < 1) || (tNoOfThreads > NDB_MAXTHREADS))
 	return(1);
     }
     else if (strcmp(argv[i], "-o") == 0) {
diff --git a/ndb/test/ndbapi/flexScan.cpp b/ndb/test/ndbapi/flexScan.cpp
index cbea90f44f4..4e3def7fb91 100644
--- a/ndb/test/ndbapi/flexScan.cpp
+++ b/ndb/test/ndbapi/flexScan.cpp
@@ -68,7 +68,14 @@
 #define MAXSTRLEN 16 
 #define MAXATTR 64
 #define MAXTABLES 64
-#define MAXTHREADS 256
+#define NDB_MAXTHREADS 256
+/*
+  NDB_MAXTHREADS used to be just MAXTHREADS, which collides with a
+  #define from <sys/thread.h> on AIX (IBM compiler).  We explicitly
+  #undef it here lest someone use it by habit and get really funny
+  results.  K&R says we may #undef non-existent symbols, so let's go.
+*/
+#undef MAXTHREADS
 #define MAXATTRSIZE 64
 
 enum StartType { 
@@ -860,7 +867,7 @@ static int readArguments(int argc, const char** argv)
     if (strcmp(argv[i], "-t") == 0) {
       if (argv[i + 1] != NULL) {
 	tNoOfThreads = atoi(argv[i + 1]);
-	if ((tNoOfThreads < 1) || (tNoOfThreads > MAXTHREADS)) {
+	if ((tNoOfThreads < 1) || (tNoOfThreads > NDB_MAXTHREADS)) {
 	  retValue = -1;
 	} // if
       } // if
diff --git a/ndb/test/ndbapi/flexTT.cpp b/ndb/test/ndbapi/flexTT.cpp
index 71d5b6c096e..4373102f77e 100644
--- a/ndb/test/ndbapi/flexTT.cpp
+++ b/ndb/test/ndbapi/flexTT.cpp
@@ -35,7 +35,14 @@
 #define MAXSTRLEN 16 
 #define MAXATTR 64
 #define MAXTABLES 64
-#define MAXTHREADS 128
+#define NDB_MAXTHREADS 128
+/*
+  NDB_MAXTHREADS used to be just MAXTHREADS, which collides with a
+  #define from <sys/thread.h> on AIX (IBM compiler).  We explicitly
+  #undef it here lest someone use it by habit and get really funny
+  results.  K&R says we may #undef non-existent symbols, so let's go.
+*/
+#undef MAXTHREADS
 #define MAXPAR 1024
 #define MAXATTRSIZE 1000
 #define PKSIZE 1
@@ -101,10 +108,10 @@ static void input_error();
                                       
 ErrorData * flexTTErrorData;
 
-static NdbThread*                       threadLife[MAXTHREADS];
+static NdbThread*                       threadLife[NDB_MAXTHREADS];
 static int                              tNodeId;
-static int                              ThreadReady[MAXTHREADS];
-static StartType                        ThreadStart[MAXTHREADS];
+static int                              ThreadReady[NDB_MAXTHREADS];
+static StartType                        ThreadStart[NDB_MAXTHREADS];
 static char                             tableName[1][MAXSTRLEN+1];
 static char                             attrName[5][MAXSTRLEN+1];
 
@@ -184,7 +191,7 @@ NDB_COMMAND(flexTT, "flexTT", "flexTT", "flexTT", 65535)
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  pThreadData = new ThreadNdb[MAXTHREADS];
+  pThreadData = new ThreadNdb[NDB_MAXTHREADS];
 
   ndbout << endl << "FLEXTT - Starting normal mode" << endl;
   ndbout << "Perform TimesTen benchmark" << endl;
@@ -798,7 +805,7 @@ readArguments(int argc, const char** argv){
   while (argc > 1){
     if (strcmp(argv[i], "-t") == 0){
       tNoOfThreads = atoi(argv[i+1]);
-      if ((tNoOfThreads < 1) || (tNoOfThreads > MAXTHREADS)){
+      if ((tNoOfThreads < 1) || (tNoOfThreads > NDB_MAXTHREADS)){
 	ndbout_c("Invalid no of threads");
         return -1;
       }
diff --git a/ndb/test/ndbapi/flexTimedAsynch.cpp b/ndb/test/ndbapi/flexTimedAsynch.cpp
index cc44ab8b237..b6301e59df2 100644
--- a/ndb/test/ndbapi/flexTimedAsynch.cpp
+++ b/ndb/test/ndbapi/flexTimedAsynch.cpp
@@ -57,7 +57,14 @@
 #define MAXSTRLEN 16 
 #define MAXATTR 64
 #define MAXTABLES 64
-#define MAXTHREADS 256
+#define NDB_MAXTHREADS 256
+/*
+  NDB_MAXTHREADS used to be just MAXTHREADS, which collides with a
+  #define from <sys/thread.h> on AIX (IBM compiler).  We explicitly
+  #undef it here lest someone use it by habit and get really funny
+  results.  K&R says we may #undef non-existent symbols, so let's go.
+*/
+#undef MAXTHREADS
 #define MAXATTRSIZE 1000
 #define PKSIZE 1
 
@@ -95,10 +102,10 @@ static int failed = 0 ; // lame global variable that keeps track of failed trans
                         // incremented in executeCallback() and reset in main()
 /************************************************************* < epaulsa */
 
-static NdbThread* threadLife[MAXTHREADS];
+static NdbThread* threadLife[NDB_MAXTHREADS];
 static int tNodeId;
-static int ThreadReady[MAXTHREADS];
-static StartType ThreadStart[MAXTHREADS];
+static int ThreadReady[NDB_MAXTHREADS];
+static StartType ThreadStart[NDB_MAXTHREADS];
 static char tableName[MAXTABLES][MAXSTRLEN+1];
 static char attrName[MAXATTR][MAXSTRLEN+1];
 static int *getAttrValueTable;
@@ -174,7 +181,7 @@ void deleteAttributeSpace(){
 NDB_COMMAND(flexTimedAsynch, "flexTimedAsynch", "flexTimedAsynch [-tpoilcas]", "flexTimedAsynch", 65535)
 {
   ndb_init();
-  ThreadNdb		tabThread[MAXTHREADS];
+  ThreadNdb		tabThread[NDB_MAXTHREADS];
   int                   tLoops=0;
   int                   returnValue;
   //NdbOut flexTimedAsynchNdbOut;
@@ -615,8 +622,8 @@ void readArguments(int argc, const char** argv)
       if (strcmp(argv[i], "-t") == 0)
 	{
 	  tNoOfThreads = atoi(argv[i+1]);
-	  //      if ((tNoOfThreads < 1) || (tNoOfThreads > MAXTHREADS))
-	  if ((tNoOfThreads < 1) || (tNoOfThreads > MAXTHREADS))
+	  //      if ((tNoOfThreads < 1) || (tNoOfThreads > NDB_MAXTHREADS))
+	  if ((tNoOfThreads < 1) || (tNoOfThreads > NDB_MAXTHREADS))
 	    exit(-1);
 	}
       else if (strcmp(argv[i], "-i") == 0)
@@ -628,7 +635,7 @@ void readArguments(int argc, const char** argv)
       else if (strcmp(argv[i], "-p") == 0)
 	{
 	  tNoOfTransInBatch = atoi(argv[i+1]);
-	  //if ((tNoOfTransInBatch < 1) || (tNoOfTransInBatch > MAXTHREADS))
+	  //if ((tNoOfTransInBatch < 1) || (tNoOfTransInBatch > NDB_MAXTHREADS))
 	  if ((tNoOfTransInBatch < 1) || (tNoOfTransInBatch > 10000))
 	    exit(-1);
 	}
diff --git a/ndb/test/ndbapi/initronja.cpp b/ndb/test/ndbapi/initronja.cpp
index 63bbc374c62..f48b1c86da3 100644
--- a/ndb/test/ndbapi/initronja.cpp
+++ b/ndb/test/ndbapi/initronja.cpp
@@ -29,7 +29,14 @@
 #define MAXSTRLEN 16 
 #define MAXATTR 64
 #define MAXTABLES 64
-#define MAXTHREADS 256
+#define NDB_MAXTHREADS 256
+/*
+  NDB_MAXTHREADS used to be just MAXTHREADS, which collides with a
+  #define from <sys/thread.h> on AIX (IBM compiler).  We explicitly
+  #undef it here lest someone use it by habit and get really funny
+  results.  K&R says we may #undef non-existent symbols, so let's go.
+*/
+#undef MAXTHREADS
 #define MAXATTRSIZE 8000
 
 static unsigned int tNoOfRecords;
diff --git a/ndb/test/ndbapi/testOperations.cpp b/ndb/test/ndbapi/testOperations.cpp
index 1f610cade4a..21151ab5c7f 100644
--- a/ndb/test/ndbapi/testOperations.cpp
+++ b/ndb/test/ndbapi/testOperations.cpp
@@ -97,11 +97,6 @@ OperationTestCase matrix[] = {
   result = NDBT_FAILED; \
   break; }
 
-#define C3(b)  if (!(b)) { \
-  g_err  << "ERR: "<< step->getName() \
-         << " failed on line " << __LINE__ << endl; \
-  abort(); return NDBT_FAILED; }
-
 #define C3(b)  if (!(b)) { \
   g_err  << "ERR: failed on line " << __LINE__ << endl; \
   return NDBT_FAILED; }
diff --git a/ndb/test/ndbapi/testScanFilter.cpp b/ndb/test/ndbapi/testScanFilter.cpp
index 5098d83745b..81aa6b82fa0 100644
--- a/ndb/test/ndbapi/testScanFilter.cpp
+++ b/ndb/test/ndbapi/testScanFilter.cpp
@@ -49,7 +49,15 @@ const char COL_LEN = 7;
 * there are six columns, 'i', 'j', 'k', 'l', 'm', 'n', and each on is equal to 1 or 1,
 * Since each tuple should be unique in this case, then TUPLE_NUM = 2 power 6 = 64 
 */
-const int TUPLE_NUM = (int)pow(2, COL_LEN-1);    
+#ifdef _AIX
+/*
+  IBM xlC_r breaks on the initialization with pow():
+  "The expression must be an integral constant expression."
+*/
+const int TUPLE_NUM = 64;
+#else
+const int TUPLE_NUM = (int)pow(2, COL_LEN-1);
+#endif
 
 /*
 * the recursive level of random scan filter, can 
@@ -479,7 +487,7 @@ int get_column_id(char ch)
 */
 bool check_col_equal_one(int tuple_no, int col_id)
 {
-  int i = (int)pow(2, 6 - col_id);
+  int i = (int)pow((double)2, (double)(6 - col_id));
   int j = tuple_no / i;
   if(j % 2)
     return true;
diff --git a/ndb/test/odbc/SQL99_test/SQL99_test.cpp b/ndb/test/odbc/SQL99_test/SQL99_test.cpp
index 039a77f4d53..fb77220773d 100644
--- a/ndb/test/odbc/SQL99_test/SQL99_test.cpp
+++ b/ndb/test/odbc/SQL99_test/SQL99_test.cpp
@@ -27,7 +27,14 @@ using namespace std; //
 #define MAXROW			64
 #define DEFROW			8
 
-#define MAXTHREADS		24
+/*
+  NDB_MAXTHREADS used to be just MAXTHREADS, which collides with a
+  #define from <sys/thread.h> on AIX (IBM compiler).  We explicitly
+  #undef it here lest someone use it by habit and get really funny
+  results.  K&R says we may #undef non-existent symbols, so let's go.
+*/
+#undef MAXTHREADS
+#define NDB_MAXTHREADS		24
 #define DEFTHREADS		2
 
 #define MAXTABLES		16
@@ -83,7 +90,7 @@ int main(int argc, char* argv[]){
     char* szTableNames = (char*)malloc(sizeof(char)*nNoOfTables*MAX_TABLE_NAME) ;
     memset(szTableNames, 0, sizeof(char)*nNoOfTables*MAX_TABLE_NAME) ;
 
-	UintPtr pThreadHandles[MAXTHREADS] = { NULL } ;
+	UintPtr pThreadHandles[NDB_MAXTHREADS] = { NULL } ;
 
     AssignTableNames(szTableNames, nNoOfTables) ;
 
@@ -313,7 +320,7 @@ void ParseArguments(int argc, const char** argv){
         if (strcmp(argv[i], "-t") == 0)
             {
             nNoOfThreads = atoi(argv[i+1]);
-            if ((nNoOfThreads < 1) || (nNoOfThreads > MAXTHREADS))
+            if ((nNoOfThreads < 1) || (nNoOfThreads > NDB_MAXTHREADS))
                 nNoOfThreads = DEFTHREADS ;
             }
         else if (strcmp(argv[i], "-c") == 0)

From 1281fbc58c139b90a329ae3519f46d2b0b75a249 Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Wed, 1 Aug 2007 11:41:13 +0500
Subject: [PATCH 126/139] Fix for bug #30088: Can't disable myisam-recover by a
 value of "".   - test result.

Problem: we don't proper handle "" value of the --myisam-recover option.

Fix: turn off myisam recovering if --myisam-recover="" is set.


mysql-test/r/show_check.result:
  Fix for bug #30088: Can't disable myisam-recover by a value of "".
    - test result.
mysql-test/t/show_check-master.opt:
  Fix for bug #30088: Can't disable myisam-recover by a value of "".
    - test case.
mysql-test/t/show_check.test:
  Fix for bug #30088: Can't disable myisam-recover by a value of "".
    - test case.
sql/mysqld.cc:
  Fix for bug #30088: Can't disable myisam-recover by a value of "".
    - turn off myisam recovering if --myisam-recover="" is passed.
---
 mysql-test/r/show_check.result     | 3 +++
 mysql-test/t/show_check-master.opt | 2 +-
 mysql-test/t/show_check.test       | 5 +++++
 sql/mysqld.cc                      | 7 ++++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index e4cdd4f183b..85528de00bc 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1118,4 +1118,7 @@ select 1 from information_schema.tables limit 1;
 show status like 'slow_queries';
 Variable_name	Value
 Slow_queries	2
+show variables like 'myisam_recover_options';
+Variable_name	Value
+myisam_recover_options	OFF
 End of 5.0 tests
diff --git a/mysql-test/t/show_check-master.opt b/mysql-test/t/show_check-master.opt
index 3eb98fc3d6b..7a438da06cc 100644
--- a/mysql-test/t/show_check-master.opt
+++ b/mysql-test/t/show_check-master.opt
@@ -1 +1 @@
---log-slow-queries --log-long-format --log-queries-not-using-indexes
+--log-slow-queries --log-long-format --log-queries-not-using-indexes --myisam-recover=""
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index a58d81a414b..28f85635c93 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -782,4 +782,9 @@ show variables like "log_queries_not_using_indexes";
 select 1 from information_schema.tables limit 1;
 show status like 'slow_queries';
 
+#
+# Bug #30088: Can't disable myisam-recover by a value of ""
+#
+show variables like 'myisam_recover_options';
+
 --echo End of 5.0 tests
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 9eb3d157dcf..57d1656736d 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7241,11 +7241,16 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
 #endif /* HAVE_INNOBASE_DB */
   case OPT_MYISAM_RECOVER:
   {
-    if (!argument || !argument[0])
+    if (!argument)
     {
       myisam_recover_options=    HA_RECOVER_DEFAULT;
       myisam_recover_options_str= myisam_recover_typelib.type_names[0];
     }
+    else if (!argument[0])
+    {
+      myisam_recover_options= HA_RECOVER_NONE;
+      myisam_recover_options_str= "OFF";
+    }
     else
     {
       myisam_recover_options_str=argument;

From 36bb8de987bef0577fcb63dbfd5b66a8d6b522fe Mon Sep 17 00:00:00 2001
From: unknown <tnurnberg@sin.intern.azundris.com>
Date: Wed, 1 Aug 2007 09:24:01 +0200
Subject: [PATCH 127/139] Bug #10776: Failure to compile ndb ReadNodesConf.cpp
 on AIX 5.2

5.1 specific fixes so cluster will build on AIX (with IBM compiler)


config/ac-macros/ha_ndbcluster.m4:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1)

  build NDB binaries as static on AIX. because that actually
  *works*.

  when building dynamic, with the IBM compiler (xlC_r), and
  the build breaks on AIX due to missing symbols
  (__vec__delete2 et al.), try adding -lhC to the Makefile.
storage/ndb/src/mgmclient/Makefile.am:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)

  fix path
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3)

  __align is a keyword in xlC_r
storage/ndb/test/ndbapi/testIndexStat.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)

  gptr is now uchar*

  template can't be static on xlC_r?
storage/ndb/test/ndbapi/test_event_merge.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)

  gptr is now uchar*
storage/ndb/test/run-test/main.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)

  gptr is now uchar*
storage/ndb/test/src/NDBT_Test.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)

  gptr is now uchar*
---
 config/ac-macros/ha_ndbcluster.m4            |  7 ++++
 storage/ndb/src/mgmclient/Makefile.am        |  2 +-
 storage/ndb/src/ndbapi/NdbScanOperation.cpp  |  2 +-
 storage/ndb/test/ndbapi/testIndexStat.cpp    | 30 ++++++++--------
 storage/ndb/test/ndbapi/test_event_merge.cpp | 34 +++++++++---------
 storage/ndb/test/run-test/main.cpp           | 36 ++++++++++----------
 storage/ndb/test/src/NDBT_Test.cpp           | 20 +++++------
 7 files changed, 69 insertions(+), 62 deletions(-)

diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index c6327c46f15..60ca92abc10 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -277,6 +277,13 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
     ndb_bin_am_ldflags=""
   fi
 
+  # building dynamic breaks on AIX. (If you want to try it and get unresolved
+  # __vec__delete2 and some such, try linking against libhC.)
+  case "$host_os" in
+    aix3.* | aix4.0.* | aix4.1.*) ;;
+    *) ndb_bin_am_ldflags="-static";;
+  esac
+
   # libndbclient versioning when linked with GNU ld.
   if $LD --version 2>/dev/null|grep -q GNU; then
     NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver"
diff --git a/storage/ndb/src/mgmclient/Makefile.am b/storage/ndb/src/mgmclient/Makefile.am
index 96cbef61700..41f659cf68d 100644
--- a/storage/ndb/src/mgmclient/Makefile.am
+++ b/storage/ndb/src/mgmclient/Makefile.am
@@ -36,7 +36,7 @@ INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi \
 LDADD_LOC = $(noinst_LTLIBRARIES) \
 	    ../common/portlib/libportlib.la \
             @readline_link@ \
-            $(top_builddir)/ndb/src/libndbclient.la \
+            $(top_builddir)/storage/ndb/src/libndbclient.la \
             $(top_builddir)/dbug/libdbug.a \
             $(top_builddir)/mysys/libmysys.a \
             $(top_builddir)/strings/libmystrings.a \
diff --git a/storage/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
index fa94bf8d836..89782453a72 100644
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -1202,7 +1202,7 @@ NdbIndexScanOperation::setBound(const NdbColumnImpl* tAttrInfo,
     Uint32 tupKeyLen = theTupKeyLen;
     union {
       Uint32 tempData[2000];
-      Uint64 __align;
+      Uint64 __my_align;
     };
     Uint64 *valPtr;
     if(remaining > totalLen && aligned && nobytes){
diff --git a/storage/ndb/test/ndbapi/testIndexStat.cpp b/storage/ndb/test/ndbapi/testIndexStat.cpp
index 7c69361a732..0e15cdd80d1 100644
--- a/storage/ndb/test/ndbapi/testIndexStat.cpp
+++ b/storage/ndb/test/ndbapi/testIndexStat.cpp
@@ -1210,8 +1210,8 @@ struct V_rir {
   static double data(const Range& range) { return (double)range.errpct; }
 };
 
-template static void computestat<Key, V_rpk>(Stat& stat);
-template static void computestat<Range, V_rir>(Stat& stat);
+template void computestat<Key, V_rpk>(Stat& stat);
+template void computestat<Range, V_rir>(Stat& stat);
 
 static Stat g_stat_rpk; // summaries over loops
 static Stat g_stat_rir;
@@ -1297,43 +1297,43 @@ my_long_options[] =
 {
   NDB_STD_OPTS("testIndexStat"),
   { "loglevel", 1001, "Logging level in this program 0-3 (default 0)",
-    (gptr*)&g_opts.loglevel, (gptr*)&g_opts.loglevel, 0,
+    (uchar **)&g_opts.loglevel, (uchar **)&g_opts.loglevel, 0,
     GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { "seed", 1002, "Random seed (0=loop number, default -1=random)",
-    (gptr*)&g_opts.seed, (gptr*)&g_opts.seed, 0,
+    (uchar **)&g_opts.seed, (uchar **)&g_opts.seed, 0,
     GET_INT, REQUIRED_ARG, -1, 0, 0, 0, 0, 0 },
   { "loop", 1003, "Number of test loops (default 1, 0=forever)",
-    (gptr*)&g_opts.loop, (gptr*)&g_opts.loop, 0,
+    (uchar **)&g_opts.loop, (uchar **)&g_opts.loop, 0,
     GET_INT, REQUIRED_ARG, 1, 0, 0, 0, 0, 0 },
   { "rows", 1004, "Number of rows (default 100000)",
-    (gptr*)&g_opts.rows, (gptr*)&g_opts.rows, 0,
+    (uchar **)&g_opts.rows, (uchar **)&g_opts.rows, 0,
     GET_UINT, REQUIRED_ARG, 100000, 0, 0, 0, 0, 0 },
   { "ops", 1005, "Number of index scans per loop (default 1000)",
-    (gptr*)&g_opts.ops, (gptr*)&g_opts.ops, 0,
+    (uchar **)&g_opts.ops, (uchar **)&g_opts.ops, 0,
     GET_UINT, REQUIRED_ARG, 1000, 0, 0, 0, 0, 0 },
   { "dupkeys", 1006, "Pct records per key (min 100, default 1000)",
-    (gptr*)&g_opts.dupkeys, (gptr*)&g_opts.dupkeys, 0,
+    (uchar **)&g_opts.dupkeys, (uchar **)&g_opts.dupkeys, 0,
     GET_UINT, REQUIRED_ARG, 1000, 0, 0, 0, 0, 0 },
   { "scanpct", 1007, "Preferred max pct of total rows per scan (default 5)",
-    (gptr*)&g_opts.scanpct, (gptr*)&g_opts.scanpct, 0,
+    (uchar **)&g_opts.scanpct, (uchar **)&g_opts.scanpct, 0,
     GET_UINT, REQUIRED_ARG, 5, 0, 0, 0, 0, 0 },
   { "nullkeys", 1008, "Pct nulls in each key attribute (default 10)",
-    (gptr*)&g_opts.nullkeys, (gptr*)&g_opts.nullkeys, 0,
+    (uchar **)&g_opts.nullkeys, (uchar **)&g_opts.nullkeys, 0,
     GET_UINT, REQUIRED_ARG, 10, 0, 0, 0, 0, 0 },
   { "eqscans", 1009, "Pct scans for partial/full equality (default 50)",
-    (gptr*)&g_opts.eqscans, (gptr*)&g_opts.eqscans, 0,
+    (uchar **)&g_opts.eqscans, (uchar **)&g_opts.eqscans, 0,
     GET_UINT, REQUIRED_ARG, 50, 0, 0, 0, 0, 0 },
   { "dupscans", 1010, "Pct scans using same bounds (default 10)",
-    (gptr*)&g_opts.dupscans, (gptr*)&g_opts.dupscans, 0,
+    (uchar **)&g_opts.dupscans, (uchar **)&g_opts.dupscans, 0,
     GET_UINT, REQUIRED_ARG, 10, 0, 0, 0, 0, 0 },
   { "keeptable", 1011, "Use existing table and data if any and do not drop",
-    (gptr*)&g_opts.keeptable, (gptr*)&g_opts.keeptable, 0,
+    (uchar **)&g_opts.keeptable, (uchar **)&g_opts.keeptable, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "no-extra-checks", 1012, "Omit expensive consistency checks",
-    (gptr*)&g_opts.nochecks, (gptr*)&g_opts.nochecks, 0,
+    (uchar **)&g_opts.nochecks, (uchar **)&g_opts.nochecks, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "abort-on-error", 1013, "Dump core on any error",
-    (gptr*)&g_opts.abort, (gptr*)&g_opts.abort, 0,
+    (uchar **)&g_opts.abort, (uchar **)&g_opts.abort, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { 0, 0, 0,
     0, 0, 0,
diff --git a/storage/ndb/test/ndbapi/test_event_merge.cpp b/storage/ndb/test/ndbapi/test_event_merge.cpp
index 662b1eb6f4c..d40b985adc2 100644
--- a/storage/ndb/test/ndbapi/test_event_merge.cpp
+++ b/storage/ndb/test/ndbapi/test_event_merge.cpp
@@ -2184,57 +2184,57 @@ my_long_options[] =
 {
   NDB_STD_OPTS("test_event_merge"),
   { "abort-on-error", 1001, "Do abort() on any error",
-    (gptr*)&g_opts.abort_on_error, (gptr*)&g_opts.abort_on_error, 0,
+    (uchar **)&g_opts.abort_on_error, (uchar **)&g_opts.abort_on_error, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "loglevel", 1002, "Logging level in this program 0-3 (default 0)",
-    (gptr*)&g_opts.loglevel, (gptr*)&g_opts.loglevel, 0,
+    (uchar **)&g_opts.loglevel, (uchar **)&g_opts.loglevel, 0,
     GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { "loop", 1003, "Number of test loops (default 5, 0=forever)",
-    (gptr*)&g_opts.loop, (gptr*)&g_opts.loop, 0,
+    (uchar **)&g_opts.loop, (uchar **)&g_opts.loop, 0,
     GET_INT, REQUIRED_ARG, 5, 0, 0, 0, 0, 0 },
   { "maxops", 1004, "Approx number of PK operations per table (default 1000)",
-    (gptr*)&g_opts.maxops, (gptr*)&g_opts.maxops, 0,
+    (uchar **)&g_opts.maxops, (uchar **)&g_opts.maxops, 0,
     GET_UINT, REQUIRED_ARG, 1000, 0, 0, 0, 0, 0 },
   { "maxpk", 1005, "Number of different PK values (default 10, max 1000)",
-    (gptr*)&g_opts.maxpk, (gptr*)&g_opts.maxpk, 0,
+    (uchar **)&g_opts.maxpk, (uchar **)&g_opts.maxpk, 0,
     GET_UINT, REQUIRED_ARG, 10, 0, 0, 0, 0, 0 },
   { "maxtab", 1006, "Number of tables (default 10, max 100)",
-    (gptr*)&g_opts.maxtab, (gptr*)&g_opts.maxtab, 0,
+    (uchar **)&g_opts.maxtab, (uchar **)&g_opts.maxtab, 0,
     GET_INT, REQUIRED_ARG, 10, 0, 0, 0, 0, 0 },
   { "no-blobs", 1007, "Omit blob attributes (5.0: true)",
-    (gptr*)&g_opts.no_blobs, (gptr*)&g_opts.no_blobs, 0,
+    (uchar **)&g_opts.no_blobs, (uchar **)&g_opts.no_blobs, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "no-implicit-nulls", 1008, "Insert must include all attrs"
                                " i.e. no implicit NULLs",
-    (gptr*)&g_opts.no_implicit_nulls, (gptr*)&g_opts.no_implicit_nulls, 0,
+    (uchar **)&g_opts.no_implicit_nulls, (uchar **)&g_opts.no_implicit_nulls, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "no-missing-update", 1009, "Update must include all non-PK attrs",
-    (gptr*)&g_opts.no_missing_update, (gptr*)&g_opts.no_missing_update, 0,
+    (uchar **)&g_opts.no_missing_update, (uchar **)&g_opts.no_missing_update, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "no-multiops", 1010, "Allow only 1 operation per commit",
-    (gptr*)&g_opts.no_multiops, (gptr*)&g_opts.no_multiops, 0,
+    (uchar **)&g_opts.no_multiops, (uchar **)&g_opts.no_multiops, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "no-nulls", 1011, "Create no NULL values",
-    (gptr*)&g_opts.no_nulls, (gptr*)&g_opts.no_nulls, 0,
+    (uchar **)&g_opts.no_nulls, (uchar **)&g_opts.no_nulls, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "one-blob", 1012, "Only one blob attribute (default 2)",
-    (gptr*)&g_opts.one_blob, (gptr*)&g_opts.one_blob, 0,
+    (uchar **)&g_opts.one_blob, (uchar **)&g_opts.one_blob, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "opstring", 1013, "Operations to run e.g. idiucdc (c is commit) or"
                       " iuuc:uudc (the : separates loops)",
-    (gptr*)&g_opts.opstring, (gptr*)&g_opts.opstring, 0,
+    (uchar **)&g_opts.opstring, (uchar **)&g_opts.opstring, 0,
     GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { "seed", 1014, "Random seed (0=loop number, default -1=random)",
-    (gptr*)&g_opts.seed, (gptr*)&g_opts.seed, 0,
+    (uchar **)&g_opts.seed, (uchar **)&g_opts.seed, 0,
     GET_INT, REQUIRED_ARG, -1, 0, 0, 0, 0, 0 },
   { "separate-events", 1015, "Do not combine events per GCI (5.0: true)",
-    (gptr*)&g_opts.separate_events, (gptr*)&g_opts.separate_events, 0,
+    (uchar **)&g_opts.separate_events, (uchar **)&g_opts.separate_events, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "tweak", 1016, "Whatever the source says",
-    (gptr*)&g_opts.tweak, (gptr*)&g_opts.tweak, 0,
+    (uchar **)&g_opts.tweak, (uchar **)&g_opts.tweak, 0,
     GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { "use-table", 1017, "Use existing tables",
-    (gptr*)&g_opts.use_table, (gptr*)&g_opts.use_table, 0,
+    (uchar **)&g_opts.use_table, (uchar **)&g_opts.use_table, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { 0, 0, 0,
     0, 0, 0,
diff --git a/storage/ndb/test/run-test/main.cpp b/storage/ndb/test/run-test/main.cpp
index 2e8d6bfde6d..b5c4385f5d3 100644
--- a/storage/ndb/test/run-test/main.cpp
+++ b/storage/ndb/test/run-test/main.cpp
@@ -77,60 +77,60 @@ my_bool opt_core;
 static struct my_option g_options[] =
 {
   { "help", '?', "Display this help and exit.", 
-    (gptr*) &g_help, (gptr*) &g_help,
+    (uchar **) &g_help, (uchar **) &g_help,
     0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, 
   { "version", 'V', "Output version information and exit.", 0, 0, 0, 
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, 
   { "clusters", 256, "Cluster",
-    (gptr*) &g_clusters, (gptr*) &g_clusters,
+    (uchar **) &g_clusters, (uchar **) &g_clusters,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   { "replicate", 1024, "replicate",
-    (gptr*) &g_dummy, (gptr*) &g_dummy,
+    (uchar **) &g_dummy, (uchar **) &g_dummy,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   { "log-file", 256, "log-file",
-    (gptr*) &g_log_filename, (gptr*) &g_log_filename,
+    (uchar **) &g_log_filename, (uchar **) &g_log_filename,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   { "testcase-file", 'f', "testcase-file",
-    (gptr*) &g_test_case_filename, (gptr*) &g_test_case_filename,
+    (uchar **) &g_test_case_filename, (uchar **) &g_test_case_filename,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   { "report-file", 'r', "report-file",
-    (gptr*) &g_report_filename, (gptr*) &g_report_filename,
+    (uchar **) &g_report_filename, (uchar **) &g_report_filename,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   { "basedir", 256, "Base path",
-    (gptr*) &g_basedir, (gptr*) &g_basedir,
+    (uchar **) &g_basedir, (uchar **) &g_basedir,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   { "baseport", 256, "Base port",
-    (gptr*) &g_baseport, (gptr*) &g_baseport,
+    (uchar **) &g_baseport, (uchar **) &g_baseport,
     0, GET_INT, REQUIRED_ARG, g_baseport, 0, 0, 0, 0, 0},
   { "prefix", 256, "mysql install dir",
-    (gptr*) &g_prefix, (gptr*) &g_prefix,
+    (uchar **) &g_prefix, (uchar **) &g_prefix,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   { "verbose", 'v', "Verbosity",
-    (gptr*) &g_verbosity, (gptr*) &g_verbosity,
+    (uchar **) &g_verbosity, (uchar **) &g_verbosity,
     0, GET_INT, REQUIRED_ARG, g_verbosity, 0, 0, 0, 0, 0},
   { "configure", 256, "configure",
-    (gptr*) &g_do_setup, (gptr*) &g_do_setup,
+    (uchar **) &g_do_setup, (uchar **) &g_do_setup,
     0, GET_INT, REQUIRED_ARG, g_do_setup, 0, 0, 0, 0, 0 },
   { "deploy", 256, "deploy",
-    (gptr*) &g_do_deploy, (gptr*) &g_do_deploy,
+    (uchar **) &g_do_deploy, (uchar **) &g_do_deploy,
     0, GET_INT, REQUIRED_ARG, g_do_deploy, 0, 0, 0, 0, 0 },
   { "sshx", 256, "sshx",
-    (gptr*) &g_do_sshx, (gptr*) &g_do_sshx,
+    (uchar **) &g_do_sshx, (uchar **) &g_do_sshx,
     0, GET_INT, REQUIRED_ARG, g_do_sshx, 0, 0, 0, 0, 0 },
   { "start", 256, "start",
-    (gptr*) &g_do_start, (gptr*) &g_do_start,
+    (uchar **) &g_do_start, (uchar **) &g_do_start,
     0, GET_INT, REQUIRED_ARG, g_do_start, 0, 0, 0, 0, 0 },
   { "fqpn", 256, "Fully qualified path-names ",
-    (gptr*) &g_fqpn, (gptr*) &g_fqpn,
+    (uchar **) &g_fqpn, (uchar **) &g_fqpn,
     0, GET_INT, REQUIRED_ARG, g_fqpn, 0, 0, 0, 0, 0 },
   { "default-ports", 256, "Use default ports when possible",
-    (gptr*) &g_default_ports, (gptr*) &g_default_ports,
+    (uchar **) &g_default_ports, (uchar **) &g_default_ports,
     0, GET_INT, REQUIRED_ARG, g_default_ports, 0, 0, 0, 0, 0 },
   { "mode", 256, "Mode 0=interactive 1=regression 2=bench",
-    (gptr*) &g_mode, (gptr*) &g_mode,
+    (uchar **) &g_mode, (uchar **) &g_mode,
     0, GET_INT, REQUIRED_ARG, g_mode, 0, 0, 0, 0, 0 },
   { "quit", 256, "Quit before starting tests",
-    (gptr*) &g_mode, (gptr*) &g_do_quit,
+    (uchar **) &g_mode, (uchar **) &g_do_quit,
     0, GET_BOOL, NO_ARG, g_do_quit, 0, 0, 0, 0, 0 },
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
diff --git a/storage/ndb/test/src/NDBT_Test.cpp b/storage/ndb/test/src/NDBT_Test.cpp
index b30430c73c1..69f3723ca75 100644
--- a/storage/ndb/test/src/NDBT_Test.cpp
+++ b/storage/ndb/test/src/NDBT_Test.cpp
@@ -1195,35 +1195,35 @@ static struct my_option my_long_options[] =
 {
   NDB_STD_OPTS(""),
   { "print", OPT_PRINT, "Print execution tree",
-    (gptr*) &opt_print, (gptr*) &opt_print, 0,
+    (uchar **) &opt_print, (uchar **) &opt_print, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "print_html", OPT_PRINT_HTML, "Print execution tree in html table format",
-    (gptr*) &opt_print_html, (gptr*) &opt_print_html, 0,
+    (uchar **) &opt_print_html, (uchar **) &opt_print_html, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "print_cases", OPT_PRINT_CASES, "Print list of test cases",
-    (gptr*) &opt_print_cases, (gptr*) &opt_print_cases, 0,
+    (uchar **) &opt_print_cases, (uchar **) &opt_print_cases, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "records", 'r', "Number of records", 
-    (gptr*) &opt_records, (gptr*) &opt_records, 0,
+    (uchar **) &opt_records, (uchar **) &opt_records, 0,
     GET_INT, REQUIRED_ARG, 1000, 0, 0, 0, 0, 0 },
   { "loops", 'l', "Number of loops",
-    (gptr*) &opt_loops, (gptr*) &opt_loops, 0,
+    (uchar **) &opt_loops, (uchar **) &opt_loops, 0,
     GET_INT, REQUIRED_ARG, 5, 0, 0, 0, 0, 0 },
   { "seed", 1024, "Random seed",
-    (gptr*) &opt_seed, (gptr*) &opt_seed, 0,
+    (uchar **) &opt_seed, (uchar **) &opt_seed, 0,
     GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { "testname", 'n', "Name of test to run",
-    (gptr*) &opt_testname, (gptr*) &opt_testname, 0,
+    (uchar **) &opt_testname, (uchar **) &opt_testname, 0,
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { "remote_mgm", 'm',
     "host:port to mgmsrv of remote cluster",
-    (gptr*) &opt_remote_mgm, (gptr*) &opt_remote_mgm, 0,
+    (uchar **) &opt_remote_mgm, (uchar **) &opt_remote_mgm, 0,
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { "timer", 't', "Print execution time",
-    (gptr*) &opt_timer, (gptr*) &opt_timer, 0,
+    (uchar **) &opt_timer, (uchar **) &opt_timer, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "verbose", 'v', "Print verbose status",
-    (gptr*) &opt_verbose, (gptr*) &opt_verbose, 0,
+    (uchar **) &opt_verbose, (uchar **) &opt_verbose, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };

From 25723542a1ffcd3365b51a48bbab0e238306ab2a Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.(none)>
Date: Wed, 1 Aug 2007 12:28:08 +0400
Subject: [PATCH 128/139] Fix an unstable test. It was reliant on the current
 time.

mysql-test/r/func_time.result:
  Update results (use fixed datetime values instead of NOW()).
mysql-test/t/func_time.test:
  Use fixed datetime values instead of NOW(): the test would have a sporadic
  failure when current day changed between two consequtive calls to
  NOW(). The test actually tests FROM_DAYS/TO_DAYS functions,
  so use of NOW() is not necessary.
---
 mysql-test/r/func_time.result | 8 ++++----
 mysql-test/t/func_time.test   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index 56ea72a8ee3..f92ecac329a 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -840,11 +840,11 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Note	1003	select period_add(_latin1'9602',-(12)) AS `period_add("9602",-12)`,period_diff(199505,_latin1'9404') AS `period_diff(199505,"9404")`,from_days(to_days(_latin1'960101')) AS `from_days(to_days("960101"))`,dayofmonth(_latin1'1997-01-02') AS `dayofmonth("1997-01-02")`,month(_latin1'1997-01-02') AS `month("1997-01-02")`,monthname(_latin1'1972-03-04') AS `monthname("1972-03-04")`,dayofyear(_latin1'0000-00-00') AS `dayofyear("0000-00-00")`,hour(_latin1'1997-03-03 23:03:22') AS `HOUR("1997-03-03 23:03:22")`,minute(_latin1'23:03:22') AS `MINUTE("23:03:22")`,second(230322) AS `SECOND(230322)`,quarter(980303) AS `QUARTER(980303)`,week(_latin1'1998-03-03',0) AS `WEEK("1998-03-03")`,yearweek(_latin1'2000-01-01',1) AS `yearweek("2000-01-01",1)`,week(19950101,1) AS `week(19950101,1)`,year(_latin1'98-02-03') AS `year("98-02-03")`,(weekday(curdate()) - weekday(now())) AS `weekday(curdate())-weekday(now())`,dayname(_latin1'1962-03-03') AS `dayname("1962-03-03")`,unix_timestamp() AS `unix_timestamp()`,sec_to_time((time_to_sec(_latin1'0:30:47') / 6.21)) AS `sec_to_time(time_to_sec("0:30:47")/6.21)`,curtime() AS `curtime()`,utc_time() AS `utc_time()`,curdate() AS `curdate()`,utc_date() AS `utc_date()`,utc_timestamp() AS `utc_timestamp()`,date_format(_latin1'1997-01-02 03:04:05',_latin1'%M %W %D %Y %y %m %d %h %i %s %w') AS `date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w")`,from_unixtime(unix_timestamp(_latin1'1994-03-02 10:11:12')) AS `from_unixtime(unix_timestamp("1994-03-02 10:11:12"))`,(_latin1'1997-12-31 23:59:59' + interval 1 second) AS `"1997-12-31 23:59:59" + INTERVAL 1 SECOND`,(_latin1'1998-01-01 00:00:00' - interval 1 second) AS `"1998-01-01 00:00:00" - INTERVAL 1 SECOND`,(_latin1'1997-12-31' + interval 1 day) AS `INTERVAL 1 DAY + "1997-12-31"`,extract(year from _latin1'1999-01-02 10:11:12') AS `extract(YEAR FROM "1999-01-02 10:11:12")`,(_latin1'1997-12-31 23:59:59' + interval 1 second) AS `date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND)`
-SET @TMP=NOW();
+SET @TMP='2007-08-01 12:22:49';
 CREATE TABLE t1 (d DATETIME);
-INSERT INTO t1 VALUES (NOW());
-INSERT INTO t1 VALUES (NOW());
-INSERT INTO t1 VALUES (NOW());
+INSERT INTO t1 VALUES ('2007-08-01 12:22:59');
+INSERT INTO t1 VALUES ('2007-08-01 12:23:01');
+INSERT INTO t1 VALUES ('2007-08-01 12:23:20');
 SELECT count(*) FROM t1 WHERE d>FROM_DAYS(TO_DAYS(@TMP)) AND d<=FROM_DAYS(TO_DAYS(@TMP)+1);
 count(*)
 3
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test
index da909dc578f..4f35a681228 100644
--- a/mysql-test/t/func_time.test
+++ b/mysql-test/t/func_time.test
@@ -423,11 +423,11 @@ select strcmp(concat(utc_date(),' ',utc_time()),utc_timestamp())=0;
 
 explain extended select period_add("9602",-12),period_diff(199505,"9404"),from_days(to_days("960101")),dayofmonth("1997-01-02"), month("1997-01-02"), monthname("1972-03-04"),dayofyear("0000-00-00"),HOUR("1997-03-03 23:03:22"),MINUTE("23:03:22"),SECOND(230322),QUARTER(980303),WEEK("1998-03-03"),yearweek("2000-01-01",1),week(19950101,1),year("98-02-03"),weekday(curdate())-weekday(now()),dayname("1962-03-03"),unix_timestamp(),sec_to_time(time_to_sec("0:30:47")/6.21),curtime(),utc_time(),curdate(),utc_date(),utc_timestamp(),date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w"),from_unixtime(unix_timestamp("1994-03-02 10:11:12")),"1997-12-31 23:59:59" + INTERVAL 1 SECOND,"1998-01-01 00:00:00" - INTERVAL 1 SECOND,INTERVAL 1 DAY + "1997-12-31", extract(YEAR FROM "1999-01-02 10:11:12"),date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND);
 
-SET @TMP=NOW();
+SET @TMP='2007-08-01 12:22:49';
 CREATE TABLE t1 (d DATETIME);
-INSERT INTO t1 VALUES (NOW());
-INSERT INTO t1 VALUES (NOW());
-INSERT INTO t1 VALUES (NOW());
+INSERT INTO t1 VALUES ('2007-08-01 12:22:59');
+INSERT INTO t1 VALUES ('2007-08-01 12:23:01');
+INSERT INTO t1 VALUES ('2007-08-01 12:23:20');
 SELECT count(*) FROM t1 WHERE d>FROM_DAYS(TO_DAYS(@TMP)) AND d<=FROM_DAYS(TO_DAYS(@TMP)+1);
 DROP TABLE t1;
 

From c517fea540967e3922128a33a81bbdf7318285e1 Mon Sep 17 00:00:00 2001
From: unknown <jperkin@production.mysql.com>
Date: Wed, 1 Aug 2007 11:58:25 +0200
Subject: [PATCH 129/139] Option 6 tries to grant global privileges at the
 database level which does not work.  Removing these attempted privileges
 makes this identical to option 5 so remove it completely.  The spirit of the
 program appears to be aimed at database privileges, so do not add another
 option for granting global privileges as it may be unexpected.  Fixes
 bug#14618 (same as previous patch, this time applied to -maint tree).

scripts/mysql_setpermission.sh:
  Option 6 tries to apply global privileges at the database
  level which does not work - remove it.
---
 scripts/mysql_setpermission.sh | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/scripts/mysql_setpermission.sh b/scripts/mysql_setpermission.sh
index 9699cd28047..1f5509f9955 100644
--- a/scripts/mysql_setpermission.sh
+++ b/scripts/mysql_setpermission.sh
@@ -19,13 +19,14 @@
 ## 1.3 Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz>
 ##     (General code cleanup, use the GRANT statement instead of updating
 ##     the privilege tables directly, added option to revoke privileges)
+## 1.4 Remove option 6 which attempted to erroneously grant global privileges
 
 #### TODO
 #
 # empty ... suggestions ... mail them to me ...
 
 
-$version="1.3";
+$version="1.4";
 
 use DBI;
 use Getopt::Long;
@@ -103,13 +104,9 @@ sub q1 { # first question ...
 		print "     existing database and host combination (user can do\n";
 		print "     SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,\n";
 		print "     LOCK TABLES,CREATE TEMPORARY TABLES)\n";
-    print "  6. Create/append database administrative privileges for an\n";
-		print "     existing database and host combination (user can do\n";
-		print "     SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,\n";
-		print "     CREATE TEMPORARY TABLES,SHOW DATABASES,PROCESS)\n";
-    print "  7. Create/append full privileges for an existing database\n";
+    print "  6. Create/append full privileges for an existing database\n";
 		print "     and host combination (user has FULL privilege)\n";
-    print "  8. Remove all privileges for for an existing database and\n";
+    print "  7. Remove all privileges for for an existing database and\n";
 		print "     host combination.\n";
     print "     (user will have all permission fields set to N)\n";
     print "  0. exit this program\n";
@@ -117,10 +114,10 @@ sub q1 { # first question ...
     while (<STDIN>) {
       $answer = $_;
       chomp($answer);
-      if ($answer =~ /^[12345678]$/) {
+      if ($answer =~ /^[1234567]$/) {
         if ($answer == 1) {
 	   setpwd();
-        } elsif ($answer =~ /^[2345678]$/) {
+        } elsif ($answer =~ /^[234567]$/) {
 	   addall($answer);
 	} else {
           print "Sorry, something went wrong. With such option number you should not get here.\n\n";
@@ -233,7 +230,7 @@ sub addall {
   }
   }
 
-  if ( ( !$todo ) or not ( $todo =~ m/^[2-8]$/ ) ) {
+  if ( ( !$todo ) or not ( $todo =~ m/^[2-7]$/ ) ) {
     print STDERR "Sorry, select option $todo isn't known inside the program .. See ya\n";
     quit();
   }
@@ -256,12 +253,9 @@ sub addall {
       # user privileges: SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,CREATE TEMPORARY TABLES
       $sth = $dbh->do("GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,CREATE TEMPORARY TABLES ON $db.* TO $user@\"$host\" IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
     } elsif ($todo == 6) {
-       # admin privileges: GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,CREATE TEMPORARY TABLES,SHOW DATABASES,PROCESS
-       $sth = $dbh->do("GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,CREATE TEMPORARY TABLES,SHOW DATABASES,PROCESS ON $db.* TO $user@\"$host\" IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
-    } elsif ($todo == 7) {
        # all privileges
        $sth = $dbh->do("GRANT ALL ON $db.* TO \'$user\'\@\'$host\' IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
-    } elsif ($todo == 8) {
+    } elsif ($todo == 7) {
        # all privileges set to N
        $sth = $dbh->do("REVOKE ALL ON *.* FROM \'$user\'\@\'$host\'") || die $dbh->errstr;
     }

From f87acb594a15b415b58a3053e76bfd1b27a6d594 Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Wed, 1 Aug 2007 15:27:03 +0500
Subject: [PATCH 130/139] Fix for bug #29928: INSERT ...
 VALUES(connection_id(), ...) incorrect restores from mysqlbinlog out

Problem: using "mysqlbinlog | mysql" for recoveries the connection_id()
result may differ from what was used when issuing the statement.

Fix: if there is a connection_id() in a statement, write to binlog
SET pseudo_thread_id= XXX; before it and use the value later on.


mysql-test/r/mysqlbinlog.result:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect
  restores from mysqlbinlog out
    - test result.
mysql-test/t/mysqlbinlog.test:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect
  restores from mysqlbinlog out
    - test case.
sql/item_create.cc:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect
  restores from mysqlbinlog out
    - set thread_specific_used flag for the connection_id() function.
sql/item_func.cc:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect
  restores from mysqlbinlog out
    - always return thd->variables.pseudo_thread_id as a connection_id()
  result, as it contains a proper value for both master and slave.
sql/log_event.cc:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect
  restores from mysqlbinlog out
    - set LOG_EVENT_THREAD_SPECIFIC_F event flag if thread_specific_used
  is set.
sql/sql_class.cc:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect
  restores from mysqlbinlog out
    - thd->thread_specific_used introduced, which is set if thread specific
  value(s) used in a statement.
sql/sql_class.h:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect
  restores from mysqlbinlog out
    - thd->thread_specific_used introduced, which is set if thread specific
  value(s) used in a statement.
---
 mysql-test/r/mysqlbinlog.result |  7 +++++++
 mysql-test/t/mysqlbinlog.test   | 21 +++++++++++++++++++++
 sql/item_create.cc              |  4 +++-
 sql/item_func.cc                | 11 +----------
 sql/log_event.cc                | 11 +++++++----
 sql/sql_class.cc                |  2 +-
 sql/sql_class.h                 |  3 +++
 7 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
index 1ba198dfd75..d16a4c39a11 100644
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@@ -318,4 +318,11 @@ INSERT INTO t1 VALUES ('0123456789');
 flush logs;
 DROP TABLE t1;
 # 	Query	thread_id=REMOVED	exec_time=REMOVED	error_code=REMOVED
+flush logs;
+create table t1(a int);
+insert into t1 values(connection_id());
+flush logs;
+drop table t1;
+1
+drop table t1;
 End of 5.0 tests
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index bd90dcfb930..451eef17108 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -216,4 +216,25 @@ flush logs;
 DROP TABLE t1;
 --exec $MYSQL_BINLOG --hexdump --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000011 | grep 'Query' | sed 's/[0-9]\{1,\}/REMOVED/g'
 
+#
+# Bug #29928: incorrect connection_id() restoring from mysqlbinlog out
+#
+flush logs;
+create table t1(a int);
+insert into t1 values(connection_id()); 
+let $a= `select a from t1`;
+flush logs;
+--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000013 > $MYSQLTEST_VARDIR/tmp/bug29928.sql
+drop table t1;
+connect (con1, localhost, root, , test);                                            
+connection con1;
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug29928.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/bug29928.sql
+let $b= `select a from t1`;
+disconnect con1;
+connection default;
+let $c= `select $a=$b`;
+--echo $c
+drop table t1;
+
 --echo End of 5.0 tests
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 50db1c37371..3713fc9e380 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -70,7 +70,9 @@ Item *create_func_ceiling(Item* a)
 
 Item *create_func_connection_id(void)
 {
-  current_thd->lex->safe_to_cache_query= 0;
+  THD *thd= current_thd;
+  thd->lex->safe_to_cache_query= 0;
+  thd->thread_specific_used= TRUE;
   return new Item_func_connection_id();
 }
 
diff --git a/sql/item_func.cc b/sql/item_func.cc
index b256ce4624a..cada6019ffd 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -649,16 +649,7 @@ bool Item_func_connection_id::fix_fields(THD *thd, Item **ref)
 {
   if (Item_int_func::fix_fields(thd, ref))
     return TRUE;
-
-  /*
-    To replicate CONNECTION_ID() properly we should use
-    pseudo_thread_id on slave, which contains the value of thread_id
-    on master.
-  */
-  value= ((thd->slave_thread) ?
-          thd->variables.pseudo_thread_id :
-          thd->thread_id);
-
+  value= thd->variables.pseudo_thread_id;
   return FALSE;
 }
 
diff --git a/sql/log_event.cc b/sql/log_event.cc
index c37df31ae00..1ef765f607f 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1303,8 +1303,9 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg,
 				 ulong query_length, bool using_trans,
 				 bool suppress_use, THD::killed_state killed_status_arg)
   :Log_event(thd_arg,
-	     ((thd_arg->tmp_table_used ? LOG_EVENT_THREAD_SPECIFIC_F : 0)
-	      | (suppress_use          ? LOG_EVENT_SUPPRESS_USE_F    : 0)),
+             ((thd_arg->tmp_table_used || thd_arg->thread_specific_used) ? 
+	        LOG_EVENT_THREAD_SPECIFIC_F : 0) |
+	      (suppress_use ? LOG_EVENT_SUPPRESS_USE_F : 0),
 	     using_trans),
    data_buf(0), query(query_arg), catalog(thd_arg->catalog),
    db(thd_arg->db), q_len((uint32) query_length),
@@ -2689,8 +2690,10 @@ Load_log_event::Load_log_event(THD *thd_arg, sql_exchange *ex,
 			       List<Item> &fields_arg,
 			       enum enum_duplicates handle_dup,
 			       bool ignore, bool using_trans)
-  :Log_event(thd_arg, !thd_arg->tmp_table_used ?
-	     0 : LOG_EVENT_THREAD_SPECIFIC_F, using_trans),
+  :Log_event(thd_arg,
+             (thd_arg->tmp_table_used || thd_arg->thread_specific_used) ?
+               LOG_EVENT_THREAD_SPECIFIC_F : 0,
+             using_trans),
    thread_id(thd_arg->thread_id),
    slave_proxy_id(thd_arg->variables.pseudo_thread_id),
    num_fields(0),fields(0),
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index ee4e1ea149c..c4fc82e55ca 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -197,7 +197,7 @@ THD::THD()
   count_cuted_fields= CHECK_FIELD_IGNORE;
   killed= NOT_KILLED;
   db_length= col_access=0;
-  query_error= tmp_table_used= 0;
+  query_error= tmp_table_used= thread_specific_used= 0;
   next_insert_id=last_insert_id=0;
   hash_clear(&handler_tables_hash);
   tmp_table=0;
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 445a3ce437c..49f3e6354b9 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1457,6 +1457,9 @@ public:
   bool	     in_lock_tables;
   bool       query_error, bootstrap, cleanup_done;
   bool	     tmp_table_used;
+  
+  /**  is set if some thread specific value(s) used in a statement. */
+  bool       thread_specific_used;
   bool	     charset_is_system_charset, charset_is_collation_connection;
   bool       charset_is_character_set_filesystem;
   bool       enable_slow_log;   /* enable slow log for current statement */

From d2b9c8c219f9a51485b55a02b698d1087ad8cc4a Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.(none)>
Date: Wed, 1 Aug 2007 16:48:14 +0400
Subject: [PATCH 131/139] Fix an unstable test.

mysql-test/r/log_tables.result:
  Update results.
mysql-test/t/log_tables.test:
  Silence a race condition: TRUNCATE code issues mysql_frm_type without
  a metadata lock, and finds no table if hits the moment when
  ALTER is swapping two tables.
---
 mysql-test/r/log_tables.result | 29 +++++++++++++++++------------
 mysql-test/t/log_tables.test   | 30 ++++++++++++++++++------------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index 39349183276..9e67d328849 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -415,6 +415,8 @@ use test//
 create procedure proc25422_truncate_slow (loops int)
 begin
 declare v1 int default 0;
+declare continue handler for sqlexception /* errors from truncate */
+begin end;
 while v1 < loops do
 truncate mysql.slow_log;
 set v1 = v1 + 1;
@@ -423,6 +425,8 @@ end//
 create procedure proc25422_truncate_general (loops int)
 begin
 declare v1 int default 0;
+declare continue handler for sqlexception /* errors from truncate */
+begin end;
 while v1 < loops do
 truncate mysql.general_log;
 set v1 = v1 + 1;
@@ -454,23 +458,24 @@ set global general_log = @old_log_state;
 set v1 = v1 + 1;
 end while;
 end//
+set @iterations=100;
 "Serial test (proc25422_truncate_slow)"
-call proc25422_truncate_slow(100);
+call proc25422_truncate_slow(@iterations);
 "Serial test (proc25422_truncate_general)"
-call proc25422_truncate_general(100);
+call proc25422_truncate_general(@iterations);
 "Serial test (proc25422_alter_slow)"
-call proc25422_alter_slow(100);
+call proc25422_alter_slow(@iterations);
 "Serial test (proc25422_alter_general)"
-call proc25422_alter_general(100);
+call proc25422_alter_general(@iterations);
 "Parallel test"
-call proc25422_truncate_slow(100);
-call proc25422_truncate_slow(100);
-call proc25422_truncate_general(100);
-call proc25422_truncate_general(100);
-call proc25422_alter_slow(100);
-call proc25422_alter_slow(100);
-call proc25422_alter_general(100);
-call proc25422_alter_general(100);
+call proc25422_truncate_slow(@iterations);
+call proc25422_truncate_slow(@iterations);
+call proc25422_truncate_general(@iterations);
+call proc25422_truncate_general(@iterations);
+call proc25422_alter_slow(@iterations);
+call proc25422_alter_slow(@iterations);
+call proc25422_alter_general(@iterations);
+call proc25422_alter_general(@iterations);
 drop procedure proc25422_truncate_slow;
 drop procedure proc25422_truncate_general;
 drop procedure proc25422_alter_slow;
diff --git a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test
index 8baa4e5a373..89c7c255554 100644
--- a/mysql-test/t/log_tables.test
+++ b/mysql-test/t/log_tables.test
@@ -460,6 +460,8 @@ use test//
 create procedure proc25422_truncate_slow (loops int)
 begin
   declare v1 int default 0;
+  declare continue handler for sqlexception /* errors from truncate */
+    begin end;
   while v1 < loops do
     truncate mysql.slow_log;
     set v1 = v1 + 1;
@@ -469,6 +471,8 @@ end//
 create procedure proc25422_truncate_general (loops int)
 begin
   declare v1 int default 0;
+  declare continue handler for sqlexception /* errors from truncate */
+    begin end;
   while v1 < loops do
     truncate mysql.general_log;
     set v1 = v1 + 1;
@@ -507,14 +511,16 @@ end//
 
 delimiter ;//
 
+set @iterations=100;
+
 --echo "Serial test (proc25422_truncate_slow)"
-call proc25422_truncate_slow(100);
+call proc25422_truncate_slow(@iterations);
 --echo "Serial test (proc25422_truncate_general)"
-call proc25422_truncate_general(100);
+call proc25422_truncate_general(@iterations);
 --echo "Serial test (proc25422_alter_slow)"
-call proc25422_alter_slow(100);
+call proc25422_alter_slow(@iterations);
 --echo "Serial test (proc25422_alter_general)"
-call proc25422_alter_general(100);
+call proc25422_alter_general(@iterations);
 
 --echo "Parallel test"
 
@@ -532,24 +538,24 @@ connect (addconroot7, localhost, root,,);
 connect (addconroot8, localhost, root,,);
 
 connection addconroot1;
-send call proc25422_truncate_slow(100);
+send call proc25422_truncate_slow(@iterations);
 connection addconroot2;
-send call proc25422_truncate_slow(100);
+send call proc25422_truncate_slow(@iterations);
 
 connection addconroot3;
-send call proc25422_truncate_general(100);
+send call proc25422_truncate_general(@iterations);
 connection addconroot4;
-send call proc25422_truncate_general(100);
+send call proc25422_truncate_general(@iterations);
 
 connection addconroot5;
-send call proc25422_alter_slow(100);
+send call proc25422_alter_slow(@iterations);
 connection addconroot6;
-send call proc25422_alter_slow(100);
+send call proc25422_alter_slow(@iterations);
 
 connection addconroot7;
-send call proc25422_alter_general(100);
+send call proc25422_alter_general(@iterations);
 connection addconroot8;
-send call proc25422_alter_general(100);
+send call proc25422_alter_general(@iterations);
 
 connection addconroot1;
 reap;

From fce3a8a3182708baae83c06b77165122bd0d0814 Mon Sep 17 00:00:00 2001
From: unknown <joerg@trift2.>
Date: Wed, 1 Aug 2007 15:20:11 +0200
Subject: [PATCH 132/139] Fix a bad BitKeeper dependency structure for the
 "funcs_2" suite:

The files below "mysql-test/suite/funcs_2" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.

Foreach file F in the suite that has a "deleted" counterpart D, use
    bk rm $F
    bk mv $D $F
    bk edit $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.

There is only one file whose contents differs between 5.0 and 5.1,
restore its current 5.1 contents:
   mysql-test/suite/funcs_2/r/ndb_charset.result


BitKeeper/deleted/.del-charset_master.test~3ac6827798431a7:
  Delete: mysql-test/suite/funcs_2/charset/charset_master.test
mysql-test/suite/funcs_2/charset/charset_master.test:
  Rename: BitKeeper/deleted/.del-charset_master.test -> mysql-test/suite/funcs_2/charset/charset_master.test
BitKeeper/deleted/.del-charset_utf8.txt~c8409ddc3d216d4:
  Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt
BitKeeper/deleted/.del-check_charset.inc~1328722ebe51ab2b:
  Delete: mysql-test/suite/funcs_2/include/check_charset.inc
mysql-test/suite/funcs_2/data/charset_utf8.txt:
  Rename: BitKeeper/deleted/.del-charset_utf8.txt -> mysql-test/suite/funcs_2/data/charset_utf8.txt
mysql-test/suite/funcs_2/include/check_charset.inc:
  Rename: BitKeeper/deleted/.del-check_charset.inc -> mysql-test/suite/funcs_2/include/check_charset.inc
BitKeeper/deleted/.del-check_charset_ucs2.inc~fbcdbb34f38ce9f1:
  Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
BitKeeper/deleted/.del-check_charset_utf8.inc~703a0b77d86f514e:
  Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-gen_charset_utf8.pl~ff00332572f0f0b6:
  Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
mysql-test/suite/funcs_2/include/check_charset_ucs2.inc:
  Rename: BitKeeper/deleted/.del-check_charset_ucs2.inc -> mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
mysql-test/suite/funcs_2/include/check_charset_utf8.inc:
  Rename: BitKeeper/deleted/.del-check_charset_utf8.inc -> mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-innodb_charset.result~5a9b45c455263e16:
  Delete: mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-memory_charset.result~3e27ebf0471b3472:
  Delete: mysql-test/suite/funcs_2/r/memory_charset.result
mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl:
  Rename: BitKeeper/deleted/.del-gen_charset_utf8.pl -> mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
mysql-test/suite/funcs_2/r/innodb_charset.result:
  Rename: BitKeeper/deleted/.del-innodb_charset.result -> mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-myisam_charset.result~e86d46123a579771:
  Delete: mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-ndb_charset.result~37be292ee7801689:
  Delete: mysql-test/suite/funcs_2/r/ndb_charset.result
mysql-test/suite/funcs_2/r/memory_charset.result:
  Rename: BitKeeper/deleted/.del-memory_charset.result -> mysql-test/suite/funcs_2/r/memory_charset.result
mysql-test/suite/funcs_2/r/myisam_charset.result:
  Rename: BitKeeper/deleted/.del-myisam_charset.result -> mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-innodb_charset.test~4555b7e4a5caa39:
  Delete: mysql-test/suite/funcs_2/t/innodb_charset.test
BitKeeper/deleted/.del-memory_charset.test~4f055ebb453f58fd:
  Delete: mysql-test/suite/funcs_2/t/memory_charset.test
BitKeeper/deleted/.del-myisam_charset.test~f859c5b56700de58:
  Delete: mysql-test/suite/funcs_2/t/myisam_charset.test
mysql-test/suite/funcs_2/t/innodb_charset.test:
  Rename: BitKeeper/deleted/.del-innodb_charset.test -> mysql-test/suite/funcs_2/t/innodb_charset.test
mysql-test/suite/funcs_2/t/memory_charset.test:
  Rename: BitKeeper/deleted/.del-memory_charset.test -> mysql-test/suite/funcs_2/t/memory_charset.test
mysql-test/suite/funcs_2/t/myisam_charset.test:
  Rename: BitKeeper/deleted/.del-myisam_charset.test -> mysql-test/suite/funcs_2/t/myisam_charset.test
BitKeeper/deleted/.del-ndb_charset.test~354cbaeb1bc2f75d:
  Delete: mysql-test/suite/funcs_2/t/ndb_charset.test
BitKeeper/deleted/.del-readme.txt~e8399f1a3f34d433:
  Delete: mysql-test/suite/funcs_2/readme.txt
mysql-test/suite/funcs_2/readme.txt:
  Rename: BitKeeper/deleted/.del-readme.txt~2 -> mysql-test/suite/funcs_2/readme.txt
mysql-test/suite/funcs_2/t/ndb_charset.test:
  Rename: BitKeeper/deleted/.del-ndb_charset.test -> mysql-test/suite/funcs_2/t/ndb_charset.test
mysql-test/suite/funcs_2/r/ndb_charset.result:
  Fix a bad BitKeeper dependency structure for the "funcs_2" suite:

  Restore the 5.1 contents into the 5.0-dependent file.

From be4cfe504e081b79fbfd1870e1bca94795d20633 Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Wed, 1 Aug 2007 19:20:25 +0500
Subject: [PATCH 133/139] After-merge fixup.   - THD::tmp_table_used removed,
 THD::thread_specific_used used instead.

---
 sql/item_create.cc | 1 +
 sql/log_event.cc   | 8 +++-----
 sql/sql_base.cc    | 2 +-
 sql/sql_class.cc   | 2 +-
 sql/sql_class.h    | 1 -
 sql/sql_parse.cc   | 2 +-
 sql/sql_table.cc   | 4 ++--
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/sql/item_create.cc b/sql/item_create.cc
index fa15b992e5c..06996cdaa3b 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -2861,6 +2861,7 @@ Item*
 Create_func_connection_id::create(THD *thd)
 {
   thd->lex->safe_to_cache_query= 0;
+  thd->thread_specific_used= TRUE;
   return new (thd->mem_root) Item_func_connection_id();
 }
 
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 7fbf8f8bd00..62b90986cfd 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1479,9 +1479,8 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg,
 				 ulong query_length, bool using_trans,
 				 bool suppress_use, THD::killed_state killed_status_arg)
   :Log_event(thd_arg,
-             ((thd_arg->tmp_table_used || thd_arg->thread_specific_used) ? 
-	        LOG_EVENT_THREAD_SPECIFIC_F : 0) |
-	      (suppress_use ? LOG_EVENT_SUPPRESS_USE_F : 0),
+             (thd_arg->thread_specific_used ? LOG_EVENT_THREAD_SPECIFIC_F : 0) |
+               (suppress_use ? LOG_EVENT_SUPPRESS_USE_F : 0),
 	     using_trans),
    data_buf(0), query(query_arg), catalog(thd_arg->catalog),
    db(thd_arg->db), q_len((uint32) query_length),
@@ -2914,8 +2913,7 @@ Load_log_event::Load_log_event(THD *thd_arg, sql_exchange *ex,
 			       enum enum_duplicates handle_dup,
 			       bool ignore, bool using_trans)
   :Log_event(thd_arg,
-             (thd_arg->tmp_table_used || thd_arg->thread_specific_used) ?
-               LOG_EVENT_THREAD_SPECIFIC_F : 0,
+             thd_arg->thread_specific_used ? LOG_EVENT_THREAD_SPECIFIC_F : 0,
              using_trans),
    thread_id(thd_arg->thread_id),
    slave_proxy_id(thd_arg->variables.pseudo_thread_id),
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index f1319010270..138f8acecb6 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2277,7 +2277,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
 	}
 	table->query_id= thd->query_id;
 	table->clear_query_id= 1;
-	thd->tmp_table_used= 1;
+	thd->thread_specific_used= TRUE;
         DBUG_PRINT("info",("Using temporary table"));
         goto reset;
       }
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 514de445b56..e658f2f9a60 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -394,7 +394,7 @@ THD::THD()
   count_cuted_fields= CHECK_FIELD_IGNORE;
   killed= NOT_KILLED;
   db_length= col_access=0;
-  query_error= tmp_table_used= thread_specific_used= 0;
+  query_error= thread_specific_used= FALSE;
   hash_clear(&handler_tables_hash);
   tmp_table=0;
   used_tables=0;
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 38782c57a40..3a818490c76 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1405,7 +1405,6 @@ public:
   bool       substitute_null_with_insert_id;
   bool	     in_lock_tables;
   bool       query_error, bootstrap, cleanup_done;
-  bool	     tmp_table_used;
   
   /**  is set if some thread specific value(s) used in a statement. */
   bool       thread_specific_used;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 93887db88e1..244df65a2ee 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5150,7 +5150,7 @@ void mysql_reset_thd_for_next_command(THD *thd)
     thd->no_trans_update.all= FALSE;
   }
   DBUG_ASSERT(thd->security_ctx== &thd->main_security_ctx);
-  thd->tmp_table_used= 0;
+  thd->thread_specific_used= FALSE;
   if (!thd->in_sub_stmt)
   {
     if (opt_bin_log)
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 33448ea3c5f..219e536955a 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1656,7 +1656,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
     on the table name.
   */
   pthread_mutex_unlock(&LOCK_open);
-  thd->tmp_table_used= tmp_table_deleted;
+  thd->thread_specific_used|= tmp_table_deleted;
   error= 0;
   if (wrong_tables.length())
   {
@@ -3408,7 +3408,7 @@ bool mysql_create_table_no_lock(THD *thd,
       (void) rm_temporary_table(create_info->db_type, path);
       goto unlock_and_end;
     }
-    thd->tmp_table_used= 1;
+    thd->thread_specific_used= TRUE;
   }
 
   /*

From ccada6ff956e2fed0347051890445049ec9ed8df Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.(none)>
Date: Wed, 1 Aug 2007 22:40:04 +0400
Subject: [PATCH 134/139] Fix a valgrind warning. For some reason it never
 popped up before.

sql/sql_class.cc:
  Fix a valgrind warning (row_count_func is used before it was initialized
  in SQLCOM_CALL)
---
 sql/sql_class.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index da975ee3103..31621c531b0 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -400,6 +400,7 @@ THD::THD()
   used_tables=0;
   cuted_fields= sent_row_count= row_count= 0L;
   limit_found_rows= 0;
+  row_count_func= -1;
   statement_id_counter= 0UL;
 #ifdef ERROR_INJECT_SUPPORT
   error_inject_value= 0UL;

From 971050de2635c5b63b33e658ad1a96a910abf856 Mon Sep 17 00:00:00 2001
From: unknown <tsmith@ramayana.hindu.god>
Date: Wed, 1 Aug 2007 16:45:55 -0600
Subject: [PATCH 135/139] Remove some redundant or unused code from InnoDB
 (feedback from Marko after applying latest snapshot).

storage/innobase/handler/ha_innodb.cc:
  Remove redundant assignment to thd_to_trx(thd); trx is
  declared as a reference to thd_to_trx(thd) at the top
  of the function, so this assignment isn't useful.
storage/innobase/include/trx0trx.h:
  Remove two unused members from struct trx_struct.  allow_duplicates
  and replace_duplicates are not used; a single duplicates member is
  used instead to represent both flags.
---
 storage/innobase/handler/ha_innodb.cc | 2 --
 storage/innobase/include/trx0trx.h    | 8 --------
 2 files changed, 10 deletions(-)

diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index ca566f1300e..52cd09c351e 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -947,8 +947,6 @@ check_trx_exists(
 		/* Update the info whether we should skip XA steps that eat
 		CPU time */
 		trx->support_xa = THDVAR(thd, support_xa);
-
-		thd_to_trx(thd) = trx;
 	} else {
 		if (trx->magic_n != TRX_MAGIC_N) {
 			mem_analyze_corruption(trx);
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
index eeda2a7a52c..2459e76c4c1 100644
--- a/storage/innobase/include/trx0trx.h
+++ b/storage/innobase/include/trx0trx.h
@@ -512,14 +512,6 @@ struct trx_struct{
 	ulint		mysql_process_no;/* since in Linux, 'top' reports
 					process id's and not thread id's, we
 					store the process number too */
-	ibool		allow_duplicates;/* normally FALSE, but if the user
-					wants to update duplicate rows,
-					(in table inserts, for example) we
-					set this TRUE */
-	ibool		replace_duplicates;/* normally FALSE, but if the user
-					wants to replace duplicate rows,
-					(in table inserts, for example) we
-					set this TRUE */
 	/*------------------------------*/
 	ulint		n_mysql_tables_in_use; /* number of Innobase tables
 					used in the processing of the current

From c7419debba007918f6317ccf844ae333031fcff5 Mon Sep 17 00:00:00 2001
From: unknown <tsmith@ramayana.hindu.god>
Date: Thu, 2 Aug 2007 02:22:31 -0600
Subject: [PATCH 136/139] Post-merge fix.  Update some test results, and add an
 InnoDB-only compatibility hook, thd_mark_transaction_to_rollback().

mysql-test/r/ps.result:
  Post-merge fix.   Changes for WL 3984 (Revise locking
  of mysql.general_log and mysql.slow_log) cause some test
  result differences.
mysql-test/r/show_check.result:
  Post-merge fix.   Changes for WL 3984 (Revise locking
  of mysql.general_log and mysql.slow_log) cause some test
  result differences.
sql/sql_class.cc:
  Post-merge fix, add InnoDB compatibility hook (defined for
  InnoDB only), thd_mark_transaction_to_rollback().
storage/innobase/handler/ha_innodb.cc:
  Post-merge fix, add InnoDB compatibility hook (defined for
  InnoDB only), thd_mark_transaction_to_rollback().
storage/innobase/handler/ha_innodb.h:
  Post-merge fix, add InnoDB compatibility hook (defined for
  InnoDB only), thd_mark_transaction_to_rollback().
---
 mysql-test/r/ps.result                | 35 +++++++++++----------------
 mysql-test/r/show_check.result        |  7 ++----
 sql/sql_class.cc                      |  5 ++++
 storage/innobase/handler/ha_innodb.cc |  6 ++---
 storage/innobase/handler/ha_innodb.h  |  7 ++++++
 5 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 341a6b7cd43..edac68a88d6 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1857,10 +1857,9 @@ select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	0	0
-mysql	slow_log	0	0
-mysql	host	0	0
 mysql	user	0	0
+mysql	general_log	0	0
+mysql	host	0	0
 call proc_1();
 show open tables from mysql;
 Database	Table	In_use	Name_locked
@@ -1871,10 +1870,9 @@ select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	0	0
-mysql	slow_log	0	0
-mysql	host	0	0
 mysql	user	0	0
+mysql	general_log	0	0
+mysql	host	0	0
 call proc_1();
 show open tables from mysql;
 Database	Table	In_use	Name_locked
@@ -1885,10 +1883,9 @@ select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	0	0
-mysql	slow_log	0	0
-mysql	host	0	0
 mysql	user	0	0
+mysql	general_log	0	0
+mysql	host	0	0
 call proc_1();
 show open tables from mysql;
 Database	Table	In_use	Name_locked
@@ -1899,10 +1896,9 @@ select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	0	0
-mysql	slow_log	0	0
-mysql	host	0	0
 mysql	user	0	0
+mysql	general_log	0	0
+mysql	host	0	0
 flush tables;
 create function func_1() returns int begin flush tables; return 1; end|
 ERROR 0A000: FLUSH is not allowed in stored function or trigger
@@ -1932,10 +1928,9 @@ select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	0	0
-mysql	slow_log	0	0
-mysql	host	0	0
 mysql	user	0	0
+mysql	general_log	0	0
+mysql	host	0	0
 execute abc;
 show open tables from mysql;
 Database	Table	In_use	Name_locked
@@ -1946,10 +1941,9 @@ select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	0	0
-mysql	slow_log	0	0
-mysql	host	0	0
 mysql	user	0	0
+mysql	general_log	0	0
+mysql	host	0	0
 execute abc;
 show open tables from mysql;
 Database	Table	In_use	Name_locked
@@ -1960,10 +1954,9 @@ select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	general_log	0	0
-mysql	slow_log	0	0
-mysql	host	0	0
 mysql	user	0	0
+mysql	general_log	0	0
+mysql	host	0	0
 flush tables;
 deallocate prepare abc;
 create procedure proc_1() flush logs;
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 669043b5656..1a34dd84dd7 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -256,9 +256,8 @@ create table t1(n int);
 insert into t1 values (1);
 show open tables;
 Database	Table	In_use	Name_locked
-mysql	general_log	0	0
-mysql	slow_log	0	0
 test	t1	0	0
+mysql	general_log	0	0
 drop table t1;
 create table t1 (a int not null, b VARCHAR(10), INDEX (b) ) AVG_ROW_LENGTH=10 CHECKSUM=1 COMMENT="test" ENGINE=MYISAM MIN_ROWS=10 MAX_ROWS=100 PACK_KEYS=1 DELAY_KEY_WRITE=1 ROW_FORMAT=fixed;
 show create table t1;
@@ -685,9 +684,8 @@ Database	Table	In_use	Name_locked
 mysql	db	0	0
 mysql	time_zone	0	0
 mysql	general_log	0	0
-mysql	slow_log	0	0
-mysql	user	0	0
 mysql	proc	0	0
+mysql	user	0	0
 mysql	time_zone_name	0	0
 SHOW OPEN TABLES FROM mysql LIKE 'u%';
 Database	Table	In_use	Name_locked
@@ -702,7 +700,6 @@ SHOW OPEN TABLES LIKE '%o%';
 Database	Table	In_use	Name_locked
 mysql	time_zone	0	0
 mysql	general_log	0	0
-mysql	slow_log	0	0
 mysql	proc	0	0
 mysql	time_zone_name	0	0
 FLUSH TABLES;
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index c7c6a164e10..0135acddd8c 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -2583,6 +2583,11 @@ extern "C" int thd_binlog_format(const MYSQL_THD thd)
 {
   return (int) thd->variables.binlog_format;
 }
+
+extern "C" void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all)
+{
+  mark_transaction_to_rollback(thd, all);
+}
 #endif // INNODB_COMPATIBILITY_HOOKS */
 
 /****************************************************************************
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 0a1e63a4c65..f606134578a 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -601,7 +601,7 @@ convert_error_code_to_mysql(
 		tell it also to MySQL so that MySQL knows to empty the
 		cached binlog for this transaction */
 
-                mark_transaction_to_rollback(thd, TRUE);
+                thd_mark_transaction_to_rollback(thd, TRUE);
 
 		return(HA_ERR_LOCK_DEADLOCK);
 
@@ -611,7 +611,7 @@ convert_error_code_to_mysql(
 		latest SQL statement in a lock wait timeout. Previously, we
 		rolled back the whole transaction. */
 
-                mark_transaction_to_rollback(thd,
+                thd_mark_transaction_to_rollback(thd,
                                              (bool)row_rollback_on_timeout);
 
 		return(HA_ERR_LOCK_WAIT_TIMEOUT);
@@ -664,7 +664,7 @@ convert_error_code_to_mysql(
  		tell it also to MySQL so that MySQL knows to empty the
  		cached binlog for this transaction */
 
-                mark_transaction_to_rollback(thd, TRUE);
+                thd_mark_transaction_to_rollback(thd, TRUE);
 
     		return(HA_ERR_LOCK_TABLE_FULL);
 	} else if (error == DB_TOO_MANY_CONCURRENT_TRXS) {
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
index b10cccded18..270b000dfc4 100644
--- a/storage/innobase/handler/ha_innodb.h
+++ b/storage/innobase/handler/ha_innodb.h
@@ -234,6 +234,13 @@ int thd_non_transactional_update(const MYSQL_THD thd);
   @return Value to be used as index into the binlog_format_names array
 */
 int thd_binlog_format(const MYSQL_THD thd);
+
+/**
+  Mark transaction to rollback and mark error as fatal to a sub-statement.
+  @param  thd   Thread handle
+  @param  all   TRUE <=> rollback main transaction.
+*/
+void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all);
 }
 
 /*

From 898333f843b5c750b9863ea94d60ab81a9caca4e Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Thu, 2 Aug 2007 14:51:03 +0500
Subject: [PATCH 137/139] Fix for bug #30200: mysqlbinlog.test: connection_id()
 not restored under ps-protocol

Problem: thd->thread_specific_used flag is not set executing a statement
containig connection_id() function using PS protocol, that leads to
improper binlog event creation.

Fix: set the flag in the Item_func_connection_id::fix_fields().


sql/item_create.cc:
  Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
    - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields()
      to have it properly set using PS protocol as well.
sql/item_func.cc:
  Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
    - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields()
      to have it properly set using PS protocol as well.
sql/sql_parse.cc:
  Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
    - reset the thd->thread_specific_used flag in the mysql_reset_thd_for_next_command().
---
 sql/item_create.cc | 1 -
 sql/item_func.cc   | 1 +
 sql/sql_parse.cc   | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/item_create.cc b/sql/item_create.cc
index 3713fc9e380..561613032bc 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -72,7 +72,6 @@ Item *create_func_connection_id(void)
 {
   THD *thd= current_thd;
   thd->lex->safe_to_cache_query= 0;
-  thd->thread_specific_used= TRUE;
   return new Item_func_connection_id();
 }
 
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 4b32281b457..c70cfa1ce2a 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -649,6 +649,7 @@ bool Item_func_connection_id::fix_fields(THD *thd, Item **ref)
 {
   if (Item_int_func::fix_fields(thd, ref))
     return TRUE;
+  thd->thread_specific_used= TRUE;
   value= thd->variables.pseudo_thread_id;
   return FALSE;
 }
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 7d723d3cd5b..25ead88ac53 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5847,6 +5847,7 @@ void mysql_reset_thd_for_next_command(THD *thd)
                           SERVER_QUERY_NO_GOOD_INDEX_USED);
   DBUG_ASSERT(thd->security_ctx== &thd->main_security_ctx);
   thd->tmp_table_used= 0;
+  thd->thread_specific_used= FALSE;
   if (!thd->in_sub_stmt)
   {
     if (opt_bin_log)

From 6f88aa45dbc129751890421b13e8c4e13b8bd888 Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Thu, 2 Aug 2007 17:14:48 +0500
Subject: [PATCH 138/139] After-merge fix: result adjusted.

---
 mysql-test/r/show_check.result | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 1a34dd84dd7..75585974a32 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1250,6 +1250,9 @@ select 1 from information_schema.tables limit 1;
 show status like 'slow_queries';
 Variable_name	Value
 Slow_queries	2
+show variables like 'myisam_recover_options';
+Variable_name	Value
+myisam_recover_options	OFF
 End of 5.0 tests
 SHOW AUTHORS;
 create database mysqltest;

From ec73a9b0a759478e070da9a7030ac85136fd3e5b Mon Sep 17 00:00:00 2001
From: unknown <cbell/Chuck@mysql_cab_desk.>
Date: Thu, 2 Aug 2007 15:15:48 -0400
Subject: [PATCH 139/139] Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1
 into  mysql_cab_desk.:C:/source/c++/mysql-5.1

BitKeeper/deleted/.del-.del-README.txt:
  Delete: BitKeeper/deleted/.del-README.txt