From 1d75566cd2de84478183e798a3abfd81023c429c Mon Sep 17 00:00:00 2001
From: unknown <lzhou/zhl@dev3-63.(none)>
Date: Mon, 12 Mar 2007 18:08:35 +0000
Subject: [PATCH 01/58] BUG#26675 Add ndb_connectstring in "show global
 variables".

sql/ha_ndbcluster.h:
  Extern opt_ndb_constrbuf array from mysqld
sql/set_var.cc:
  Add ndb_connectstring to sys variable
---
 mysql-test/r/bdb_notembedded.result | 35 ++++++++++++++++++++++++++
 mysql-test/t/bdb_notembedded.test   | 38 +++++++++++++++++++++++++++++
 sql/ha_ndbcluster.h                 |  1 +
 sql/set_var.cc                      |  4 +++
 4 files changed, 78 insertions(+)
 create mode 100644 mysql-test/r/bdb_notembedded.result
 create mode 100644 mysql-test/t/bdb_notembedded.test

diff --git a/mysql-test/r/bdb_notembedded.result b/mysql-test/r/bdb_notembedded.result
new file mode 100644
index 00000000000..14cb5fad915
--- /dev/null
+++ b/mysql-test/r/bdb_notembedded.result
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 00000000000..24e64ebbfb2
--- /dev/null
+++ b/mysql-test/t/bdb_notembedded.test
@@ -0,0 +1,38 @@
+-- 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
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 274dc53e547..aae922c7ec6 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -40,6 +40,7 @@ class NdbBlob;
 // connectstring to cluster if given by mysqld
 extern const char *ndbcluster_connectstring;
 extern ulong ndb_cache_check_time;
+extern char opt_ndb_constrbuf[];
 
 typedef enum ndb_index_type {
   UNDEFINED_INDEX = 0,
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 9b02a192fe5..05164fe28e1 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -476,6 +476,8 @@ sys_var_thd_bool
 sys_ndb_use_transactions("ndb_use_transactions", &SV::ndb_use_transactions);
 sys_var_long_ptr
 sys_ndb_cache_check_time("ndb_cache_check_time", &ndb_cache_check_time);
+sys_var_const_str
+sys_ndb_connectstring("ndb_connectstring", opt_ndb_constrbuf);
 #endif
 
 /* Time/date/datetime formats */
@@ -787,6 +789,7 @@ sys_var *sys_variables[]=
 #ifdef HAVE_NDBCLUSTER_DB
   &sys_ndb_autoincrement_prefetch_sz,
   &sys_ndb_cache_check_time,
+  &sys_ndb_connectstring,
   &sys_ndb_force_send,
   &sys_ndb_use_exact_count,
   &sys_ndb_use_transactions,
@@ -988,6 +991,7 @@ struct show_var_st init_vars[]= {
   {sys_ndb_use_exact_count.name,(char*) &sys_ndb_use_exact_count,   SHOW_SYS},
   {sys_ndb_use_transactions.name,(char*) &sys_ndb_use_transactions, SHOW_SYS},
   {sys_ndb_cache_check_time.name,(char*) &sys_ndb_cache_check_time, SHOW_SYS},
+  {sys_ndb_connectstring.name,(char*) &sys_ndb_connectstring,       SHOW_SYS},
 #endif
   {sys_net_buffer_length.name,(char*) &sys_net_buffer_length,       SHOW_SYS},
   {sys_net_read_timeout.name, (char*) &sys_net_read_timeout,        SHOW_SYS},

From 3eff7d4dd5bba598fe055808697d630622fa249b Mon Sep 17 00:00:00 2001
From: unknown <malff/marcsql@weblab.(none)>
Date: Tue, 24 Apr 2007 09:24:21 -0600
Subject: [PATCH 02/58] Bug#25411 (trigger code truncated), PART I

The issue found with bug 25411 is due to the function skip_rear_comments()
which damages the source code while implementing a work around.
The root cause of the problem is in the lexical analyser, which does not
process special comments properly.
For special comments like :
[1] aaa /*!50000 bbb */ ccc
since 5.0 is a version older that the current code, the parser is in lining
the content of the special comment, so that the query to process is
[2] aaa bbb ccc
However, the text of the query captured when processing a stored procedure,
stored function or trigger (or event in 5.1), can be after rebuilding it:
[3] aaa bbb */ ccc
which is wrong.

To fix bug 25411 properly, the lexical analyser needs to return [2] when
in lining special comments.
In order to implement this, some preliminary cleanup is required in the code,
which is implemented by this patch.

Before this change, the structure named LEX (or st_lex) contains attributes
that belong to lexical analysis, as well as attributes that represents the
abstract syntax tree (AST) of a statement.
Creating a new LEX structure for each statements (which makes sense for the
AST part) also re-initialized the lexical analysis phase each time, which
is conceptually wrong.

With this patch, the previous st_lex structure has been split in two:
- st_lex represents the Abstract Syntax Tree for a statement. The name "lex"
has not been changed to avoid a bigger impact in the code base.
- class lex_input_stream represents the internal state of the lexical
  analyser, which by definition should *not* be reinitialized when parsing
  multiple statements from the same input stream.

This change is a pre-requisite for bug 25411, since the implementation of
lex_input_stream will later improve to deal properly with special comments,
and this processing can not be done with the current implementation of
sp_head::reset_lex and sp_head::restore_lex, which interfere with the lexer.

This change set alone does not fix bug 25411.


sql/item_func.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/log_event.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/mysql_priv.h:
  Refactoring, separate lex_input_stream from st_lex.
sql/slave.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/sp.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/sp_head.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/sp_head.h:
  Refactoring, separate lex_input_stream from st_lex.
sql/sql_class.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/sql_class.h:
  Refactoring, separate lex_input_stream from st_lex.
sql/sql_lex.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/sql_lex.h:
  Refactoring, separate lex_input_stream from st_lex.
sql/sql_parse.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/sql_prepare.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/sql_trigger.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/sql_view.cc:
  Refactoring, separate lex_input_stream from st_lex.
sql/sql_yacc.yy:
  Refactoring, separate lex_input_stream from st_lex.
---
 mysql-test/r/bdb_notembedded.result |  35 ++++
 mysql-test/t/bdb_notembedded.test   |  38 ++++
 sql/item_func.cc                    |   2 +-
 sql/log_event.cc                    |   9 +-
 sql/mysql_priv.h                    |   6 +-
 sql/slave.cc                        |   3 +-
 sql/sp.cc                           |   9 +-
 sql/sp_head.cc                      |  31 +--
 sql/sp_head.h                       |   6 +-
 sql/sql_class.cc                    |   2 +-
 sql/sql_class.h                     |  10 +
 sql/sql_lex.cc                      | 299 +++++++++++++++-------------
 sql/sql_lex.h                       |  70 +++++--
 sql/sql_parse.cc                    | 103 +++++++---
 sql/sql_prepare.cc                  |   8 +-
 sql/sql_trigger.cc                  |   8 +-
 sql/sql_view.cc                     |  14 +-
 sql/sql_yacc.yy                     | 171 ++++++++++------
 18 files changed, 530 insertions(+), 294 deletions(-)
 create mode 100644 mysql-test/r/bdb_notembedded.result
 create mode 100644 mysql-test/t/bdb_notembedded.test

diff --git a/mysql-test/r/bdb_notembedded.result b/mysql-test/r/bdb_notembedded.result
new file mode 100644
index 00000000000..14cb5fad915
--- /dev/null
+++ b/mysql-test/r/bdb_notembedded.result
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 00000000000..24e64ebbfb2
--- /dev/null
+++ b/mysql-test/t/bdb_notembedded.test
@@ -0,0 +1,38 @@
+-- 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
diff --git a/sql/item_func.cc b/sql/item_func.cc
index d972bde9155..7e4a06a1805 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4272,7 +4272,7 @@ int get_var_with_binlog(THD *thd, enum_sql_command sql_command,
     List<set_var_base> tmp_var_list;
     LEX *sav_lex= thd->lex, lex_tmp;
     thd->lex= &lex_tmp;
-    lex_start(thd, NULL, 0);
+    lex_start(thd);
     tmp_var_list.push_back(new set_var_user(new Item_func_set_user_var(name,
                                                                        new Item_null())));
     /* Create the variable */
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 8bb63e72bde..173ca6232ee 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1879,7 +1879,8 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli,
         thd->variables.collation_database= thd->db_charset;
       
       /* Execute the query (note that we bypass dispatch_command()) */
-      mysql_parse(thd, thd->query, thd->query_length);
+      const char* found_semicolon= NULL;
+      mysql_parse(thd, thd->query, thd->query_length, &found_semicolon);
 
     }
     else
@@ -2987,10 +2988,12 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
   thd->query_error= 0;
   clear_all_errors(thd, rli);
   /*
-    Usually mysql_init_query() is called by mysql_parse(), but we need it here
+    Usually lex_start() is called by mysql_parse(), but we need it here
     as the present method does not call mysql_parse().
   */
-  mysql_init_query(thd, 0, 0);
+  lex_start(thd);
+  mysql_reset_thd_for_next_command(thd);
+
   if (!use_rli_only_for_errors)
   {
     /* Saved for InnoDB, see comment in Query_log_event::exec_event() */
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index de567eacbeb..4017457b644 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -697,13 +697,15 @@ bool do_rename(THD *thd, TABLE_LIST *ren_table, char *new_db,
                       char *new_table_name, char *new_table_alias,
                       bool skip_error);
 bool mysql_change_db(THD *thd,const char *name,bool no_access_check);
-void mysql_parse(THD *thd,char *inBuf,uint length);
+
+void mysql_parse(THD *thd, const char *inBuf, uint length,
+                 const char ** semicolon);
+
 bool mysql_test_parse_for_slave(THD *thd,char *inBuf,uint length);
 bool is_update_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);
-void mysql_init_query(THD *thd, uchar *buf, uint length);
 bool mysql_new_select(LEX *lex, bool move_down);
 void create_select_for_variable(const char *var_name);
 void mysql_init_multi_delete(LEX *lex);
diff --git a/sql/slave.cc b/sql/slave.cc
index ba8c3ff902a..2b07f28b167 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1517,6 +1517,7 @@ static int create_table_from_dump(THD* thd, MYSQL *mysql, const char* db,
   handler *file;
   ulonglong save_options;
   NET *net= &mysql->net;
+  const char *found_semicolon= NULL;
   DBUG_ENTER("create_table_from_dump");  
 
   packet_len= my_net_read(net); // read create table statement
@@ -1567,7 +1568,7 @@ static int create_table_from_dump(THD* thd, MYSQL *mysql, const char* db,
   save_db_length= thd->db_length;
   DBUG_ASSERT(db != 0);
   thd->reset_db((char*)db, strlen(db));
-  mysql_parse(thd, thd->query, packet_len); // run create table
+  mysql_parse(thd, thd->query, packet_len, &found_semicolon); // run create table
   thd->db = save_db;		// leave things the way the were before
   thd->db_length= save_db_length;
   thd->options = save_options;
diff --git a/sql/sp.cc b/sql/sp.cc
index c8701aa2c87..a17ac9f30aa 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -434,10 +434,15 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
   if ((ret= sp_use_new_db(thd, name->m_db, &old_db, 1, &dbchanged)))
     goto end;
 
-  lex_start(thd, (uchar*)defstr.c_ptr(), defstr.length());
+  {
+    Lex_input_stream lip(thd, defstr.c_ptr(), defstr.length());
+    thd->m_lip= &lip;
+    lex_start(thd);
+    ret= MYSQLparse(thd);
+  }
 
   thd->spcont= 0;
-  if (MYSQLparse(thd) || thd->is_fatal_error || newlex.sphead == NULL)
+  if (ret || thd->is_fatal_error || newlex.sphead == NULL)
   {
     sp_head *sp= newlex.sphead;
 
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 21225d82188..548a6c903dc 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -519,9 +519,10 @@ void
 sp_head::init_strings(THD *thd, LEX *lex)
 {
   DBUG_ENTER("sp_head::init_strings");
-  uchar *endp;                  /* Used to trim the end */
+  const char *endp;                  /* Used to trim the end */
   /* During parsing, we must use thd->mem_root */
   MEM_ROOT *root= thd->mem_root;
+  Lex_input_stream *lip=thd->m_lip;
 
   if (m_param_begin && m_param_end)
   {
@@ -531,17 +532,17 @@ sp_head::init_strings(THD *thd, LEX *lex)
   }
 
   /* If ptr has overrun end_of_query then end_of_query is the end */
-  endp= (lex->ptr > lex->end_of_query ? lex->end_of_query : lex->ptr);
+  endp= (lip->ptr > lip->end_of_query ? lip->end_of_query : lip->ptr);
   /*
     Trim "garbage" at the end. This is sometimes needed with the
     "/ * ! VERSION... * /" wrapper in dump files.
   */
-  endp= skip_rear_comments(m_body_begin, endp);
+  endp= skip_rear_comments((char*) m_body_begin, (char*) endp);
 
   m_body.length= endp - m_body_begin;
-  m_body.str= strmake_root(root, (char *)m_body_begin, m_body.length);
-  m_defstr.length= endp - lex->buf;
-  m_defstr.str= strmake_root(root, (char *)lex->buf, m_defstr.length);
+  m_body.str= strmake_root(root, m_body_begin, m_body.length);
+  m_defstr.length= endp - lip->buf;
+  m_defstr.str= strmake_root(root, lip->buf, m_defstr.length);
   DBUG_VOID_RETURN;
 }
 
@@ -1756,24 +1757,13 @@ sp_head::reset_lex(THD *thd)
   DBUG_ENTER("sp_head::reset_lex");
   LEX *sublex;
   LEX *oldlex= thd->lex;
-  my_lex_states org_next_state= oldlex->next_state;
 
   (void)m_lex.push_front(oldlex);
   thd->lex= sublex= new st_lex;
 
-  /* Reset most stuff. The length arguments doesn't matter here. */
-  lex_start(thd, oldlex->buf, (ulong) (oldlex->end_of_query - oldlex->ptr));
+  /* Reset most stuff. */
+  lex_start(thd);
 
-  /*
-    next_state is normally the same (0), but it happens that we swap lex in
-    "mid-sentence", so we must restore it.
-   */
-  sublex->next_state= org_next_state;
-  /* We must reset ptr and end_of_query again */
-  sublex->ptr= oldlex->ptr;
-  sublex->end_of_query= oldlex->end_of_query;
-  sublex->tok_start= oldlex->tok_start;
-  sublex->yylineno= oldlex->yylineno;
   /* And keep the SP stuff too */
   sublex->sphead= oldlex->sphead;
   sublex->spcont= oldlex->spcont;
@@ -1806,9 +1796,6 @@ sp_head::restore_lex(THD *thd)
   if (! oldlex)
     return;			// Nothing to restore
 
-  // Update some state in the old one first
-  oldlex->ptr= sublex->ptr;
-  oldlex->next_state= sublex->next_state;
   oldlex->trg_table_fields.push_back(&sublex->trg_table_fields);
 
   /*
diff --git a/sql/sp_head.h b/sql/sp_head.h
index cce400d6a14..4632f6808fd 100644
--- a/sql/sp_head.h
+++ b/sql/sp_head.h
@@ -125,7 +125,7 @@ public:
 
   create_field m_return_field_def; /* This is used for FUNCTIONs only. */
 
-  uchar *m_tmp_query;		// Temporary pointer to sub query string
+  const char *m_tmp_query;	// Temporary pointer to sub query string
   uint m_old_cmq;		// Old CLIENT_MULTI_QUERIES value
   st_sp_chistics *m_chistics;
   ulong m_sql_mode;		// For SHOW CREATE and execution
@@ -174,7 +174,9 @@ public:
   */
   HASH m_sroutines;
   // Pointers set during parsing
-  uchar *m_param_begin, *m_param_end, *m_body_begin;
+  const char *m_param_begin;
+  const char *m_param_end;
+  const char *m_body_begin;
 
   /*
     Security context for stored routine which should be run under
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index a94f903a47b..0d8f2ca6394 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -176,7 +176,7 @@ THD::THD()
    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),
-   derived_tables_processing(FALSE), spcont(NULL)
+   derived_tables_processing(FALSE), spcont(NULL), m_lip(NULL)
 {
   ulong tmp;
 
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 99803802001..d7091b5a3bd 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -28,6 +28,7 @@ class Slave_log_event;
 class Format_description_log_event;
 class sp_rcontext;
 class sp_cache;
+class Lex_input_stream;
 
 enum enum_enable_or_disable { LEAVE_AS_IS, ENABLE, DISABLE };
 enum enum_ha_read_modes { RFIRST, RNEXT, RPREV, RLAST, RKEY, RNEXT_SAME };
@@ -1492,6 +1493,15 @@ public:
     query_id_t first_query_id;
   } binlog_evt_union;
 
+  /**
+    Character input stream consumed by the lexical analyser,
+    used during parsing.
+    Note that since the parser is not re-entrant, we keep only one input
+    stream here. This member is valid only when executing code during parsing,
+    and may point to invalid memory after that.
+  */
+  Lex_input_stream *m_lip;
+
   THD();
   ~THD();
 
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 3be844b6761..6fe4bfbd4f1 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -32,13 +32,13 @@ sys_var_long_ptr trg_new_row_fake_var(0, 0);
 
 /* Macros to look like lex */
 
-#define yyGet()		*(lex->ptr++)
-#define yyGetLast()	lex->ptr[-1]
-#define yyPeek()	lex->ptr[0]
-#define yyPeek2()	lex->ptr[1]
-#define yyUnget()	lex->ptr--
-#define yySkip()	lex->ptr++
-#define yyLength()	((uint) (lex->ptr - lex->tok_start)-1)
+#define yyGet()		*(lip->ptr++)
+#define yyGetLast()	lip->ptr[-1]
+#define yyPeek()	lip->ptr[0]
+#define yyPeek2()	lip->ptr[1]
+#define yyUnget()	lip->ptr--
+#define yySkip()	lip->ptr++
+#define yyLength()	((uint) (lip->ptr - lip->tok_start)-1)
 
 /* Longest standard keyword name */
 #define TOCK_NAME_LENGTH 24
@@ -108,6 +108,27 @@ st_parsing_options::reset()
   allows_derived= TRUE;
 }
 
+Lex_input_stream::Lex_input_stream(THD *thd,
+                                   const char* buffer,
+                                   unsigned int length)
+: m_thd(thd),
+  yylineno(1),
+  yytoklen(0),
+  yylval(NULL),
+  ptr(buffer),
+  tok_start(NULL),
+  tok_end(NULL),
+  end_of_query(buffer + length),
+  tok_start_prev(NULL),
+  buf(buffer),
+  next_state(MY_LEX_START),
+  found_semicolon(NULL)
+{
+}
+
+Lex_input_stream::~Lex_input_stream()
+{}
+
 
 /*
   This is called before every query that is to be parsed.
@@ -115,14 +136,12 @@ st_parsing_options::reset()
   (We already do too much here)
 */
 
-void lex_start(THD *thd, uchar *buf,uint length)
+void lex_start(THD *thd)
 {
   LEX *lex= thd->lex;
   DBUG_ENTER("lex_start");
 
   lex->thd= lex->unit.thd= thd;
-  lex->buf= lex->ptr= buf;
-  lex->end_of_query= buf+length;
 
   lex->context_stack.empty();
   lex->unit.init_query();
@@ -155,15 +174,13 @@ void lex_start(THD *thd, uchar *buf,uint length)
   lex->stmt_prepare_mode= FALSE;
   lex->derived_tables= 0;
   lex->lock_option= TL_READ;
-  lex->found_semicolon= 0;
   lex->safe_to_cache_query= 1;
   lex->time_zone_tables_used= 0;
   lex->leaf_tables_insert= 0;
   lex->parsing_options.reset();
   lex->empty_field_list_on_rset= 0;
   lex->select_lex.select_number= 1;
-  lex->next_state=MY_LEX_START;
-  lex->yylineno = 1;
+
   lex->in_comment=0;
   lex->length=0;
   lex->select_lex.in_sum_expr=0;
@@ -201,22 +218,22 @@ void lex_end(LEX *lex)
 }
 
 
-static int find_keyword(LEX *lex, uint len, bool function)
+static int find_keyword(Lex_input_stream *lip, uint len, bool function)
 {
-  uchar *tok=lex->tok_start;
+  const char *tok= lip->tok_start;
 
-  SYMBOL *symbol = get_hash_symbol((const char *)tok,len,function);
+  SYMBOL *symbol= get_hash_symbol(tok, len, function);
   if (symbol)
   {
-    lex->yylval->symbol.symbol=symbol;
-    lex->yylval->symbol.str= (char*) tok;
-    lex->yylval->symbol.length=len;
+    lip->yylval->symbol.symbol=symbol;
+    lip->yylval->symbol.str= (char*) tok;
+    lip->yylval->symbol.length=len;
     
     if ((symbol->tok == NOT_SYM) &&
-        (lex->thd->variables.sql_mode & MODE_HIGH_NOT_PRECEDENCE))
+        (lip->m_thd->variables.sql_mode & MODE_HIGH_NOT_PRECEDENCE))
       return NOT2_SYM;
     if ((symbol->tok == OR_OR_SYM) &&
-	!(lex->thd->variables.sql_mode & MODE_PIPES_AS_CONCAT))
+	!(lip->m_thd->variables.sql_mode & MODE_PIPES_AS_CONCAT))
       return OR2_SYM;
     
     return symbol->tok;
@@ -245,12 +262,12 @@ bool is_keyword(const char *name, uint len)
 
 /* make a copy of token before ptr and set yytoklen */
 
-static LEX_STRING get_token(LEX *lex,uint length)
+static LEX_STRING get_token(Lex_input_stream *lip, uint length)
 {
   LEX_STRING tmp;
   yyUnget();			// ptr points now after last token char
-  tmp.length=lex->yytoklen=length;
-  tmp.str=(char*) lex->thd->strmake((char*) lex->tok_start,tmp.length);
+  tmp.length=lip->yytoklen=length;
+  tmp.str= lip->m_thd->strmake(lip->tok_start, tmp.length);
   return tmp;
 }
 
@@ -261,14 +278,15 @@ static LEX_STRING get_token(LEX *lex,uint length)
    future to operate multichar strings (like ucs2)
 */
 
-static LEX_STRING get_quoted_token(LEX *lex,uint length, char quote)
+static LEX_STRING get_quoted_token(Lex_input_stream *lip,
+                                   uint length, char quote)
 {
   LEX_STRING tmp;
   byte *from, *to, *end;
   yyUnget();			// ptr points now after last token char
-  tmp.length=lex->yytoklen=length;
-  tmp.str=(char*) lex->thd->alloc(tmp.length+1);
-  for (from= (byte*) lex->tok_start, to= (byte*) tmp.str, end= to+length ;
+  tmp.length=lip->yytoklen=length;
+  tmp.str=(char*) lip->m_thd->alloc(tmp.length+1);
+  for (from= (byte*) lip->tok_start, to= (byte*) tmp.str, end= to+length ;
        to != end ;
        )
   {
@@ -285,15 +303,14 @@ static LEX_STRING get_quoted_token(LEX *lex,uint length, char quote)
   Fix sometimes to do only one scan of the string
 */
 
-static char *get_text(LEX *lex)
+static char *get_text(Lex_input_stream *lip)
 {
   reg1 uchar c,sep;
   uint found_escape=0;
-  CHARSET_INFO *cs= lex->thd->charset();
+  CHARSET_INFO *cs= lip->m_thd->charset();
 
   sep= yyGetLast();			// String should end with this
-  //lex->tok_start=lex->ptr-1;		// Remember '
-  while (lex->ptr != lex->end_of_query)
+  while (lip->ptr != lip->end_of_query)
   {
     c = yyGet();
 #ifdef USE_MB
@@ -301,18 +318,18 @@ static char *get_text(LEX *lex)
       int l;
       if (use_mb(cs) &&
           (l = my_ismbchar(cs,
-                           (const char *)lex->ptr-1,
-                           (const char *)lex->end_of_query))) {
-	lex->ptr += l-1;
+                           lip->ptr-1,
+                           lip->end_of_query))) {
+	lip->ptr += l-1;
 	continue;
       }
     }
 #endif
     if (c == '\\' &&
-	!(lex->thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES))
+	!(lip->m_thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES))
     {					// Escaped character
       found_escape=1;
-      if (lex->ptr == lex->end_of_query)
+      if (lip->ptr == lip->end_of_query)
 	return 0;
       yySkip();
     }
@@ -327,21 +344,23 @@ static char *get_text(LEX *lex)
 	yyUnget();
 
       /* Found end. Unescape and return string */
-      uchar *str,*end,*start;
+      const char *str;
+      const char *end;
+      char *start;
 
-      str=lex->tok_start+1;
-      end=lex->ptr-1;
-      if (!(start=(uchar*) lex->thd->alloc((uint) (end-str)+1)))
+      str=lip->tok_start+1;
+      end=lip->ptr-1;
+      if (!(start=(char*) lip->m_thd->alloc((uint) (end-str)+1)))
 	return (char*) "";		// Sql_alloc has set error flag
       if (!found_escape)
       {
-	lex->yytoklen=(uint) (end-str);
-	memcpy(start,str,lex->yytoklen);
-	start[lex->yytoklen]=0;
+	lip->yytoklen=(uint) (end-str);
+	memcpy(start,str,lip->yytoklen);
+	start[lip->yytoklen]=0;
       }
       else
       {
-	uchar *to;
+	char *to;
 
 	for (to=start ; str != end ; str++)
 	{
@@ -356,7 +375,7 @@ static char *get_text(LEX *lex)
 	      continue;
 	  }
 #endif
-	  if (!(lex->thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) &&
+	  if (!(lip->m_thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) &&
               *str == '\\' && str+1 != end)
 	  {
 	    switch(*++str) {
@@ -393,7 +412,7 @@ static char *get_text(LEX *lex)
 	    *to++ = *str;
 	}
 	*to=0;
-	lex->yytoklen=(uint) (to-start);
+	lip->yytoklen=(uint) (to-start);
       }
       return (char*) start;
     }
@@ -506,20 +525,21 @@ int MYSQLlex(void *arg, void *yythd)
   int	tokval, result_state;
   uint length;
   enum my_lex_states state;
-  LEX	*lex= ((THD *)yythd)->lex;
+  THD *thd= (THD *)yythd;
+  Lex_input_stream *lip= thd->m_lip;
+  LEX *lex= thd->lex;
   YYSTYPE *yylval=(YYSTYPE*) arg;
-  CHARSET_INFO *cs= ((THD *) yythd)->charset();
+  CHARSET_INFO *cs= thd->charset();
   uchar *state_map= cs->state_map;
   uchar *ident_map= cs->ident_map;
 
-  lex->yylval=yylval;			// The global state
+  lip->yylval=yylval;			// The global state
 
-  lex->tok_end_prev= lex->tok_end;
-  lex->tok_start_prev= lex->tok_start;
+  lip->tok_start_prev= lip->tok_start;
 
-  lex->tok_start=lex->tok_end=lex->ptr;
-  state=lex->next_state;
-  lex->next_state=MY_LEX_OPERATOR_OR_IDENT;
+  lip->tok_start=lip->tok_end=lip->ptr;
+  state=lip->next_state;
+  lip->next_state=MY_LEX_OPERATOR_OR_IDENT;
   LINT_INIT(c);
   for (;;)
   {
@@ -530,9 +550,9 @@ int MYSQLlex(void *arg, void *yythd)
       for (c=yyGet() ; (state_map[c] == MY_LEX_SKIP) ; c= yyGet())
       {
 	if (c == '\n')
-	  lex->yylineno++;
+	  lip->yylineno++;
       }
-      lex->tok_start=lex->ptr-1;	// Start of real token
+      lip->tok_start=lip->ptr-1;	// Start of real token
       state= (enum my_lex_states) state_map[c];
       break;
     case MY_LEX_ESCAPE:
@@ -551,13 +571,13 @@ int MYSQLlex(void *arg, void *yythd)
         state=MY_LEX_COMMENT;
         break;
       }
-      yylval->lex_str.str=(char*) (lex->ptr=lex->tok_start);// Set to first chr
+      yylval->lex_str.str=(char*) (lip->ptr=lip->tok_start);// Set to first chr
       yylval->lex_str.length=1;
       c=yyGet();
       if (c != ')')
-	lex->next_state= MY_LEX_START;	// Allow signed numbers
+	lip->next_state= MY_LEX_START;	// Allow signed numbers
       if (c == ',')
-	lex->tok_start=lex->ptr;	// Let tok_start point at next item
+	lip->tok_start=lip->ptr;	// Let tok_start point at next item
       /*
         Check for a placeholder: it should not precede a possible identifier
         because of binlogging: when a placeholder is replaced with
@@ -575,14 +595,14 @@ int MYSQLlex(void *arg, void *yythd)
 	break;
       }
       /* Found N'string' */
-      lex->tok_start++;                 // Skip N
+      lip->tok_start++;                 // Skip N
       yySkip();                         // Skip '
-      if (!(yylval->lex_str.str = get_text(lex)))
+      if (!(yylval->lex_str.str = get_text(lip)))
       {
 	state= MY_LEX_CHAR;             // Read char by char
 	break;
       }
-      yylval->lex_str.length= lex->yytoklen;
+      yylval->lex_str.length= lip->yytoklen;
       return(NCHAR_STRING);
 
     case MY_LEX_IDENT_OR_HEX:
@@ -598,7 +618,7 @@ int MYSQLlex(void *arg, void *yythd)
         break;
       }
     case MY_LEX_IDENT:
-      uchar *start;
+      const char *start;
 #if defined(USE_MB) && defined(USE_MB_IDENT)
       if (use_mb(cs))
       {
@@ -606,13 +626,13 @@ int MYSQLlex(void *arg, void *yythd)
         if (my_mbcharlen(cs, yyGetLast()) > 1)
         {
           int l = my_ismbchar(cs,
-                              (const char *)lex->ptr-1,
-                              (const char *)lex->end_of_query);
+                              lip->ptr-1,
+                              lip->end_of_query);
           if (l == 0) {
             state = MY_LEX_CHAR;
             continue;
           }
-          lex->ptr += l - 1;
+          lip->ptr += l - 1;
         }
         while (ident_map[c=yyGet()])
         {
@@ -620,10 +640,10 @@ int MYSQLlex(void *arg, void *yythd)
           {
             int l;
             if ((l = my_ismbchar(cs,
-                              (const char *)lex->ptr-1,
-                              (const char *)lex->end_of_query)) == 0)
+                                 lip->ptr-1,
+                                 lip->end_of_query)) == 0)
               break;
-            lex->ptr += l-1;
+            lip->ptr += l-1;
           }
         }
       }
@@ -634,8 +654,8 @@ int MYSQLlex(void *arg, void *yythd)
         /* If there were non-ASCII characters, mark that we must convert */
         result_state= result_state & 0x80 ? IDENT_QUOTED : IDENT;
       }
-      length= (uint) (lex->ptr - lex->tok_start)-1;
-      start= lex->ptr;
+      length= (uint) (lip->ptr - lip->tok_start)-1;
+      start= lip->ptr;
       if (lex->ignore_space)
       {
         /*
@@ -644,19 +664,19 @@ int MYSQLlex(void *arg, void *yythd)
         */
         for (; state_map[c] == MY_LEX_SKIP ; c= yyGet());
       }
-      if (start == lex->ptr && c == '.' && ident_map[yyPeek()])
-	lex->next_state=MY_LEX_IDENT_SEP;
+      if (start == lip->ptr && c == '.' && ident_map[yyPeek()])
+	lip->next_state=MY_LEX_IDENT_SEP;
       else
       {					// '(' must follow directly if function
 	yyUnget();
-	if ((tokval = find_keyword(lex,length,c == '(')))
+	if ((tokval = find_keyword(lip, length, c == '(')))
 	{
-	  lex->next_state= MY_LEX_START;	// Allow signed numbers
+	  lip->next_state= MY_LEX_START;	// Allow signed numbers
 	  return(tokval);		// Was keyword
 	}
 	yySkip();			// next state does a unget
       }
-      yylval->lex_str=get_token(lex,length);
+      yylval->lex_str=get_token(lip, length);
 
       /* 
          Note: "SELECT _bla AS 'alias'"
@@ -673,12 +693,12 @@ int MYSQLlex(void *arg, void *yythd)
       return(result_state);			// IDENT or IDENT_QUOTED
 
     case MY_LEX_IDENT_SEP:		// Found ident and now '.'
-      yylval->lex_str.str=(char*) lex->ptr;
+      yylval->lex_str.str=(char*) lip->ptr;
       yylval->lex_str.length=1;
       c=yyGet();			// should be '.'
-      lex->next_state= MY_LEX_IDENT_START;// Next is an ident (not a keyword)
+      lip->next_state= MY_LEX_IDENT_START;// Next is an ident (not a keyword)
       if (!ident_map[yyPeek()])		// Probably ` or "
-	lex->next_state= MY_LEX_START;
+	lip->next_state= MY_LEX_START;
       return((int) c);
 
     case MY_LEX_NUMBER_IDENT:		// number or ident which num-start
@@ -698,36 +718,36 @@ int MYSQLlex(void *arg, void *yythd)
 	  {
 	    yySkip();
 	    while (my_isdigit(cs,yyGet())) ;
-	    yylval->lex_str=get_token(lex,yyLength());
+	    yylval->lex_str=get_token(lip, yyLength());
 	    return(FLOAT_NUM);
 	  }
 	}
 	yyUnget(); /* purecov: inspected */
       }
-      else if (c == 'x' && (lex->ptr - lex->tok_start) == 2 &&
-	  lex->tok_start[0] == '0' )
+      else if (c == 'x' && (lip->ptr - lip->tok_start) == 2 &&
+	  lip->tok_start[0] == '0' )
       {						// Varbinary
 	while (my_isxdigit(cs,(c = yyGet()))) ;
-	if ((lex->ptr - lex->tok_start) >= 4 && !ident_map[c])
+	if ((lip->ptr - lip->tok_start) >= 4 && !ident_map[c])
 	{
-	  yylval->lex_str=get_token(lex,yyLength());
+	  yylval->lex_str=get_token(lip, yyLength());
 	  yylval->lex_str.str+=2;		// Skip 0x
 	  yylval->lex_str.length-=2;
-	  lex->yytoklen-=2;
+	  lip->yytoklen-=2;
 	  return (HEX_NUM);
 	}
 	yyUnget();
       }
-      else if (c == 'b' && (lex->ptr - lex->tok_start) == 2 &&
-               lex->tok_start[0] == '0' )
+      else if (c == 'b' && (lip->ptr - lip->tok_start) == 2 &&
+               lip->tok_start[0] == '0' )
       {						// b'bin-number'
 	while (my_isxdigit(cs,(c = yyGet()))) ;
-	if ((lex->ptr - lex->tok_start) >= 4 && !ident_map[c])
+	if ((lip->ptr - lip->tok_start) >= 4 && !ident_map[c])
 	{
-	  yylval->lex_str= get_token(lex, yyLength());
+	  yylval->lex_str= get_token(lip, yyLength());
 	  yylval->lex_str.str+= 2;		// Skip 0x
 	  yylval->lex_str.length-= 2;
-	  lex->yytoklen-= 2;
+	  lip->yytoklen-= 2;
 	  return (BIN_NUM);
 	}
 	yyUnget();
@@ -745,10 +765,10 @@ int MYSQLlex(void *arg, void *yythd)
           {
             int l;
             if ((l = my_ismbchar(cs,
-                                 (const char *)lex->ptr-1,
-                                 (const char *)lex->end_of_query)) == 0)
+                                 lip->ptr-1,
+                                 lip->end_of_query)) == 0)
               break;
-            lex->ptr += l-1;
+            lip->ptr += l-1;
           }
         }
       }
@@ -760,16 +780,16 @@ int MYSQLlex(void *arg, void *yythd)
         result_state= result_state & 0x80 ? IDENT_QUOTED : IDENT;
       }
       if (c == '.' && ident_map[yyPeek()])
-	lex->next_state=MY_LEX_IDENT_SEP;// Next is '.'
+	lip->next_state=MY_LEX_IDENT_SEP;// Next is '.'
 
-      yylval->lex_str= get_token(lex,yyLength());
+      yylval->lex_str= get_token(lip, yyLength());
       return(result_state);
 
     case MY_LEX_USER_VARIABLE_DELIMITER:	// Found quote char
     {
       uint double_quotes= 0;
       char quote_char= c;                       // Used char
-      lex->tok_start=lex->ptr;			// Skip first `
+      lip->tok_start=lip->ptr;			// Skip first `
       while ((c=yyGet()))
       {
 	int var_length;
@@ -789,23 +809,23 @@ int MYSQLlex(void *arg, void *yythd)
 #ifdef USE_MB
 	else if (var_length < 1)
 	  break;				// Error
-	lex->ptr+= var_length-1;
+	lip->ptr+= var_length-1;
 #endif
       }
       if (double_quotes)
-	yylval->lex_str=get_quoted_token(lex,yyLength() - double_quotes,
+	yylval->lex_str=get_quoted_token(lip, yyLength() - double_quotes,
 					 quote_char);
       else
-	yylval->lex_str=get_token(lex,yyLength());
+	yylval->lex_str=get_token(lip, yyLength());
       if (c == quote_char)
 	yySkip();			// Skip end `
-      lex->next_state= MY_LEX_START;
+      lip->next_state= MY_LEX_START;
       return(IDENT_QUOTED);
     }
     case MY_LEX_INT_OR_REAL:		// Compleat int or incompleat real
       if (c != '.')
       {					// Found complete integer number.
-	yylval->lex_str=get_token(lex,yyLength());
+	yylval->lex_str=get_token(lip, yyLength());
 	return int_token(yylval->lex_str.str,yylval->lex_str.length);
       }
       // fall through
@@ -823,47 +843,47 @@ int MYSQLlex(void *arg, void *yythd)
 	  break;
 	}
 	while (my_isdigit(cs,yyGet())) ;
-	yylval->lex_str=get_token(lex,yyLength());
+	yylval->lex_str=get_token(lip, yyLength());
 	return(FLOAT_NUM);
       }
-      yylval->lex_str=get_token(lex,yyLength());
+      yylval->lex_str=get_token(lip, yyLength());
       return(DECIMAL_NUM);
 
     case MY_LEX_HEX_NUMBER:		// Found x'hexstring'
       yyGet();				// Skip '
       while (my_isxdigit(cs,(c = yyGet()))) ;
-      length=(lex->ptr - lex->tok_start);	// Length of hexnum+3
+      length=(lip->ptr - lip->tok_start);	// Length of hexnum+3
       if (!(length & 1) || c != '\'')
       {
 	return(ABORT_SYM);		// Illegal hex constant
       }
       yyGet();				// get_token makes an unget
-      yylval->lex_str=get_token(lex,length);
+      yylval->lex_str=get_token(lip, length);
       yylval->lex_str.str+=2;		// Skip x'
       yylval->lex_str.length-=3;	// Don't count x' and last '
-      lex->yytoklen-=3;
+      lip->yytoklen-=3;
       return (HEX_NUM);
 
     case MY_LEX_BIN_NUMBER:           // Found b'bin-string'
       yyGet();                                // Skip '
       while ((c= yyGet()) == '0' || c == '1');
-      length= (lex->ptr - lex->tok_start);    // Length of bin-num + 3
+      length= (lip->ptr - lip->tok_start);    // Length of bin-num + 3
       if (c != '\'')
       return(ABORT_SYM);              // Illegal hex constant
       yyGet();                        // get_token makes an unget
-      yylval->lex_str= get_token(lex, length);
+      yylval->lex_str= get_token(lip, length);
       yylval->lex_str.str+= 2;        // Skip b'
       yylval->lex_str.length-= 3;     // Don't count b' and last '
-      lex->yytoklen-= 3;
+      lip->yytoklen-= 3;
       return (BIN_NUM); 
 
     case MY_LEX_CMP_OP:			// Incomplete comparison operator
       if (state_map[yyPeek()] == MY_LEX_CMP_OP ||
 	  state_map[yyPeek()] == MY_LEX_LONG_CMP_OP)
 	yySkip();
-      if ((tokval = find_keyword(lex,(uint) (lex->ptr - lex->tok_start),0)))
+      if ((tokval = find_keyword(lip,(uint) (lip->ptr - lip->tok_start),0)))
       {
-	lex->next_state= MY_LEX_START;	// Allow signed numbers
+	lip->next_state= MY_LEX_START;	// Allow signed numbers
 	return(tokval);
       }
       state = MY_LEX_CHAR;		// Something fishy found
@@ -877,9 +897,9 @@ int MYSQLlex(void *arg, void *yythd)
 	if (state_map[yyPeek()] == MY_LEX_CMP_OP)
 	  yySkip();
       }
-      if ((tokval = find_keyword(lex,(uint) (lex->ptr - lex->tok_start),0)))
+      if ((tokval = find_keyword(lip,(uint) (lip->ptr - lip->tok_start),0)))
       {
-	lex->next_state= MY_LEX_START;	// Found long op
+	lip->next_state= MY_LEX_START;	// Found long op
 	return(tokval);
       }
       state = MY_LEX_CHAR;		// Something fishy found
@@ -892,24 +912,24 @@ int MYSQLlex(void *arg, void *yythd)
 	break;
       }
       yySkip();
-      tokval = find_keyword(lex,2,0);	// Is a bool operator
-      lex->next_state= MY_LEX_START;	// Allow signed numbers
+      tokval = find_keyword(lip,2,0);	// Is a bool operator
+      lip->next_state= MY_LEX_START;	// Allow signed numbers
       return(tokval);
 
     case MY_LEX_STRING_OR_DELIMITER:
-      if (((THD *) yythd)->variables.sql_mode & MODE_ANSI_QUOTES)
+      if (thd->variables.sql_mode & MODE_ANSI_QUOTES)
       {
 	state= MY_LEX_USER_VARIABLE_DELIMITER;
 	break;
       }
       /* " used for strings */
     case MY_LEX_STRING:			// Incomplete text string
-      if (!(yylval->lex_str.str = get_text(lex)))
+      if (!(yylval->lex_str.str = get_text(lip)))
       {
 	state= MY_LEX_CHAR;		// Read char by char
 	break;
       }
-      yylval->lex_str.length=lex->yytoklen;
+      yylval->lex_str.length=lip->yytoklen;
       return(TEXT_STRING);
 
     case MY_LEX_COMMENT:			//  Comment
@@ -933,7 +953,7 @@ int MYSQLlex(void *arg, void *yythd)
 	state=MY_LEX_START;
 	if (my_isdigit(cs,yyPeek()))
 	{				// Version number
-	  version=strtol((char*) lex->ptr,(char**) &lex->ptr,10);
+	  version=strtol((char*) lip->ptr,(char**) &lip->ptr,10);
 	}
 	if (version <= MYSQL_VERSION_ID)
 	{
@@ -941,13 +961,13 @@ int MYSQLlex(void *arg, void *yythd)
 	  break;
 	}
       }
-      while (lex->ptr != lex->end_of_query &&
+      while (lip->ptr != lip->end_of_query &&
 	     ((c=yyGet()) != '*' || yyPeek() != '/'))
       {
 	if (c == '\n')
-	  lex->yylineno++;
+	  lip->yylineno++;
       }
-      if (lex->ptr != lex->end_of_query)
+      if (lip->ptr != lip->end_of_query)
 	yySkip();			// remove last '/'
       state = MY_LEX_START;		// Try again
       break;
@@ -972,14 +992,13 @@ int MYSQLlex(void *arg, void *yythd)
     case MY_LEX_SEMICOLON:			// optional line terminator
       if (yyPeek())
       {
-        THD* thd= (THD*)yythd;
         if ((thd->client_capabilities & CLIENT_MULTI_STATEMENTS) && 
             !lex->stmt_prepare_mode)
         {
 	  lex->safe_to_cache_query= 0;
-          lex->found_semicolon=(char*) lex->ptr;
+          lip->found_semicolon= lip->ptr;
           thd->server_status|= SERVER_MORE_RESULTS_EXISTS;
-          lex->next_state=     MY_LEX_END;
+          lip->next_state=     MY_LEX_END;
           return (END_OF_INPUT);
         }
         state= MY_LEX_CHAR;		// Return ';'
@@ -987,15 +1006,15 @@ int MYSQLlex(void *arg, void *yythd)
       }
       /* fall true */
     case MY_LEX_EOL:
-      if (lex->ptr >= lex->end_of_query)
+      if (lip->ptr >= lip->end_of_query)
       {
-	lex->next_state=MY_LEX_END;	// Mark for next loop
+	lip->next_state=MY_LEX_END;	// Mark for next loop
 	return(END_OF_INPUT);
       }
       state=MY_LEX_CHAR;
       break;
     case MY_LEX_END:
-      lex->next_state=MY_LEX_END;
+      lip->next_state=MY_LEX_END;
       return(0);			// We found end of input last time
       
       /* Actually real shouldn't start with . but allow them anyhow */
@@ -1015,26 +1034,26 @@ int MYSQLlex(void *arg, void *yythd)
       case MY_LEX_STRING_OR_DELIMITER:
 	break;
       case MY_LEX_USER_END:
-	lex->next_state=MY_LEX_SYSTEM_VAR;
+	lip->next_state=MY_LEX_SYSTEM_VAR;
 	break;
       default:
-	lex->next_state=MY_LEX_HOSTNAME;
+	lip->next_state=MY_LEX_HOSTNAME;
 	break;
       }
-      yylval->lex_str.str=(char*) lex->ptr;
+      yylval->lex_str.str=(char*) lip->ptr;
       yylval->lex_str.length=1;
       return((int) '@');
     case MY_LEX_HOSTNAME:		// end '@' of user@hostname
       for (c=yyGet() ; 
 	   my_isalnum(cs,c) || c == '.' || c == '_' ||  c == '$';
 	   c= yyGet()) ;
-      yylval->lex_str=get_token(lex,yyLength());
+      yylval->lex_str=get_token(lip, yyLength());
       return(LEX_HOSTNAME);
     case MY_LEX_SYSTEM_VAR:
-      yylval->lex_str.str=(char*) lex->ptr;
+      yylval->lex_str.str=(char*) lip->ptr;
       yylval->lex_str.length=1;
       yySkip();					// Skip '@'
-      lex->next_state= (state_map[yyPeek()] ==
+      lip->next_state= (state_map[yyPeek()] ==
 			MY_LEX_USER_VARIABLE_DELIMITER ?
 			MY_LEX_OPERATOR_OR_IDENT :
 			MY_LEX_IDENT_OR_KEYWORD);
@@ -1051,16 +1070,16 @@ int MYSQLlex(void *arg, void *yythd)
       result_state= result_state & 0x80 ? IDENT_QUOTED : IDENT;
       
       if (c == '.')
-	lex->next_state=MY_LEX_IDENT_SEP;
-      length= (uint) (lex->ptr - lex->tok_start)-1;
+	lip->next_state=MY_LEX_IDENT_SEP;
+      length= (uint) (lip->ptr - lip->tok_start)-1;
       if (length == 0) 
         return(ABORT_SYM);              // Names must be nonempty.
-      if ((tokval= find_keyword(lex,length,0)))
+      if ((tokval= find_keyword(lip, length,0)))
       {
 	yyUnget();				// Put back 'c'
 	return(tokval);				// Was keyword
       }
-      yylval->lex_str=get_token(lex,length);
+      yylval->lex_str=get_token(lip, length);
       return(result_state);
     }
   }
@@ -1093,7 +1112,7 @@ Alter_info::Alter_info(const Alter_info &rhs, MEM_ROOT *mem_root)
     Pointer to the last non-comment symbol of the statement.
 */
 
-uchar *skip_rear_comments(uchar *begin, uchar *end)
+char *skip_rear_comments(char *begin, char *end)
 {
   while (begin < end && (end[-1] <= ' ' || end[-1] == '*' ||
                          end[-1] == '/' || end[-1] == ';'))
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index de7de0d46e9..8a9bc62a83e 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -469,7 +469,7 @@ public:
   void set_limit(st_select_lex *values);
   void set_thd(THD *thd_arg) { thd= thd_arg; }
 
-  friend void lex_start(THD *thd, uchar *buf, uint length);
+  friend void lex_start(THD *thd);
   friend int subselect_union_engine::exec();
 
   List<Item> *get_unit_column_types();
@@ -675,7 +675,7 @@ public:
   void cut_subtree() { slave= 0; }
   bool test_limit();
 
-  friend void lex_start(THD *thd, uchar *buf, uint length);
+  friend void lex_start(THD *thd);
   st_select_lex() : n_sum_items(0), n_child_sum_items(0) {}
   void make_empty_select()
   {
@@ -898,30 +898,70 @@ struct st_parsing_options
 };
 
 
+/**
+  This class represents the character input stream consumed during
+  lexical analysis.
+*/
+class Lex_input_stream
+{
+public:
+  Lex_input_stream(THD *thd, const char* buff, unsigned int length);
+  ~Lex_input_stream();
+
+  /** Current thread. */
+  THD *m_thd;
+
+  /** Current line number. */
+  uint yylineno;
+
+  /** Length of the last token parsed. */
+  uint yytoklen;
+
+  /** Interface with bison, value of the last token parsed. */
+  LEX_YYSTYPE yylval;
+
+  /** Pointer to the current position in the input stream. */
+  const char* ptr;
+
+  /** Starting position of the last token parsed. */
+  const char* tok_start;
+
+  /** Ending position of the last token parsed. */
+  const char* tok_end;
+
+  /** End of the query text in the input stream. */
+  const char* end_of_query;
+
+  /** Starting position of the previous token parsed. */
+  const char* tok_start_prev;
+
+  /** Begining of the query text in the input stream. */
+  const char* buf;
+
+  /** Current state of the lexical analyser. */
+  enum my_lex_states next_state;
+
+  /** Position of ';' in the stream, to delimit multiple queries. */
+  const char* found_semicolon;
+};
+
+
 /* The state of the lex parsing. This is saved in the THD struct */
 
 typedef struct st_lex : public Query_tables_list
 {
-  uint	 yylineno,yytoklen;			/* Simulate lex */
-  LEX_YYSTYPE yylval;
   SELECT_LEX_UNIT unit;                         /* most upper unit */
   SELECT_LEX select_lex;                        /* first SELECT_LEX */
   /* current SELECT_LEX in parsing */
   SELECT_LEX *current_select;
   /* list of all SELECT_LEX */
   SELECT_LEX *all_selects_list;
-  uchar *buf;			/* The beginning of string, used by SPs */
-  uchar *ptr,*tok_start,*tok_end,*end_of_query;
-  
-  /* The values of tok_start/tok_end as they were one call of MYSQLlex before */
-  uchar *tok_start_prev, *tok_end_prev;
 
   char *length,*dec,*change,*name;
   char *help_arg;
   char *backup_dir;				/* For RESTORE/BACKUP */
   char* to_log;                                 /* For PURGE MASTER LOGS TO */
   char* x509_subject,*x509_issuer,*ssl_cipher;
-  char* found_semicolon;                        /* For multi queries - next query */
   String *wild;
   sql_exchange *exchange;
   select_result *result;
@@ -990,7 +1030,6 @@ typedef struct st_lex : public Query_tables_list
   enum_sql_command sql_command, orig_sql_command;
   thr_lock_type lock_option;
   enum SSL_type ssl_type;			/* defined in violite.h */
-  enum my_lex_states next_state;
   enum enum_duplicates duplicates;
   enum enum_tx_isolation tx_isolation;
   enum enum_ha_read_modes ha_read_mode;
@@ -1101,8 +1140,9 @@ typedef struct st_lex : public Query_tables_list
     Pointers to part of LOAD DATA statement that should be rewritten
     during replication ("LOCAL 'filename' REPLACE INTO" part).
   */
-  uchar *fname_start, *fname_end;
-  
+  const char *fname_start;
+  const char *fname_end;
+
   bool escape_used;
 
   st_lex();
@@ -1211,7 +1251,7 @@ struct st_lex_local: public st_lex
 
 extern void lex_init(void);
 extern void lex_free(void);
-extern void lex_start(THD *thd, uchar *buf,uint length);
+extern void lex_start(THD *thd);
 extern void lex_end(LEX *lex);
 extern int MYSQLlex(void *arg, void *yythd);
-extern uchar *skip_rear_comments(uchar *begin, uchar *end);
+extern char *skip_rear_comments(char *begin, char *end);
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1b8bfd38fc4..36ae5ca4a31 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1236,6 +1236,7 @@ pthread_handler_t handle_bootstrap(void *arg)
   THD *thd=(THD*) arg;
   FILE *file=bootstrap_file;
   char *buff;
+  const char* found_semicolon= NULL;
 
   /* The following must be called before DBUG_ENTER */
   thd->thread_stack= (char*) &thd;
@@ -1312,7 +1313,7 @@ pthread_handler_t handle_bootstrap(void *arg)
     */
     thd->query_id=next_query_id();
     thd->set_time();
-    mysql_parse(thd,thd->query,length);
+    mysql_parse(thd, thd->query, length, & found_semicolon);
     close_thread_tables(thd);			// Free tables
 
     if (thd->is_fatal_error)
@@ -1789,17 +1790,19 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
     char *packet_end= thd->query + thd->query_length;
     /* 'b' stands for 'buffer' parameter', special for 'my_snprintf' */
     const char *format= "%.*b";
+    const char* found_semicolon= NULL;
+
     mysql_log.write(thd,command, format, thd->query_length, thd->query);
     DBUG_PRINT("query",("%-.4096s",thd->query));
 
     if (!(specialflag & SPECIAL_NO_PRIOR))
       my_pthread_setprio(pthread_self(),QUERY_PRIOR);
 
-    mysql_parse(thd,thd->query, thd->query_length);
+    mysql_parse(thd, thd->query, thd->query_length, & found_semicolon);
 
-    while (!thd->killed && thd->lex->found_semicolon && !thd->net.report_error)
+    while (!thd->killed && found_semicolon && !thd->net.report_error)
     {
-      char *next_packet= thd->lex->found_semicolon;
+      char *next_packet= (char*) found_semicolon;
       net->no_send_error= 0;
       /*
         Multiple queries exits, execute them individually
@@ -1824,7 +1827,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
       thd->set_time(); /* Reset the query start time. */
       /* TODO: set thd->lex->sql_command to SQLCOM_END here */
       VOID(pthread_mutex_unlock(&LOCK_thread_count));
-      mysql_parse(thd, next_packet, length);
+      mysql_parse(thd, next_packet, length, & found_semicolon);
     }
 
     if (!(specialflag & SPECIAL_NO_PRIOR))
@@ -1845,7 +1848,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
     LEX_STRING conv_name;
 
     /* used as fields initializator */
-    lex_start(thd, 0, 0);
+    lex_start(thd);
 
     statistic_increment(thd->status_var.com_stat[SQLCOM_SHOW_FIELDS],
 			&LOCK_status);
@@ -1882,7 +1885,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
       break;
     /* init structures for VIEW processing */
     table_list.select_lex= &(thd->lex->select_lex);
-    mysql_init_query(thd, (uchar*)"", 0);
+
+    lex_start(thd);
+    mysql_reset_thd_for_next_command(thd);
+
     thd->lex->
       select_lex.table_list.link_in_list((byte*) &table_list,
                                          (byte**) &table_list.next_local);
@@ -5687,20 +5693,6 @@ bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, ulong *yystacksize)
 }
 
 
-/****************************************************************************
-  Initialize global thd variables needed for query
-****************************************************************************/
-
-void
-mysql_init_query(THD *thd, uchar *buf, uint length)
-{
-  DBUG_ENTER("mysql_init_query");
-  lex_start(thd, buf, length);
-  mysql_reset_thd_for_next_command(thd);
-  DBUG_VOID_RETURN;
-}
-
-
 /*
  Reset THD part responsible for command processing state.
 
@@ -5887,21 +5879,54 @@ void mysql_init_multi_delete(LEX *lex)
   mysql_test_parse_for_slave() in this same file.
 */
 
-void mysql_parse(THD *thd, char *inBuf, uint length)
+/**
+  Parse a query.
+  @param thd Current thread
+  @param inBuf Begining of the query text
+  @param length Length of the query text
+  @param [out] semicolon For multi queries, position of the character of
+  the next query in the query text.
+*/
+
+void mysql_parse(THD *thd, const char *inBuf, uint length,
+                 const char ** found_semicolon)
 {
   DBUG_ENTER("mysql_parse");
 
   DBUG_EXECUTE_IF("parser_debug", turn_parser_debug_on(););
 
-  mysql_init_query(thd, (uchar*) inBuf, length);
-  if (query_cache_send_result_to_client(thd, inBuf, length) <= 0)
+  /*
+    Warning.
+    The purpose of query_cache_send_result_to_client() is to lookup the
+    query in the query cache first, to avoid parsing and executing it.
+    So, the natural implementation would be to:
+    - first, call query_cache_send_result_to_client,
+    - second, if caching failed, initialise the lexical and syntactic parser.
+    The problem is that the query cache depends on a clean initialization
+    of the thd and thd->lex structures, which happen to be implemented
+    by:
+    - lex_start()
+    - mysql_reset_thd_for_next_command()
+    So, initializing the lexical analyser *before* using the query cache
+    is required for the cache to work properly.
+    FIXME: cleanup the dependencies in the code to simplify this.
+  */
+  Lex_input_stream lip(thd, inBuf, length);
+  thd->m_lip= &lip;
+  lex_start(thd);
+  mysql_reset_thd_for_next_command(thd);
+
+  if (query_cache_send_result_to_client(thd, (char*) inBuf, length) <= 0)
   {
     LEX *lex= thd->lex;
-    
+
     sp_cache_flush_obsolete(&thd->sp_proc_cache);
     sp_cache_flush_obsolete(&thd->sp_func_cache);
-    
-    if (!MYSQLparse((void *)thd) && ! thd->is_fatal_error)
+
+    int err= MYSQLparse(thd);
+    *found_semicolon= lip.found_semicolon;
+
+    if (!err && ! thd->is_fatal_error)
     {
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
       if (mqh_used && thd->user_connect &&
@@ -5924,8 +5949,8 @@ void mysql_parse(THD *thd, char *inBuf, uint length)
             PROCESSLIST.
             Note that we don't need LOCK_thread_count to modify query_length.
           */
-          if (lex->found_semicolon &&
-              (thd->query_length= (ulong)(lex->found_semicolon - thd->query)))
+          if (lip.found_semicolon &&
+              (thd->query_length= (ulong)(lip.found_semicolon - thd->query)))
             thd->query_length--;
           /* Actually execute the query */
 	  mysql_execute_command(thd);
@@ -5952,6 +5977,12 @@ void mysql_parse(THD *thd, char *inBuf, uint length)
     thd->cleanup_after_query();
     DBUG_ASSERT(thd->change_list.is_empty());
   }
+  else
+  {
+    /* There are no multi queries in the cache. */
+    *found_semicolon= NULL;
+  }
+
   DBUG_VOID_RETURN;
 }
 
@@ -5972,8 +6003,13 @@ bool mysql_test_parse_for_slave(THD *thd, char *inBuf, uint length)
   bool error= 0;
   DBUG_ENTER("mysql_test_parse_for_slave");
 
-  mysql_init_query(thd, (uchar*) inBuf, length);
-  if (!MYSQLparse((void*) thd) && ! thd->is_fatal_error &&
+  Lex_input_stream lip(thd, inBuf, length);
+  thd->m_lip= &lip;
+  lex_start(thd);
+  mysql_reset_thd_for_next_command(thd);
+  int err= MYSQLparse((void*) thd);
+
+  if (!err && ! thd->is_fatal_error &&
       all_tables_not_ok(thd,(TABLE_LIST*) lex->select_lex.table_list.first))
     error= 1;                  /* Ignore question */
   thd->end_statement();
@@ -7032,8 +7068,9 @@ bool check_simple_select()
   if (lex->current_select != &lex->select_lex)
   {
     char command[80];
-    strmake(command, lex->yylval->symbol.str,
-	    min(lex->yylval->symbol.length, sizeof(command)-1));
+    Lex_input_stream *lip= thd->m_lip;
+    strmake(command, lip->yylval->symbol.str,
+	    min(lip->yylval->symbol.length, sizeof(command)-1));
     my_error(ER_CANT_USE_OPTION_HERE, MYF(0), command);
     return 1;
   }
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 85092f14624..ab26fc4e85d 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -2799,11 +2799,15 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len)
 
   old_stmt_arena= thd->stmt_arena;
   thd->stmt_arena= this;
-  lex_start(thd, (uchar*) thd->query, thd->query_length);
+
+  Lex_input_stream lip(thd, thd->query, thd->query_length);
+  thd->m_lip= &lip;
+  lex_start(thd);
   lex->safe_to_cache_query= FALSE;
   lex->stmt_prepare_mode= TRUE;
+  int err= MYSQLparse((void *)thd);
 
-  error= MYSQLparse((void *)thd) || thd->is_fatal_error ||
+  error= err || thd->is_fatal_error ||
       thd->net.report_error || init_param_array(this);
 
   /*
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 55d51ad07b7..26b557a8247 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -978,10 +978,14 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
         LEX_STRING *trg_definer= it_definer++;
 
         thd->variables.sql_mode= (ulong)*trg_sql_mode;
-        lex_start(thd, (uchar*)trg_create_str->str, trg_create_str->length);
 
+        Lex_input_stream lip(thd, trg_create_str->str, trg_create_str->length);
+        thd->m_lip= &lip;
+        lex_start(thd);
 	thd->spcont= 0;
-        if (MYSQLparse((void *)thd) || thd->is_fatal_error)
+        int err= MYSQLparse((void *)thd);
+
+        if (err || thd->is_fatal_error)
         {
           /* Currently sphead is always deleted in case of a parse error */
           DBUG_ASSERT(lex.sphead == 0);
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 83beec3d1be..5ec32ac3e79 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -761,8 +761,8 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view,
   view->query.str= (char*)str.ptr();
   view->query.length= str.length()-1; // we do not need last \0
   view->source.str= thd->query + thd->lex->create_view_select_start;
-  view->source.length= (char *)skip_rear_comments((uchar *)view->source.str,
-                                                  (uchar *)thd->query +
+  view->source.length= (char *)skip_rear_comments((char *)view->source.str,
+                                                  (char *)thd->query +
                                                   thd->query_length) -
                         view->source.str;
   view->file_version= 1;
@@ -973,10 +973,14 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table,
     now Lex placed in statement memory
   */
   table->view= lex= thd->lex= (LEX*) new(thd->mem_root) st_lex_local;
-  lex_start(thd, (uchar*)table->query.str, table->query.length);
-  view_select= &lex->select_lex;
-  view_select->select_number= ++thd->select_number;
+
   {
+    Lex_input_stream lip(thd, table->query.str, table->query.length);
+    thd->m_lip= &lip;
+    lex_start(thd);
+    view_select= &lex->select_lex;
+    view_select->select_number= ++thd->select_number;
+
     ulong save_mode= thd->variables.sql_mode;
     /* switch off modes which can prevent normal parsing of VIEW
       - MODE_REAL_AS_FLOAT            affect only CREATE TABLE parsing
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 4a50a602121..82d148c4a1e 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -86,12 +86,13 @@ const LEX_STRING null_lex_str={0,0};
 void my_parse_error(const char *s)
 {
   THD *thd= current_thd;
+  Lex_input_stream *lip= thd->m_lip;
 
-  char *yytext= (char*) thd->lex->tok_start;
+  const char *yytext= lip->tok_start;
   /* Push an error into the error stack */
   my_printf_error(ER_PARSE_ERROR,  ER(ER_PARSE_ERROR), MYF(0), s,
-                  (yytext ? (char*) yytext : ""),
-                  thd->lex->yylineno);
+                  (yytext ? yytext : ""),
+                  lip->yylineno);
 }
 
 /**
@@ -1619,7 +1620,9 @@ create_function_tail:
 	  }
 	| '('
 	  {
-	    LEX *lex= Lex;
+            THD *thd= YYTHD;
+	    LEX *lex= thd->lex;
+            Lex_input_stream *lip= thd->m_lip;
 	    sp_head *sp;
 
             /* 
@@ -1639,9 +1642,9 @@ create_function_tail:
 	    }
 	    /* Order is important here: new - reset - init */
 	    sp= new sp_head();
-	    sp->reset_thd_mem_root(YYTHD);
+	    sp->reset_thd_mem_root(thd);
 	    sp->init(lex);
-            sp->init_sp_name(YYTHD, lex->spname);
+            sp->init_sp_name(thd, lex->spname);
 
 	    sp->m_type= TYPE_ENUM_FUNCTION;
 	    lex->sphead= sp;
@@ -1650,15 +1653,17 @@ create_function_tail:
 	     * stored procedure, otherwise yylex will chop it into pieces
 	     * at each ';'.
 	     */
-	    sp->m_old_cmq= YYTHD->client_capabilities & CLIENT_MULTI_QUERIES;
-	    YYTHD->client_capabilities &= ~CLIENT_MULTI_QUERIES;
-	    lex->sphead->m_param_begin= lex->tok_start+1;
+	    sp->m_old_cmq= thd->client_capabilities & CLIENT_MULTI_QUERIES;
+	    thd->client_capabilities &= ~CLIENT_MULTI_QUERIES;
+	    lex->sphead->m_param_begin= lip->tok_start+1;
 	  }
           sp_fdparam_list ')'
 	  {
-	    LEX *lex= Lex;
+            THD *thd= YYTHD;
+	    LEX *lex= thd->lex;
+            Lex_input_stream *lip= thd->m_lip;
 
-	    lex->sphead->m_param_end= lex->tok_start;
+	    lex->sphead->m_param_end= lip->tok_start;
 	  }
 	  RETURNS_SYM
 	  {
@@ -1682,10 +1687,12 @@ create_function_tail:
 	  }
 	  sp_c_chistics
 	  {
-	    LEX *lex= Lex;
+            THD *thd= YYTHD;
+	    LEX *lex= thd->lex;
+            Lex_input_stream *lip= thd->m_lip;
 
 	    lex->sphead->m_chistics= &lex->sp_chistics;
-	    lex->sphead->m_body_begin= lex->tok_start;
+	    lex->sphead->m_body_begin= lip->tok_start;
 	  }
 	  sp_proc_stmt
 	  {
@@ -2233,14 +2240,18 @@ sp_opt_default:
 
 sp_proc_stmt:
 	  {
-	    LEX *lex= Lex;
+            THD *thd= YYTHD;
+	    LEX *lex= thd->lex;
+            Lex_input_stream *lip= thd->m_lip;
 
-	    lex->sphead->reset_lex(YYTHD);
-	    lex->sphead->m_tmp_query= lex->tok_start;
+	    lex->sphead->reset_lex(thd);
+	    lex->sphead->m_tmp_query= lip->tok_start;
 	  }
 	  statement
 	  {
-	    LEX *lex= Lex;
+            THD *thd= YYTHD;
+	    LEX *lex= thd->lex;
+            Lex_input_stream *lip= thd->m_lip;
 	    sp_head *sp= lex->sphead;
 
             sp->m_flags|= sp_get_flags_for_command(lex);
@@ -2267,15 +2278,15 @@ sp_proc_stmt:
                 lex->tok_end otherwise.
               */
               if (yychar == YYEMPTY)
-                i->m_query.length= lex->ptr - sp->m_tmp_query;
+                i->m_query.length= lip->ptr - sp->m_tmp_query;
               else
-                i->m_query.length= lex->tok_end - sp->m_tmp_query;
-              i->m_query.str= strmake_root(YYTHD->mem_root,
-                                           (char *)sp->m_tmp_query,
+                i->m_query.length= lip->tok_end - sp->m_tmp_query;
+              i->m_query.str= strmake_root(thd->mem_root,
+                                           sp->m_tmp_query,
                                            i->m_query.length);
               sp->add_instr(i);
             }
-	    sp->restore_lex(YYTHD);
+	    sp->restore_lex(thd);
           }
           | RETURN_SYM 
           { Lex->sphead->reset_lex(YYTHD); }
@@ -4444,10 +4455,18 @@ select_item:
 	  };
 
 remember_name:
-	{ $$=(char*) Lex->tok_start; };
+	{
+          THD *thd= YYTHD;
+          Lex_input_stream *lip= thd->m_lip;
+          $$= (char*) lip->tok_start;
+        };
 
 remember_end:
-	{ $$=(char*) Lex->tok_end; };
+	{
+          THD *thd= YYTHD;
+          Lex_input_stream *lip= thd->m_lip;
+          $$=(char*) lip->tok_end;
+        };
 
 select_item2:
 	table_wild	{ $$=$1; } /* table.* */
@@ -6292,12 +6311,14 @@ procedure_list2:
 procedure_item:
 	  remember_name expr
 	  {
-	    LEX *lex= Lex;
-	    if (add_proc_to_list(lex->thd, $2))
+            THD *thd= YYTHD;
+            Lex_input_stream *lip= thd->m_lip;
+
+	    if (add_proc_to_list(thd, $2))
 	      MYSQL_YYABORT;
 	    if (!$2->name)
-	      $2->set_name($1,(uint) ((char*) lex->tok_end - $1),
-                           YYTHD->charset());
+	      $2->set_name($1,(uint) ((char*) lip->tok_end - $1),
+                           thd->charset());
 	  }
           ;
 
@@ -7337,13 +7358,16 @@ use:	USE_SYM ident
 
 load:   LOAD DATA_SYM
         {
-          LEX *lex=Lex;
+          THD *thd= YYTHD;
+          LEX *lex= thd->lex;
+          Lex_input_stream *lip= thd->m_lip;
+
 	  if (lex->sphead)
 	  {
 	    my_error(ER_SP_BADSTATEMENT, MYF(0), "LOAD DATA");
 	    MYSQL_YYABORT;
 	  }
-          lex->fname_start= lex->ptr;
+          lex->fname_start= lip->ptr;
         }
         load_data
         {}
@@ -7378,8 +7402,10 @@ load_data:
         }
         opt_duplicate INTO
         {
-	  LEX *lex=Lex;
-	  lex->fname_end= lex->ptr;
+          THD *thd= YYTHD;
+	  LEX *lex= thd->lex;
+          Lex_input_stream *lip= thd->m_lip;
+	  lex->fname_end= lip->ptr;
 	}
         TABLE_SYM table_ident
         {
@@ -7559,15 +7585,16 @@ text_string:
 param_marker:
         PARAM_MARKER
         {
-          THD *thd=YYTHD;
+          THD *thd= YYTHD;
 	  LEX *lex= thd->lex;
+          Lex_input_stream *lip= thd->m_lip;
           Item_param *item;
           if (! lex->parsing_options.allows_variable)
           {
             my_error(ER_VIEW_SELECT_VARIABLE, MYF(0));
             MYSQL_YYABORT;
           }
-          item= new Item_param((uint) (lex->tok_start - (uchar *) thd->query));
+          item= new Item_param((uint) (lip->tok_start - thd->query));
           if (!($$= item) || lex->param_list.push_back(item))
           {
             my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
@@ -7590,8 +7617,11 @@ signed_literal:
 literal:
 	text_literal	{ $$ =	$1; }
 	| NUM_literal	{ $$ = $1; }
-	| NULL_SYM	{ $$ =	new Item_null();
-			  Lex->next_state=MY_LEX_OPERATOR_OR_IDENT;}
+	| NULL_SYM
+          {
+            $$ = new Item_null();
+            YYTHD->m_lip->next_state=MY_LEX_OPERATOR_OR_IDENT;
+          }
 	| FALSE_SYM	{ $$= new Item_int((char*) "FALSE",0,1); }
 	| TRUE_SYM	{ $$= new Item_int((char*) "TRUE",1,1); }
 	| HEX_NUM	{ $$ =	new Item_hex_string($1.str, $1.length);}
@@ -7681,8 +7711,10 @@ order_ident:
 simple_ident:
 	ident
 	{
+          THD *thd= YYTHD;
+	  LEX *lex= thd->lex;
+          Lex_input_stream *lip= thd->m_lip;
 	  sp_variable_t *spv;
-	  LEX *lex = Lex;
           sp_pcontext *spc = lex->spcont;
 	  if (spc && (spv = spc->find_variable(&$1)))
 	  {
@@ -7695,7 +7727,7 @@ simple_ident:
 
             Item_splocal *splocal;
             splocal= new Item_splocal($1, spv->offset, spv->type,
-                                      lex->tok_start_prev - 
+                                      lip->tok_start_prev - 
                                       lex->sphead->m_tmp_query);
 #ifndef DBUG_OFF
             if (splocal)
@@ -8291,7 +8323,11 @@ option_value_list:
 
 option_type_value:
         {
-          if (Lex->sphead)
+          THD *thd= YYTHD;
+	  LEX *lex= thd->lex;
+          Lex_input_stream *lip= thd->m_lip;
+
+          if (lex->sphead)
           {
             /*
               If we are in SP we want have own LEX for each assignment.
@@ -8303,9 +8339,8 @@ option_type_value:
 
               QQ: May be we should simply prohibit group assignments in SP?
             */
-            LEX *lex;
-            Lex->sphead->reset_lex(YYTHD);
-            lex= Lex;
+            Lex->sphead->reset_lex(thd);
+            lex= thd->lex;
 
             /* Set new LEX as if we at start of set rule. */
 	    lex->sql_command= SQLCOM_SET_OPTION;
@@ -8313,12 +8348,14 @@ option_type_value:
 	    lex->option_type=OPT_SESSION;
 	    lex->var_list.empty();
             lex->one_shot_set= 0;
-	    lex->sphead->m_tmp_query= lex->tok_start;
+	    lex->sphead->m_tmp_query= lip->tok_start;
           }
         }
 	ext_option_value
         {
-          LEX *lex= Lex;
+          THD *thd= YYTHD;
+	  LEX *lex= thd->lex;
+          Lex_input_stream *lip= thd->m_lip;
 
           if (lex->sphead)
           {
@@ -8340,24 +8377,24 @@ option_type_value:
 
               /*
                 Extract the query statement from the tokenizer.  The
-                end is either lex->ptr, if there was no lookahead,
-                lex->tok_end otherwise.
+                end is either lip->ptr, if there was no lookahead,
+                lip->tok_end otherwise.
               */
               if (yychar == YYEMPTY)
-                qbuff.length= lex->ptr - sp->m_tmp_query;
+                qbuff.length= lip->ptr - sp->m_tmp_query;
               else
-                qbuff.length= lex->tok_end - sp->m_tmp_query;
+                qbuff.length= lip->tok_end - sp->m_tmp_query;
 
-              if (!(qbuff.str= alloc_root(YYTHD->mem_root, qbuff.length + 5)))
+              if (!(qbuff.str= alloc_root(thd->mem_root, qbuff.length + 5)))
                 MYSQL_YYABORT;
 
-              strmake(strmake(qbuff.str, "SET ", 4), (char *)sp->m_tmp_query,
+              strmake(strmake(qbuff.str, "SET ", 4), sp->m_tmp_query,
                       qbuff.length);
               qbuff.length+= 4;
               i->m_query= qbuff;
               sp->add_instr(i);
             }
-            lex->sphead->restore_lex(YYTHD);
+            lex->sphead->restore_lex(thd);
           }
         };
 
@@ -9615,7 +9652,9 @@ trigger_tail:
 	TRIGGER_SYM remember_name sp_name trg_action_time trg_event
 	ON remember_name table_ident FOR_SYM remember_name EACH_SYM ROW_SYM
 	{
-	  LEX *lex= Lex;
+          THD *thd= YYTHD;
+	  LEX *lex= thd->lex;
+          Lex_input_stream *lip= thd->m_lip;
 	  sp_head *sp;
 	 
 	  if (lex->sphead)
@@ -9626,9 +9665,9 @@ trigger_tail:
 	
 	  if (!(sp= new sp_head()))
 	    MYSQL_YYABORT;
-	  sp->reset_thd_mem_root(YYTHD);
+	  sp->reset_thd_mem_root(thd);
 	  sp->init(lex);
-          sp->init_sp_name(YYTHD, $3);
+          sp->init_sp_name(thd, $3);
 	
 	  lex->stmt_definition_begin= $2;
           lex->ident.str= $7;
@@ -9642,12 +9681,12 @@ trigger_tail:
 	    stored procedure, otherwise yylex will chop it into pieces
 	    at each ';'.
 	  */
-	  sp->m_old_cmq= YYTHD->client_capabilities & CLIENT_MULTI_QUERIES;
-	  YYTHD->client_capabilities &= ~CLIENT_MULTI_QUERIES;
+	  sp->m_old_cmq= thd->client_capabilities & CLIENT_MULTI_QUERIES;
+	  thd->client_capabilities &= ~CLIENT_MULTI_QUERIES;
 	  
 	  bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
 	  lex->sphead->m_chistics= &lex->sp_chistics;
-	  lex->sphead->m_body_begin= lex->ptr;
+	  lex->sphead->m_body_begin= lip->ptr;
           while (my_isspace(system_charset_info, lex->sphead->m_body_begin[0]))
             ++lex->sphead->m_body_begin;
 	}
@@ -9726,24 +9765,30 @@ sp_tail:
 	}
         '('
 	{
-	  LEX *lex= Lex;
+          THD *thd= YYTHD;
+	  LEX *lex= thd->lex;
+          Lex_input_stream *lip= thd->m_lip;
 
-	  lex->sphead->m_param_begin= lex->tok_start+1;
+	  lex->sphead->m_param_begin= lip->tok_start+1;
 	}
 	sp_pdparam_list
 	')'
 	{
-	  LEX *lex= Lex;
+          THD *thd= YYTHD;
+	  LEX *lex= thd->lex;
+          Lex_input_stream *lip= thd->m_lip;
 
-	  lex->sphead->m_param_end= lex->tok_start;
+	  lex->sphead->m_param_end= lip->tok_start;
 	  bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
 	}
 	sp_c_chistics
 	{
-	  LEX *lex= Lex;
+          THD *thd= YYTHD;
+	  LEX *lex= thd->lex;
+          Lex_input_stream *lip= thd->m_lip;
 
 	  lex->sphead->m_chistics= &lex->sp_chistics;
-	  lex->sphead->m_body_begin= lex->tok_start;
+	  lex->sphead->m_body_begin= lip->tok_start;
 	}
 	sp_proc_stmt
 	{

From c49e378ac4a690220d86c11ef40f2382848c6d30 Mon Sep 17 00:00:00 2001
From: unknown <malff/marcsql@weblab.(none)>
Date: Wed, 25 Apr 2007 11:38:11 -0600
Subject: [PATCH 03/58] code review fix

---
 sql/sql_lex.cc   | 6 +++---
 sql/sql_lex.h    | 5 ++++-
 sql/sql_parse.cc | 9 +++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 95b9a77d411..ecdbb654ffd 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -122,7 +122,8 @@ Lex_input_stream::Lex_input_stream(THD *thd,
   tok_start_prev(NULL),
   buf(buffer),
   next_state(MY_LEX_START),
-  found_semicolon(NULL)
+  found_semicolon(NULL),
+  ignore_space(test(thd->variables.sql_mode & MODE_IGNORE_SPACE))
 {
 }
 
@@ -192,7 +193,6 @@ void lex_start(THD *thd)
   lex->select_lex.udf_list.empty();
   lex->current_select= &lex->select_lex;
   lex->yacc_yyss=lex->yacc_yyvs=0;
-  lex->ignore_space=test(thd->variables.sql_mode & MODE_IGNORE_SPACE);
   lex->sql_command= lex->orig_sql_command= SQLCOM_END;
   lex->duplicates= DUP_ERROR;
   lex->ignore= 0;
@@ -656,7 +656,7 @@ int MYSQLlex(void *arg, void *yythd)
       }
       length= (uint) (lip->ptr - lip->tok_start)-1;
       start= lip->ptr;
-      if (lex->ignore_space)
+      if (lip->ignore_space)
       {
         /*
           If we find a space then this can't be an identifier. We notice this
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index d580b2016ae..d07de73d5b9 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -951,6 +951,9 @@ public:
 
   /** Position of ';' in the stream, to delimit multiple queries. */
   const char* found_semicolon;
+
+  /** SQL_MODE = IGNORE_SPACE. */
+  bool ignore_space;
 };
 
 
@@ -1069,7 +1072,7 @@ typedef struct st_lex : public Query_tables_list
   uint8 create_view_algorithm;
   uint8 create_view_check;
   bool drop_if_exists, drop_temporary, local_file, one_shot_set;
-  bool in_comment, ignore_space, verbose, no_write_to_binlog;
+  bool in_comment, verbose, no_write_to_binlog;
   bool tx_chain, tx_release;
   /*
     Special JOIN::prepare mode: changing of query is prohibited.
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 0505f0d3574..22689a3dfa1 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5990,16 +5990,14 @@ void mysql_parse(THD *thd, const char *inBuf, uint length,
     - first, call query_cache_send_result_to_client,
     - second, if caching failed, initialise the lexical and syntactic parser.
     The problem is that the query cache depends on a clean initialization
-    of the thd and thd->lex structures, which happen to be implemented
-    by:
+    of (among others) lex->safe_to_cache_query and thd->server_status,
+    which are reset respectively in
     - lex_start()
     - mysql_reset_thd_for_next_command()
     So, initializing the lexical analyser *before* using the query cache
     is required for the cache to work properly.
     FIXME: cleanup the dependencies in the code to simplify this.
   */
-  Lex_input_stream lip(thd, inBuf, length);
-  thd->m_lip= &lip;
   lex_start(thd);
   mysql_reset_thd_for_next_command(thd);
 
@@ -6010,6 +6008,9 @@ void mysql_parse(THD *thd, const char *inBuf, uint length,
     sp_cache_flush_obsolete(&thd->sp_proc_cache);
     sp_cache_flush_obsolete(&thd->sp_func_cache);
 
+    Lex_input_stream lip(thd, inBuf, length);
+    thd->m_lip= &lip;
+
     int err= MYSQLparse(thd);
     *found_semicolon= lip.found_semicolon;
 

From 1700feaa0296250b10882bd421f555776614120c Mon Sep 17 00:00:00 2001
From: unknown <malff/marcsql@weblab.(none)>
Date: Fri, 27 Apr 2007 17:14:25 -0600
Subject: [PATCH 04/58] Bug#21513 (SP having body starting with quoted label
 rendered unusable)

Before this fix, the parser would sometime change where a token starts by
altering Lex_input_string::tok_start, which later confused the code in
sql_yacc.yy that needs to capture the source code of a SQL statement,
like to represent the body of a stored procedure.

This line of code in sql_lex.cc :

case MY_LEX_USER_VARIABLE_DELIMITER:
  lip->tok_start= lip->ptr; // Skip first `

would <skip the first back quote> ... and cause the bug reported.

In general, the responsibility of sql_lex.cc is to *find* where token are
in the SQL text, but is *not* to make up fake or incomplete tokens.
With a quoted label like `my_label`, the token starts on the first quote.
Extracting the token value should not change that (it did).

With this fix, the lexical analysis has been cleaned up to not change
lip->tok_start (in the case found for this bug).

The functions get_token() and get_quoted_token() now have an extra
parameters, used when some characters from the beginning of the token need
to be skipped when extracting a token value, like when extracting 'AB' from
'0xAB', for example, for a HEX_NUM token.

This exposed a bad assumption in Item_hex_string and Item_bin_string,
which has been fixed:

The assumption was that the string given, 'AB', was in fact preceded in
memory by '0x', which might be false (it can be preceded by "x'" and
followed by "'" -- or not be preceded by valid memory at all)

If a name is needed for Item_hex_string or Item_bin_string, the name is
taken from the original and true source code ('0xAB'), and assigned in
the select_item rule, instead of relying on assumptions related to how
memory is used.


mysql-test/r/sp.result:
  Lex_input_stream::tok_start must point at the real start of a token.
mysql-test/t/sp.test:
  Lex_input_stream::tok_start must point at the real start of a token.
sql/item.cc:
  Lex_input_stream::tok_start must point at the real start of a token.
sql/sql_lex.cc:
  Lex_input_stream::tok_start must point at the real start of a token.
sql/sql_yacc.yy:
  Lex_input_stream::tok_start must point at the real start of a token.
---
 mysql-test/r/sp.result |  7 +++++
 mysql-test/t/sp.test   | 11 ++++++++
 sql/item.cc            |  2 --
 sql/sql_lex.cc         | 64 ++++++++++++++++++++----------------------
 sql/sql_yacc.yy        | 14 +++++----
 5 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 9ba6a356db2..b5b79af031e 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -6118,6 +6118,13 @@ Warning	1265	Data truncated for column 'bug5274_f1' at row 1
 Warning	1265	Data truncated for column 'bug5274_f1' at row 1
 DROP FUNCTION bug5274_f1|
 DROP FUNCTION bug5274_f2|
+drop procedure if exists proc_21513|
+create procedure proc_21513()`my_label`:BEGIN END|
+show create procedure proc_21513|
+Procedure	sql_mode	Create Procedure
+proc_21513		CREATE DEFINER=`root`@`localhost` PROCEDURE `proc_21513`()
+`my_label`:BEGIN END
+drop procedure proc_21513|
 End of 5.0 tests.
 drop table t1,t2;
 CREATE TABLE t1 (a int auto_increment primary key) engine=MyISAM;
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 64876ae0584..97677838d48 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -7054,6 +7054,17 @@ SELECT bug5274_f2()|
 DROP FUNCTION bug5274_f1|
 DROP FUNCTION bug5274_f2|
 
+#
+# Bug#21513 (SP having body starting with quoted label rendered unusable)
+#
+--disable_warnings
+drop procedure if exists proc_21513|
+--enable_warnings
+
+create procedure proc_21513()`my_label`:BEGIN END|
+show create procedure proc_21513|
+
+drop procedure proc_21513|
 
 ###
 --echo End of 5.0 tests.
diff --git a/sql/item.cc b/sql/item.cc
index ed5bd67d096..a2a7d46edc3 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -4602,7 +4602,6 @@ inline uint char_val(char X)
 
 Item_hex_string::Item_hex_string(const char *str, uint str_length)
 {
-  name=(char*) str-2;				// Lex makes this start with 0x
   max_length=(str_length+1)/2;
   char *ptr=(char*) sql_alloc(max_length+1);
   if (!ptr)
@@ -4713,7 +4712,6 @@ Item_bin_string::Item_bin_string(const char *str, uint str_length)
   uchar bits= 0;
   uint power= 1;
 
-  name= (char*) str - 2;
   max_length= (str_length + 7) >> 3;
   char *ptr= (char*) sql_alloc(max_length + 1);
   if (!ptr)
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index ecdbb654ffd..fabd9a0e003 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -262,12 +262,12 @@ bool is_keyword(const char *name, uint len)
 
 /* make a copy of token before ptr and set yytoklen */
 
-static LEX_STRING get_token(Lex_input_stream *lip, uint length)
+static LEX_STRING get_token(Lex_input_stream *lip, uint skip, uint length)
 {
   LEX_STRING tmp;
   yyUnget();			// ptr points now after last token char
   tmp.length=lip->yytoklen=length;
-  tmp.str= lip->m_thd->strmake(lip->tok_start, tmp.length);
+  tmp.str= lip->m_thd->strmake(lip->tok_start + skip, tmp.length);
   return tmp;
 }
 
@@ -279,6 +279,7 @@ static LEX_STRING get_token(Lex_input_stream *lip, uint length)
 */
 
 static LEX_STRING get_quoted_token(Lex_input_stream *lip,
+                                   uint skip,
                                    uint length, char quote)
 {
   LEX_STRING tmp;
@@ -286,9 +287,10 @@ static LEX_STRING get_quoted_token(Lex_input_stream *lip,
   yyUnget();			// ptr points now after last token char
   tmp.length=lip->yytoklen=length;
   tmp.str=(char*) lip->m_thd->alloc(tmp.length+1);
-  for (from= (byte*) lip->tok_start, to= (byte*) tmp.str, end= to+length ;
-       to != end ;
-       )
+  from= (byte*) lip->tok_start + skip;
+  to= (byte*) tmp.str;
+  end= to+length;
+  for ( ; to != end; )
   {
     if ((*to++= *from++) == quote)
       from++;					// Skip double quotes
@@ -676,7 +678,7 @@ int MYSQLlex(void *arg, void *yythd)
 	}
 	yySkip();			// next state does a unget
       }
-      yylval->lex_str=get_token(lip, length);
+      yylval->lex_str=get_token(lip, 0, length);
 
       /* 
          Note: "SELECT _bla AS 'alias'"
@@ -718,7 +720,7 @@ int MYSQLlex(void *arg, void *yythd)
 	  {
 	    yySkip();
 	    while (my_isdigit(cs,yyGet())) ;
-	    yylval->lex_str=get_token(lip, yyLength());
+	    yylval->lex_str=get_token(lip, 0, yyLength());
 	    return(FLOAT_NUM);
 	  }
 	}
@@ -730,10 +732,8 @@ int MYSQLlex(void *arg, void *yythd)
 	while (my_isxdigit(cs,(c = yyGet()))) ;
 	if ((lip->ptr - lip->tok_start) >= 4 && !ident_map[c])
 	{
-	  yylval->lex_str=get_token(lip, yyLength());
-	  yylval->lex_str.str+=2;		// Skip 0x
-	  yylval->lex_str.length-=2;
-	  lip->yytoklen-=2;
+          /* skip '0x' */
+	  yylval->lex_str=get_token(lip, 2, yyLength()-2);
 	  return (HEX_NUM);
 	}
 	yyUnget();
@@ -744,10 +744,8 @@ int MYSQLlex(void *arg, void *yythd)
 	while (my_isxdigit(cs,(c = yyGet()))) ;
 	if ((lip->ptr - lip->tok_start) >= 4 && !ident_map[c])
 	{
-	  yylval->lex_str= get_token(lip, yyLength());
-	  yylval->lex_str.str+= 2;		// Skip 0x
-	  yylval->lex_str.length-= 2;
-	  lip->yytoklen-= 2;
+          /* Skip '0b' */
+	  yylval->lex_str= get_token(lip, 2, yyLength()-2);
 	  return (BIN_NUM);
 	}
 	yyUnget();
@@ -782,14 +780,13 @@ int MYSQLlex(void *arg, void *yythd)
       if (c == '.' && ident_map[yyPeek()])
 	lip->next_state=MY_LEX_IDENT_SEP;// Next is '.'
 
-      yylval->lex_str= get_token(lip, yyLength());
+      yylval->lex_str= get_token(lip, 0, yyLength());
       return(result_state);
 
     case MY_LEX_USER_VARIABLE_DELIMITER:	// Found quote char
     {
       uint double_quotes= 0;
       char quote_char= c;                       // Used char
-      lip->tok_start=lip->ptr;			// Skip first `
       while ((c=yyGet()))
       {
 	int var_length;
@@ -813,19 +810,20 @@ int MYSQLlex(void *arg, void *yythd)
 #endif
       }
       if (double_quotes)
-	yylval->lex_str=get_quoted_token(lip, yyLength() - double_quotes,
+	yylval->lex_str=get_quoted_token(lip, 1,
+                                         yyLength() - double_quotes -1,
 					 quote_char);
       else
-	yylval->lex_str=get_token(lip, yyLength());
+	yylval->lex_str=get_token(lip, 1, yyLength() -1);
       if (c == quote_char)
 	yySkip();			// Skip end `
       lip->next_state= MY_LEX_START;
       return(IDENT_QUOTED);
     }
-    case MY_LEX_INT_OR_REAL:		// Compleat int or incompleat real
+    case MY_LEX_INT_OR_REAL:		// Complete int or incomplete real
       if (c != '.')
       {					// Found complete integer number.
-	yylval->lex_str=get_token(lip, yyLength());
+	yylval->lex_str=get_token(lip, 0, yyLength());
 	return int_token(yylval->lex_str.str,yylval->lex_str.length);
       }
       // fall through
@@ -843,10 +841,10 @@ int MYSQLlex(void *arg, void *yythd)
 	  break;
 	}
 	while (my_isdigit(cs,yyGet())) ;
-	yylval->lex_str=get_token(lip, yyLength());
+	yylval->lex_str=get_token(lip, 0, yyLength());
 	return(FLOAT_NUM);
       }
-      yylval->lex_str=get_token(lip, yyLength());
+      yylval->lex_str=get_token(lip, 0, yyLength());
       return(DECIMAL_NUM);
 
     case MY_LEX_HEX_NUMBER:		// Found x'hexstring'
@@ -858,10 +856,9 @@ int MYSQLlex(void *arg, void *yythd)
 	return(ABORT_SYM);		// Illegal hex constant
       }
       yyGet();				// get_token makes an unget
-      yylval->lex_str=get_token(lip, length);
-      yylval->lex_str.str+=2;		// Skip x'
-      yylval->lex_str.length-=3;	// Don't count x' and last '
-      lip->yytoklen-=3;
+      yylval->lex_str=get_token(lip,
+                                2,          // skip x'
+                                length-3);  // don't count x' and last '
       return (HEX_NUM);
 
     case MY_LEX_BIN_NUMBER:           // Found b'bin-string'
@@ -871,11 +868,10 @@ int MYSQLlex(void *arg, void *yythd)
       if (c != '\'')
       return(ABORT_SYM);              // Illegal hex constant
       yyGet();                        // get_token makes an unget
-      yylval->lex_str= get_token(lip, length);
-      yylval->lex_str.str+= 2;        // Skip b'
-      yylval->lex_str.length-= 3;     // Don't count b' and last '
-      lip->yytoklen-= 3;
-      return (BIN_NUM); 
+      yylval->lex_str= get_token(lip,
+                                 2,         // skip b'
+                                 length-3); // don't count b' and last '
+      return (BIN_NUM);
 
     case MY_LEX_CMP_OP:			// Incomplete comparison operator
       if (state_map[yyPeek()] == MY_LEX_CMP_OP ||
@@ -1047,7 +1043,7 @@ int MYSQLlex(void *arg, void *yythd)
       for (c=yyGet() ; 
 	   my_isalnum(cs,c) || c == '.' || c == '_' ||  c == '$';
 	   c= yyGet()) ;
-      yylval->lex_str=get_token(lip, yyLength());
+      yylval->lex_str=get_token(lip, 0, yyLength());
       return(LEX_HOSTNAME);
     case MY_LEX_SYSTEM_VAR:
       yylval->lex_str.str=(char*) lip->ptr;
@@ -1079,7 +1075,7 @@ int MYSQLlex(void *arg, void *yythd)
 	yyUnget();				// Put back 'c'
 	return(tokval);				// Was keyword
       }
-      yylval->lex_str=get_token(lip, length);
+      yylval->lex_str=get_token(lip, 0, length);
       return(result_state);
     }
   }
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 82d148c4a1e..390a991c7b6 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -4439,21 +4439,23 @@ select_item_list:
 select_item:
 	  remember_name select_item2 remember_end select_alias
 	  {
-	    if (add_item_to_list(YYTHD, $2))
+            THD *thd= YYTHD;
+            DBUG_ASSERT($1 < $3);
+
+	    if (add_item_to_list(thd, $2))
 	      MYSQL_YYABORT;
 	    if ($4.str)
             {
               $2->is_autogenerated_name= FALSE;
 	      $2->set_name($4.str, $4.length, system_charset_info);
             }
-	    else if (!$2->name) {
-	      char *str = $1;
-	      if (str[-1] == '`')
-	        str--;
-	      $2->set_name(str,(uint) ($3 - str), YYTHD->charset());
+	    else if (!$2->name)
+            {
+	      $2->set_name($1, (uint) ($3 - $1), thd->charset());
 	    }
 	  };
 
+
 remember_name:
 	{
           THD *thd= YYTHD;

From a7718cf5c9df143005182feb390ba8bea0568228 Mon Sep 17 00:00:00 2001
From: unknown <mskold/marty@mysql.com/linux.site>
Date: Mon, 30 Apr 2007 14:17:08 +0200
Subject: [PATCH 05/58] Bug#27926  wrong month name in cluster error log

---
 ndb/src/kernel/error/TimeModule.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ndb/src/kernel/error/TimeModule.cpp b/ndb/src/kernel/error/TimeModule.cpp
index 1c01f91f86b..2be734842ba 100644
--- a/ndb/src/kernel/error/TimeModule.cpp
+++ b/ndb/src/kernel/error/TimeModule.cpp
@@ -18,7 +18,7 @@
 #include <ndb_global.h>
 #include "TimeModule.hpp"
 
-static const char* cMonth[]  = { "x", "January", "February", "Mars", "April", "May", "June",
+static const char* cMonth[]  = { "x", "January", "February", "March", "April", "May", "June",
 				 "July", "August", "September", "October", "November", "December"};
 
 static const char* cDay[]    = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday",

From a4a0faf4fd9df92cc2d498b93acd5b359cd3bc78 Mon Sep 17 00:00:00 2001
From: unknown <joerg@trift2.>
Date: Mon, 30 Apr 2007 17:01:00 +0200
Subject: [PATCH 06/58] Necessary change for cross-builds:  Include
 "mysql_fix_privilege_tables_sql.c" in the source tarball.

scripts/Makefile.am:
  Necessary change for cross-builds (like we do for NetWare):
  Generate "mysql_fix_privilege_tables_sql.c" during Bootstrap and include it in
  the source tarball which is created via "make dist".
---
 scripts/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 79f4666f855..52c1b6140d3 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -18,7 +18,7 @@
 BUILT_SOURCES = mysql_fix_privilege_tables.sql \
                 mysql_fix_privilege_tables_sql.c
 
-noinst_PROGRAMS = 	comp_sql
+EXTRA_PROGRAMS = 	comp_sql
 
 bin_SCRIPTS =		@server_scripts@ \
 			msql2mysql \
@@ -70,6 +70,8 @@ EXTRA_DIST =		$(EXTRA_SCRIPTS) \
 			mysqlaccess.conf \
 			mysqlbug \
 			make_win_bin_dist \
+			mysql_fix_privilege_tables.sql \
+			mysql_fix_privilege_tables_sql.c \
 			mysql_system_tables_fix.sql \
 			CMakeLists.txt
 

From 51d6e623ffc108dbec460975e05e9a7799c5b51c Mon Sep 17 00:00:00 2001
From: unknown <omer@linux.site>
Date: Tue, 1 May 2007 06:52:23 -0700
Subject: [PATCH 07/58] Updates to test/result files of funcs_1 to 5.0.40
 level,  - validated current result files  - forced order by and removed time
 stamps removed a_version files (since do not make sense now when suite is in
 the main tree) Note: datadict tests still fail as a result of regression bug
 28181 in 5.0.42 (discovered       while performing this update) - tests
 should run clean once bug is fixed

BitKeeper/deleted/.del-a_version_check.test:
  Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result:
  Delete: mysql-test/suite/funcs_1/r/a_version_check.result
BitKeeper/deleted/.del-innodb_views.warnings:
  Delete: mysql-test/suite/funcs_1/r/innodb_views.warnings
BitKeeper/deleted/.del-memory_views.warnings:
  Delete: mysql-test/suite/funcs_1/r/memory_views.warnings
BitKeeper/deleted/.del-myisam_views.warnings:
  Delete: mysql-test/suite/funcs_1/r/myisam_views.warnings
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Modified to correct failiure to return host name on some systems
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  corrections to force order by on queries and replace time stamps with strings
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  corrections to force order by on queries
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated result file with order bu selects, elimination of time stamps
  and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
  confirming existing results as correct ones - returned results are correct,
  wrong 'expected' error messages removed
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated result file with order bu selects, elimination of time stamps
  and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/memory_func_view.result:
  confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
  confirming existing results as correct ones - returned results are correct,
  wrong 'expected' error messages removed
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated result file with order bu selects, elimination of time stamps
  and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
  confirming existing results as correct ones - returned results are correct,
  wrong 'expected' error messages removed
mysql-test/suite/funcs_1/t/disabled.def:
  Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/views/views_master.inc:
  removed invalid -- lines generating warning files
---
 .../suite/funcs_1/datadict/datadict_load.inc  |    3 +-
 .../funcs_1/datadict/datadict_master.inc      |   55 +-
 .../funcs_1/datadict/datadict_show_schema.inc |    2 +-
 .../suite/funcs_1/r/a_version_check.result    |   11 -
 .../suite/funcs_1/r/innodb__datadict.result   | 1737 ++++++++---------
 .../suite/funcs_1/r/innodb_func_view.result   |   12 +-
 .../suite/funcs_1/r/innodb_trig_08.result     |    5 +-
 .../suite/funcs_1/r/innodb_views.result       |   27 +-
 .../suite/funcs_1/r/innodb_views.warnings     |    2 -
 .../suite/funcs_1/r/memory__datadict.result   | 1737 ++++++++---------
 .../suite/funcs_1/r/memory_func_view.result   |   12 +-
 .../suite/funcs_1/r/memory_trig_08.result     |    5 +-
 .../suite/funcs_1/r/memory_views.result       |   27 +-
 .../suite/funcs_1/r/memory_views.warnings     |    2 -
 .../suite/funcs_1/r/myisam__datadict.result   | 1737 ++++++++---------
 .../suite/funcs_1/r/myisam_func_view.result   |   12 +-
 .../suite/funcs_1/r/myisam_trig_08.result     |    5 +-
 .../suite/funcs_1/r/myisam_views.result       |   27 +-
 .../suite/funcs_1/r/myisam_views.warnings     |    2 -
 .../suite/funcs_1/t/a_version_check.test      |   29 -
 mysql-test/suite/funcs_1/t/disabled.def       |    6 +-
 .../suite/funcs_1/views/views_master.inc      |    8 +-
 22 files changed, 2697 insertions(+), 2766 deletions(-)
 delete mode 100644 mysql-test/suite/funcs_1/r/a_version_check.result
 delete mode 100644 mysql-test/suite/funcs_1/r/innodb_views.warnings
 delete mode 100644 mysql-test/suite/funcs_1/r/memory_views.warnings
 delete mode 100644 mysql-test/suite/funcs_1/r/myisam_views.warnings
 delete mode 100755 mysql-test/suite/funcs_1/t/a_version_check.test

diff --git a/mysql-test/suite/funcs_1/datadict/datadict_load.inc b/mysql-test/suite/funcs_1/datadict/datadict_load.inc
index 2842703f2f8..4a9bdc9356d 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_load.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_load.inc
@@ -44,7 +44,8 @@ if (0)
 # ------------------------------------------------------------------------------
 # prepare a variable to be able to suppress machine dependant diffs
 # this can be used in: --replace_result $SERVER_NAME <SERVER_NAME>
-let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host LIKE "%\%" AND host NOT In ("localhost", "127.0.0.1", "%")`;
+# let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host LIKE "%\%" AND host NOT In ("localhost", "127.0.0.1", "%")`;
+let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host NOT In ("localhost", "127.0.0.1", "%")`;
 
 
 ################################################################################
diff --git a/mysql-test/suite/funcs_1/datadict/datadict_master.inc b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
index 96185cafdda..385b17be9ee 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_master.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
@@ -105,7 +105,7 @@ SELECT DISTINCT u,
     AS Server_Clean
 FROM db_datadict.vu1;
 --replace_result $SERVER_NAME <SERVER_NAME>
-SELECT * FROM db_datadict.vu;
+SELECT * FROM db_datadict.vu order by u;
 
 delimiter //;
 CREATE PROCEDURE db_datadict.sp_1()
@@ -141,8 +141,9 @@ if ($have_bug_11589)
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
+# 17 CHECK_TIME
 # 20 CREATE_OPTIONS
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM tables
  WHERE table_schema = 'information_schema';
 #  9 AVG_ROW_LENGTH
@@ -152,7 +153,8 @@ SELECT * FROM tables
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"
+# 17 CHECK_TIME
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
 SELECT * FROM tables
  WHERE NOT( table_schema = 'information_schema');
 --horizontal_results
@@ -177,7 +179,7 @@ select count(*) from routines;
 select * from statistics;
 select * from views;
 --replace_result $SERVER_NAME <SERVER_NAME>
-select * from user_privileges;
+select * from user_privileges order by grantee, privilege_type;
 select * from schema_privileges;
 select * from table_privileges;
 select * from column_privileges;
@@ -199,7 +201,8 @@ select concat("Table or view '", table_name,
 --replace_result $SERVER_NAME <SERVER_NAME>
 select grantee as "user's having select privilege",
        substring( grantee, length(SUBSTRING_INDEX(grantee,_utf8'@',1))+2 )
-  from user_privileges where privilege_type = 'select';
+  from user_privileges where privilege_type = 'select'
+  order by grantee;
 
 select all table_schema from schema_privileges limit 0,5;
 
@@ -293,13 +296,14 @@ select * from information_schema.schemata ORDER BY 2 DESC;
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
+# 17 CHRCK_TIME
 # 20 CREATE_OPTIONS
 if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
 --vertical_results
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE table_schema = 'information_schema';
 #  9 AVG_ROW_LENGTH
@@ -309,7 +313,8 @@ SELECT * FROM information_schema.tables
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"
+# 17 CHRCK_TIME
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
 SELECT * FROM information_schema.tables
  WHERE NOT( table_schema = 'information_schema');
 --horizontal_results
@@ -385,7 +390,7 @@ select concat(table_schema, ', ', table_name) "Table_info"
   from tables ORDER BY 1;
 
 --replace_result $SERVER_NAME <SERVER_NAME>
-select distinct grantee from user_privileges;
+select distinct grantee from user_privileges order by grantee, privilege_type;
 select * from schema_privileges where table_catalog is null limit 0, 5;
 select * from table_privileges where grantee like '%r%'  limit 0, 5;
 
@@ -399,7 +404,7 @@ select * from schemata  limit 0,5;
 --replace_result $SERVER_NAME <SERVER_NAME>
 select distinct grantee from user_privileges;
 --replace_result $SERVER_NAME <SERVER_NAME>
-select all      grantee from user_privileges;
+select all      grantee from user_privileges order by grantee, privilege_type;
 
 select id , character_set_name from collations order by id asc limit 10;
 
@@ -455,8 +460,7 @@ eval SELECT *
   LINES TERMINATED BY '\n'
   FROM information_schema.schemata
   WHERE schema_name LIKE 'db_%';
-# FIXME: why do we get different error numbers with and without OUTFILE ?
-#FIXME this should fail! --error 1146
+# The above error is bug 28181 - a regression in 5.0.42
 eval SELECT *
   FROM information_schema.schemata
   WHERE schema_name LIKE 'db_%';
@@ -469,7 +473,7 @@ eval SELECT *
   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 ?
+# The above error is bug 28181 - a regression in 5.0.42
 eval SELECT *
   FROM schemata LIMIT 0, 5;
 
@@ -479,8 +483,7 @@ eval SELECT *
   LINES TERMINATED BY '\n'
   FROM information_schema.schemata
   WHERE schema_name LIKE 'db_%';
-# FIXME: why do we get different error numbers with and without OUTFILE ?
-#FIXME this should fail! --error 1146
+# The above error is bug 28181 - a regression in 5.0.42
 eval SELECT *
   FROM information_schema.schemata
   WHERE schema_name LIKE 'db_%';
@@ -3014,12 +3017,13 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
+# 17 CHECK_TIME
 # 20 CREATE_OPTIONS
 if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE table_schema = 'information_schema';
 #  9 AVG_ROW_LENGTH
@@ -3029,7 +3033,8 @@ SELECT * FROM information_schema.tables
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"
+# 17 CHECK_TIME
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
 SELECT * FROM information_schema.tables
  WHERE NOT( table_schema = 'information_schema');
 --enable_ps_protocol
@@ -3049,12 +3054,13 @@ connect (user_12_2, localhost, user_2, , db_datadict);
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
+# 17 CHECK_TIME
 # 20 CREATE_OPTIONS
 if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE table_schema = 'information_schema';
 #  9 AVG_ROW_LENGTH
@@ -3064,7 +3070,8 @@ SELECT * FROM information_schema.tables
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"
+# 17 CHECK_TIME
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
 SELECT * FROM information_schema.tables
  WHERE NOT( table_schema = 'information_schema');
 --enable_ps_protocol
@@ -3085,12 +3092,13 @@ connect (user_12_3, localhost, user_3, , db_datadict);
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
+# 17 CHECK_TIME
 # 20 CREATE_OPTIONS
 if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE table_schema = 'information_schema';
 #  9 AVG_ROW_LENGTH
@@ -3100,7 +3108,8 @@ SELECT * FROM information_schema.tables
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"
+# 17 CHECK_TIME
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
 SELECT * FROM information_schema.tables
  WHERE NOT( table_schema = 'information_schema');
 --enable_ps_protocol
@@ -3121,12 +3130,13 @@ connection default;
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
+# 17 CHECK_TIME
 # 20 CREATE_OPTIONS
 if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE table_schema = 'information_schema';
 #  9 AVG_ROW_LENGTH
@@ -3136,7 +3146,8 @@ SELECT * FROM information_schema.tables
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss"
+# 17 CHECK_TIME
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
 SELECT * FROM information_schema.tables
  WHERE NOT( table_schema = 'information_schema');
 --enable_ps_protocol
diff --git a/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc b/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
index 06b2d6fed45..260119f030f 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
@@ -36,7 +36,7 @@ eval select table_name, index_schema, index_name, index_type
 
 --replace_result $SERVER_NAME <SERVER_NAME>
 eval select *
-  from information_schema.user_privileges;
+  from information_schema.user_privileges order by grantee, privilege_type;
 # where grantee="'u_6_401013'@'%'";
 
 eval select *
diff --git a/mysql-test/suite/funcs_1/r/a_version_check.result b/mysql-test/suite/funcs_1/r/a_version_check.result
deleted file mode 100644
index 865569f9e69..00000000000
--- a/mysql-test/suite/funcs_1/r/a_version_check.result
+++ /dev/null
@@ -1,11 +0,0 @@
-
-. Just show the version string for which the results in suite
-. funcs_1 have been checked.
-.
-. I know that the .result file of this check needs to
-. updated with each new version --- THIS IS INTENDED!
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-funcs_1 checked with version: 5.0.36
-Warnings:
-Warning	1466	Leading spaces are removed from name ' '
diff --git a/mysql-test/suite/funcs_1/r/innodb__datadict.result b/mysql-test/suite/funcs_1/r/innodb__datadict.result
index f1bf8e6e25b..675f30da14a 100644
--- a/mysql-test/suite/funcs_1/r/innodb__datadict.result
+++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result
@@ -418,13 +418,11 @@ LENGTH( SUBSTRING( u,
 LENGTH( SUBSTRING_INDEX(u, _utf8'@',1)) +3 )) - 1 )
 AS Server_Clean
 FROM db_datadict.vu1;
-SELECT * FROM db_datadict.vu;
+SELECT * FROM db_datadict.vu order by u;
 u	server	Server_Clean
-'root'@'localhost'	localhost'	localhost
 'root'@'127.0.0.1'	127.0.0.1'	127.0.0.1
-''@'localhost'	localhost'	localhost
 'root'@'<SERVER_NAME>'	<SERVER_NAME>'	<SERVER_NAME>
-''@'<SERVER_NAME>'	<SERVER_NAME>'	<SERVER_NAME>
+'root'@'localhost'	localhost'	localhost
 CREATE PROCEDURE db_datadict.sp_1()
 BEGIN
 SELECT * FROM db_datadict.v1;
@@ -474,7 +472,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -495,7 +493,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -516,7 +514,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -537,7 +535,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -558,7 +556,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -579,7 +577,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -600,7 +598,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -621,7 +619,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -642,7 +640,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -663,7 +661,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -684,7 +682,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -705,7 +703,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -726,7 +724,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -747,7 +745,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -768,7 +766,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -789,7 +787,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -812,7 +810,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -833,7 +831,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -854,7 +852,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -875,7 +873,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -896,7 +894,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -917,7 +915,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -938,7 +936,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -959,7 +957,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -980,7 +978,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1001,7 +999,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1022,7 +1020,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1043,7 +1041,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1064,7 +1062,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1085,7 +1083,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1106,7 +1104,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	6
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1127,7 +1125,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1148,7 +1146,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1169,7 +1167,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1190,7 +1188,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1202,7 +1200,7 @@ TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
 VERSION	10
 ROW_FORMAT	Dynamic
-TABLE_ROWS	5
+TABLE_ROWS	3
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
 MAX_DATA_LENGTH	#MDL#
@@ -1211,7 +1209,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1232,7 +1230,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1253,7 +1251,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1274,7 +1272,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1295,7 +1293,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1316,7 +1314,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1337,7 +1335,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1358,7 +1356,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1379,7 +1377,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1400,7 +1398,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1421,7 +1419,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1442,7 +1440,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1463,7 +1461,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1484,7 +1482,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1505,7 +1503,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1526,7 +1524,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -2100,9 +2098,9 @@ NULL	mysql	proc	language	5	SQL	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('
 NULL	mysql	proc	sql_data_access	6	CONTAINS_SQL	NO	enum	17	51	NULL	NULL	utf8	utf8_general_ci	enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA')			select,insert,update,references	
 NULL	mysql	proc	is_deterministic	7	NO	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references	
 NULL	mysql	proc	security_type	8	DEFINER	NO	enum	7	21	NULL	NULL	utf8	utf8_general_ci	enum('INVOKER','DEFINER')			select,insert,update,references	
-NULL	mysql	proc	param_list	9		NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	proc	param_list	9	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
 NULL	mysql	proc	returns	10		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	proc	body	11		NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	proc	body	11	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	mysql	proc	definer	12		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
 NULL	mysql	proc	created	13	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
 NULL	mysql	proc	modified	14	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
@@ -2565,7 +2563,7 @@ NULL	mysql	columns_priv	0	mysql	PRIMARY	5	Column_name	A	0	NULL	NULL		BTREE
 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	NULL	NULL	NULL		BTREE	
+NULL	mysql	db	1	mysql	User	1	User	A	1	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	
@@ -2599,91 +2597,89 @@ NULL	mysql	time_zone_transition	0	mysql	PRIMARY	2	Transition_time	A	393	NULL	NUL
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	1	Time_zone_id	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	2	Transition_type_id	A	31	NULL	NULL		BTREE	
 NULL	mysql	user	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	user	0	mysql	PRIMARY	2	User	A	5	NULL	NULL		BTREE	
+NULL	mysql	user	0	mysql	PRIMARY	2	User	A	3	NULL	NULL		BTREE	
 select * from views;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
 NULL	db_datadict	v1	/* ALGORITHM=UNDEFINED */ select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `information_schema`.`tables`	NONE	NO	root@localhost	DEFINER
 NULL	db_datadict	vu	/* ALGORITHM=UNDEFINED */ select distinct `vu1`.`u` AS `u`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3)) AS `server`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3),(length(substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3))) - 1)) AS `Server_Clean` from `db_datadict`.`vu1`	NONE	NO	root@localhost	DEFINER
 NULL	db_datadict	vu1	/* ALGORITHM=UNDEFINED */ select `user_privileges`.`GRANTEE` AS `u` from `information_schema`.`user_privileges`	NONE	NO	root@localhost	DEFINER
-select * from user_privileges;
+select * from user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	SELECT	NO
@@ -2853,11 +2849,12 @@ Table or view 'tb2' is associated with the database 'test1'.
 Table or view 't6' is associated with the database 'test4'.
 select grantee as "user's having select privilege",
 substring( grantee, length(SUBSTRING_INDEX(grantee,_utf8'@',1))+2 )
-from user_privileges where privilege_type = 'select';
+from user_privileges where privilege_type = 'select'
+  order by grantee;
 user's having select privilege	substring( grantee, length(SUBSTRING_INDEX(grantee,_utf8'@',1))+2 )
-'root'@'localhost'	'localhost'
 'root'@'127.0.0.1'	'127.0.0.1'
 'root'@'<SERVER_NAME>'	'<SERVER_NAME>'
+'root'@'localhost'	'localhost'
 select all table_schema from schema_privileges limit 0,5;
 table_schema
 test
@@ -3090,7 +3087,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3111,7 +3108,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3132,7 +3129,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3153,7 +3150,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3174,7 +3171,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3195,7 +3192,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3216,7 +3213,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3237,7 +3234,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3258,7 +3255,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3279,7 +3276,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3300,7 +3297,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3321,7 +3318,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3342,7 +3339,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3363,7 +3360,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3384,7 +3381,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3405,7 +3402,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3428,7 +3425,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -3449,7 +3446,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -3470,7 +3467,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -3491,7 +3488,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3512,7 +3509,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3533,7 +3530,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3554,7 +3551,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3575,7 +3572,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3596,7 +3593,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3617,7 +3614,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3638,7 +3635,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3659,7 +3656,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3680,7 +3677,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3701,7 +3698,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3722,7 +3719,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	6
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3743,7 +3740,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3764,7 +3761,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3785,7 +3782,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3806,7 +3803,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3818,7 +3815,7 @@ TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
 VERSION	10
 ROW_FORMAT	Dynamic
-TABLE_ROWS	5
+TABLE_ROWS	3
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
 MAX_DATA_LENGTH	#MDL#
@@ -3827,7 +3824,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3848,7 +3845,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3869,7 +3866,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3890,7 +3887,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3911,7 +3908,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3932,7 +3929,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3953,7 +3950,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3974,7 +3971,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3995,7 +3992,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4016,7 +4013,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4037,7 +4034,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4058,7 +4055,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4079,7 +4076,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4100,7 +4097,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4121,7 +4118,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4142,7 +4139,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4570,7 +4567,7 @@ COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-77
+75
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
 28
@@ -4639,7 +4636,7 @@ TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	columns_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	db	1	mysql	User	1	User	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
 select concat(table_schema, ', ', table_name, ', ', view_definition) view_info
 from views;
 view_info
@@ -4694,13 +4691,11 @@ test, tb3
 test, tb4
 test1, tb2
 test4, t6
-select distinct grantee from user_privileges;
+select distinct grantee from user_privileges order by grantee, privilege_type;
 grantee
-'root'@'localhost'
 'root'@'127.0.0.1'
-''@'localhost'
 'root'@'<SERVER_NAME>'
-''@'<SERVER_NAME>'
+'root'@'localhost'
 select * from schema_privileges where table_catalog is null limit 0, 5;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	SELECT	NO
@@ -4737,37 +4732,10 @@ NULL	test1	latin1	latin1_swedish_ci	NULL
 select distinct grantee from user_privileges;
 grantee
 'root'@'localhost'
-'root'@'127.0.0.1'
-''@'localhost'
 'root'@'<SERVER_NAME>'
-''@'<SERVER_NAME>'
-select all      grantee from user_privileges;
+'root'@'127.0.0.1'
+select all      grantee from user_privileges order by grantee, privilege_type;
 grantee
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
@@ -4793,7 +4761,6 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
-''@'localhost'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -4819,7 +4786,31 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
-''@'<SERVER_NAME>'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
 select id , character_set_name from collations order by id asc limit 10;
 id	character_set_name
 1	big5
@@ -6292,85 +6283,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6439,86 +6428,84 @@ where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 res_t_401013	db_datadict	i_6_401013	BTREE
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-'u_6_401013'@'localhost'	NULL	USAGE	NO
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
+'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6572,85 +6559,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6717,85 +6702,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6858,85 +6841,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -7012,86 +6993,84 @@ where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 res_t_401015	db_datadict	i_6_401015	BTREE
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-'u_6_401015'@'localhost'	NULL	USAGE	NO
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
+'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -7144,85 +7123,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -9135,9 +9112,9 @@ NULL	mysql	proc	language	5	SQL	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('
 NULL	mysql	proc	sql_data_access	6	CONTAINS_SQL	NO	enum	17	51	NULL	NULL	utf8	utf8_general_ci	enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA')			select,insert,update,references	
 NULL	mysql	proc	is_deterministic	7	NO	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references	
 NULL	mysql	proc	security_type	8	DEFINER	NO	enum	7	21	NULL	NULL	utf8	utf8_general_ci	enum('INVOKER','DEFINER')			select,insert,update,references	
-NULL	mysql	proc	param_list	9		NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	proc	param_list	9	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
 NULL	mysql	proc	returns	10		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	proc	body	11		NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	proc	body	11	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	mysql	proc	definer	12		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
 NULL	mysql	proc	created	13	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
 NULL	mysql	proc	modified	14	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
@@ -12028,178 +12005,178 @@ 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb2	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-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	NULL	NULL	NULL	NULL	VIEW
-NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
+NULL	db_datadict	tb1	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb2	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	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	test	t1	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
+NULL	db_datadict	tb1	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	test	t1	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-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	NULL	NULL	NULL	NULL	VIEW
-NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
+NULL	db_datadict	tb3	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	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	test	t1	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
 	
 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb2	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-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	NULL	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	NULL	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	NULL	utf8_bin	NULL		Database privileges
-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	NULL	utf8_bin	NULL		User defined functions
-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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	utf8_bin	NULL		Host privileges;  Merged with database privileges
-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	NULL	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	NULL	utf8_bin	NULL		Procedure privileges
-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	NULL	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	NULL	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	NULL	utf8_general_ci	NULL		Leap seconds information for time zones
-NULL	mysql	time_zone_name	BASE TABLE	MyISAM	10	Fixed	6	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL		Time zone names
-NULL	mysql	time_zone_transition	BASE TABLE	MyISAM	10	Fixed	393	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL		Time zone transitions
-NULL	mysql	time_zone_transition_type	BASE TABLE	MyISAM	10	Fixed	31	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL		Time zone transition types
-NULL	mysql	user	BASE TABLE	MyISAM	10	Dynamic	8	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_bin	NULL		Users and global privileges
-NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test1	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
-NULL	test4	t6	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		InnoDB free: 3072 kB
+NULL	db_datadict	tb1	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb2	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	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	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	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	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	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
+NULL	mysql	time_zone_name	BASE TABLE	MyISAM	10	Fixed	6	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone names
+NULL	mysql	time_zone_transition	BASE TABLE	MyISAM	10	Fixed	393	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone transitions
+NULL	mysql	time_zone_transition_type	BASE TABLE	MyISAM	10	Fixed	31	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone transition types
+NULL	mysql	user	BASE TABLE	MyISAM	10	Dynamic	6	#ARL#	#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		Users and global privileges
+NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test1	tb2	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
+NULL	test4	t6	BASE TABLE	InnoDB	10	Compact	10	#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		InnoDB free: 3072 kB
 DROP USER 'user_1'@'localhost';
 DROP USER 'user_2'@'localhost';
 DROP USER 'user_3'@'localhost';
@@ -12411,7 +12388,7 @@ NULL	mysql	columns_priv	0	mysql	PRIMARY	5	Column_name	A	0	NULL	NULL		BTREE
 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	NULL	NULL	NULL		BTREE	
+NULL	mysql	db	1	mysql	User	1	User	A	1	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	
@@ -12445,7 +12422,7 @@ NULL	mysql	time_zone_transition	0	mysql	PRIMARY	2	Transition_time	A	393	NULL	NUL
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	1	Time_zone_id	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	2	Transition_type_id	A	31	NULL	NULL		BTREE	
 NULL	mysql	user	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	user	0	mysql	PRIMARY	2	User	A	7	NULL	NULL		BTREE	
+NULL	mysql	user	0	mysql	PRIMARY	2	User	A	5	NULL	NULL		BTREE	
 	
 user_1@localhost	test
 SELECT * FROM information_schema.statistics;
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..5fac88b8f14 100644
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -3814,13 +3814,11 @@ 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'
 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`
@@ -3831,13 +3829,11 @@ 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'
 DROP VIEW v1;
 
 
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 bb087d5882e..0f2d54f01ba 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
@@ -484,8 +484,9 @@ 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 'SET @counter1 = @counter1 + 1; 
-END' at line 4
+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
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;
 
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
index fe133f06da7..63d1c8a3131 100644
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -448,7 +448,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
@@ -585,7 +586,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
@@ -605,7 +608,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 ;
@@ -1790,7 +1795,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' ;
@@ -1799,7 +1806,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
@@ -1816,7 +1825,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 ;
@@ -1828,7 +1839,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);
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.warnings b/mysql-test/suite/funcs_1/r/innodb_views.warnings
deleted file mode 100644
index 2c9dc825a5d..00000000000
--- a/mysql-test/suite/funcs_1/r/innodb_views.warnings
+++ /dev/null
@@ -1,2 +0,0 @@
-mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3039: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
-mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3050: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
diff --git a/mysql-test/suite/funcs_1/r/memory__datadict.result b/mysql-test/suite/funcs_1/r/memory__datadict.result
index deb6550802d..1dea8a5f4a9 100644
--- a/mysql-test/suite/funcs_1/r/memory__datadict.result
+++ b/mysql-test/suite/funcs_1/r/memory__datadict.result
@@ -416,13 +416,11 @@ LENGTH( SUBSTRING( u,
 LENGTH( SUBSTRING_INDEX(u, _utf8'@',1)) +3 )) - 1 )
 AS Server_Clean
 FROM db_datadict.vu1;
-SELECT * FROM db_datadict.vu;
+SELECT * FROM db_datadict.vu order by u;
 u	server	Server_Clean
-'root'@'localhost'	localhost'	localhost
 'root'@'127.0.0.1'	127.0.0.1'	127.0.0.1
-''@'localhost'	localhost'	localhost
 'root'@'<SERVER_NAME>'	<SERVER_NAME>'	<SERVER_NAME>
-''@'<SERVER_NAME>'	<SERVER_NAME>'	<SERVER_NAME>
+'root'@'localhost'	localhost'	localhost
 CREATE PROCEDURE db_datadict.sp_1()
 BEGIN
 SELECT * FROM db_datadict.v1;
@@ -472,7 +470,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -493,7 +491,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -514,7 +512,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -535,7 +533,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -556,7 +554,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -577,7 +575,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -598,7 +596,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -619,7 +617,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -640,7 +638,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -661,7 +659,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -682,7 +680,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -703,7 +701,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -724,7 +722,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -745,7 +743,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -766,7 +764,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -787,7 +785,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -810,7 +808,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -831,7 +829,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -852,7 +850,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -873,7 +871,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -894,7 +892,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -915,7 +913,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -936,7 +934,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -957,7 +955,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -978,7 +976,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -999,7 +997,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1020,7 +1018,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1041,7 +1039,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1062,7 +1060,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1083,7 +1081,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1104,7 +1102,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	6
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1125,7 +1123,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1146,7 +1144,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1167,7 +1165,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1188,7 +1186,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1200,7 +1198,7 @@ TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
 VERSION	10
 ROW_FORMAT	Dynamic
-TABLE_ROWS	5
+TABLE_ROWS	3
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
 MAX_DATA_LENGTH	#MDL#
@@ -1209,7 +1207,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1230,7 +1228,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1251,7 +1249,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1272,7 +1270,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1293,7 +1291,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1314,7 +1312,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1335,7 +1333,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1356,7 +1354,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1377,7 +1375,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1398,7 +1396,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1419,7 +1417,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1440,7 +1438,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1461,7 +1459,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1482,7 +1480,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1503,7 +1501,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1524,7 +1522,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -2098,9 +2096,9 @@ NULL	mysql	proc	language	5	SQL	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('
 NULL	mysql	proc	sql_data_access	6	CONTAINS_SQL	NO	enum	17	51	NULL	NULL	utf8	utf8_general_ci	enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA')			select,insert,update,references	
 NULL	mysql	proc	is_deterministic	7	NO	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references	
 NULL	mysql	proc	security_type	8	DEFINER	NO	enum	7	21	NULL	NULL	utf8	utf8_general_ci	enum('INVOKER','DEFINER')			select,insert,update,references	
-NULL	mysql	proc	param_list	9		NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	proc	param_list	9	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
 NULL	mysql	proc	returns	10		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	proc	body	11		NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	proc	body	11	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	mysql	proc	definer	12		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
 NULL	mysql	proc	created	13	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
 NULL	mysql	proc	modified	14	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
@@ -2548,7 +2546,7 @@ NULL	mysql	columns_priv	0	mysql	PRIMARY	5	Column_name	A	0	NULL	NULL		BTREE
 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	NULL	NULL	NULL		BTREE	
+NULL	mysql	db	1	mysql	User	1	User	A	1	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	
@@ -2582,91 +2580,89 @@ NULL	mysql	time_zone_transition	0	mysql	PRIMARY	2	Transition_time	A	393	NULL	NUL
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	1	Time_zone_id	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	2	Transition_type_id	A	31	NULL	NULL		BTREE	
 NULL	mysql	user	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	user	0	mysql	PRIMARY	2	User	A	5	NULL	NULL		BTREE	
+NULL	mysql	user	0	mysql	PRIMARY	2	User	A	3	NULL	NULL		BTREE	
 select * from views;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
 NULL	db_datadict	v1	/* ALGORITHM=UNDEFINED */ select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `information_schema`.`tables`	NONE	NO	root@localhost	DEFINER
 NULL	db_datadict	vu	/* ALGORITHM=UNDEFINED */ select distinct `vu1`.`u` AS `u`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3)) AS `server`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3),(length(substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3))) - 1)) AS `Server_Clean` from `db_datadict`.`vu1`	NONE	NO	root@localhost	DEFINER
 NULL	db_datadict	vu1	/* ALGORITHM=UNDEFINED */ select `user_privileges`.`GRANTEE` AS `u` from `information_schema`.`user_privileges`	NONE	NO	root@localhost	DEFINER
-select * from user_privileges;
+select * from user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	SELECT	NO
@@ -2836,11 +2832,12 @@ Table or view 'tb2' is associated with the database 'test1'.
 Table or view 't6' is associated with the database 'test4'.
 select grantee as "user's having select privilege",
 substring( grantee, length(SUBSTRING_INDEX(grantee,_utf8'@',1))+2 )
-from user_privileges where privilege_type = 'select';
+from user_privileges where privilege_type = 'select'
+  order by grantee;
 user's having select privilege	substring( grantee, length(SUBSTRING_INDEX(grantee,_utf8'@',1))+2 )
-'root'@'localhost'	'localhost'
 'root'@'127.0.0.1'	'127.0.0.1'
 'root'@'<SERVER_NAME>'	'<SERVER_NAME>'
+'root'@'localhost'	'localhost'
 select all table_schema from schema_privileges limit 0,5;
 table_schema
 test
@@ -3073,7 +3070,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3094,7 +3091,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3115,7 +3112,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3136,7 +3133,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3157,7 +3154,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3178,7 +3175,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3199,7 +3196,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3220,7 +3217,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3241,7 +3238,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3262,7 +3259,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3283,7 +3280,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3304,7 +3301,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3325,7 +3322,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3346,7 +3343,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3367,7 +3364,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3388,7 +3385,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3411,7 +3408,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -3432,7 +3429,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -3453,7 +3450,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -3474,7 +3471,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3495,7 +3492,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3516,7 +3513,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3537,7 +3534,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3558,7 +3555,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3579,7 +3576,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3600,7 +3597,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3621,7 +3618,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3642,7 +3639,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3663,7 +3660,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3684,7 +3681,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3705,7 +3702,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	6
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3726,7 +3723,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3747,7 +3744,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3768,7 +3765,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3789,7 +3786,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3801,7 +3798,7 @@ TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
 VERSION	10
 ROW_FORMAT	Dynamic
-TABLE_ROWS	5
+TABLE_ROWS	3
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
 MAX_DATA_LENGTH	#MDL#
@@ -3810,7 +3807,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3831,7 +3828,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3852,7 +3849,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3873,7 +3870,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3894,7 +3891,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3915,7 +3912,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3936,7 +3933,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3957,7 +3954,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3978,7 +3975,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3999,7 +3996,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4020,7 +4017,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4041,7 +4038,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4062,7 +4059,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4083,7 +4080,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4104,7 +4101,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4125,7 +4122,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4553,7 +4550,7 @@ COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-77
+75
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
 28
@@ -4622,7 +4619,7 @@ TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	columns_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	db	1	mysql	User	1	User	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
 select concat(table_schema, ', ', table_name, ', ', view_definition) view_info
 from views;
 view_info
@@ -4677,13 +4674,11 @@ test, tb3
 test, tb4
 test1, tb2
 test4, t6
-select distinct grantee from user_privileges;
+select distinct grantee from user_privileges order by grantee, privilege_type;
 grantee
-'root'@'localhost'
 'root'@'127.0.0.1'
-''@'localhost'
 'root'@'<SERVER_NAME>'
-''@'<SERVER_NAME>'
+'root'@'localhost'
 select * from schema_privileges where table_catalog is null limit 0, 5;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	SELECT	NO
@@ -4720,37 +4715,10 @@ NULL	test1	latin1	latin1_swedish_ci	NULL
 select distinct grantee from user_privileges;
 grantee
 'root'@'localhost'
-'root'@'127.0.0.1'
-''@'localhost'
 'root'@'<SERVER_NAME>'
-''@'<SERVER_NAME>'
-select all      grantee from user_privileges;
+'root'@'127.0.0.1'
+select all      grantee from user_privileges order by grantee, privilege_type;
 grantee
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
@@ -4776,7 +4744,6 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
-''@'localhost'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -4802,7 +4769,31 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
-''@'<SERVER_NAME>'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
 select id , character_set_name from collations order by id asc limit 10;
 id	character_set_name
 1	big5
@@ -6275,85 +6266,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6422,86 +6411,84 @@ where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 res_t_401013	db_datadict	i_6_401013	HASH
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-'u_6_401013'@'localhost'	NULL	USAGE	NO
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
+'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6555,85 +6542,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6700,85 +6685,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6841,85 +6824,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6995,86 +6976,84 @@ where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 res_t_401015	db_datadict	i_6_401015	BTREE
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-'u_6_401015'@'localhost'	NULL	USAGE	NO
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
+'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -7127,85 +7106,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -9103,9 +9080,9 @@ NULL	mysql	proc	language	5	SQL	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('
 NULL	mysql	proc	sql_data_access	6	CONTAINS_SQL	NO	enum	17	51	NULL	NULL	utf8	utf8_general_ci	enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA')			select,insert,update,references	
 NULL	mysql	proc	is_deterministic	7	NO	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references	
 NULL	mysql	proc	security_type	8	DEFINER	NO	enum	7	21	NULL	NULL	utf8	utf8_general_ci	enum('INVOKER','DEFINER')			select,insert,update,references	
-NULL	mysql	proc	param_list	9		NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	proc	param_list	9	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
 NULL	mysql	proc	returns	10		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	proc	body	11		NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	proc	body	11	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	mysql	proc	definer	12		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
 NULL	mysql	proc	created	13	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
 NULL	mysql	proc	modified	14	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
@@ -11926,178 +11903,178 @@ 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb2	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-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	NULL	NULL	NULL	NULL	VIEW
-NULL	test	t1	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb1	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb2	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	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	test	t1	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t10	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t11	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t2	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t3	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t4	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t7	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t8	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t9	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb1	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb2	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb3	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb4	BASE TABLE	MEMORY	10	Fixed	10	#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		
 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t1	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb1	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	test	t1	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t10	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t11	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t2	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t3	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t4	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t7	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t8	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t9	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb1	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb2	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb3	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb4	BASE TABLE	MEMORY	10	Fixed	10	#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		
 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-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	NULL	NULL	NULL	NULL	VIEW
-NULL	test	t1	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	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	test	t1	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t10	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t11	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t2	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t3	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t4	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t7	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t8	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t9	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb1	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb2	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb3	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb4	BASE TABLE	MEMORY	10	Fixed	10	#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		
 	
 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb2	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-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	NULL	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	NULL	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	NULL	utf8_bin	NULL		Database privileges
-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	NULL	utf8_bin	NULL		User defined functions
-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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	utf8_bin	NULL		Host privileges;  Merged with database privileges
-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	NULL	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	NULL	utf8_bin	NULL		Procedure privileges
-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	NULL	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	NULL	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	NULL	utf8_general_ci	NULL		Leap seconds information for time zones
-NULL	mysql	time_zone_name	BASE TABLE	MyISAM	10	Fixed	6	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL		Time zone names
-NULL	mysql	time_zone_transition	BASE TABLE	MyISAM	10	Fixed	393	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL		Time zone transitions
-NULL	mysql	time_zone_transition_type	BASE TABLE	MyISAM	10	Fixed	31	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL		Time zone transition types
-NULL	mysql	user	BASE TABLE	MyISAM	10	Dynamic	8	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_bin	NULL		Users and global privileges
-NULL	test	t1	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test1	tb2	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test4	t6	BASE TABLE	MEMORY	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb1	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb2	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	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	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	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	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	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
+NULL	mysql	time_zone_name	BASE TABLE	MyISAM	10	Fixed	6	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone names
+NULL	mysql	time_zone_transition	BASE TABLE	MyISAM	10	Fixed	393	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone transitions
+NULL	mysql	time_zone_transition_type	BASE TABLE	MyISAM	10	Fixed	31	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone transition types
+NULL	mysql	user	BASE TABLE	MyISAM	10	Dynamic	6	#ARL#	#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		Users and global privileges
+NULL	test	t1	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t10	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t11	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t2	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t3	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t4	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t7	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t8	BASE TABLE	MEMORY	10	Fixed	10	#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	test	t9	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb1	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb2	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb3	BASE TABLE	MEMORY	10	Fixed	10	#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	test	tb4	BASE TABLE	MEMORY	10	Fixed	10	#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	test1	tb2	BASE TABLE	MEMORY	10	Fixed	10	#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	test4	t6	BASE TABLE	MEMORY	10	Fixed	10	#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		
 DROP USER 'user_1'@'localhost';
 DROP USER 'user_2'@'localhost';
 DROP USER 'user_3'@'localhost';
@@ -12309,7 +12286,7 @@ NULL	mysql	columns_priv	0	mysql	PRIMARY	5	Column_name	A	0	NULL	NULL		BTREE
 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	NULL	NULL	NULL		BTREE	
+NULL	mysql	db	1	mysql	User	1	User	A	1	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	
@@ -12343,7 +12320,7 @@ NULL	mysql	time_zone_transition	0	mysql	PRIMARY	2	Transition_time	A	393	NULL	NUL
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	1	Time_zone_id	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	2	Transition_type_id	A	31	NULL	NULL		BTREE	
 NULL	mysql	user	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	user	0	mysql	PRIMARY	2	User	A	7	NULL	NULL		BTREE	
+NULL	mysql	user	0	mysql	PRIMARY	2	User	A	5	NULL	NULL		BTREE	
 	
 user_1@localhost	test
 SELECT * FROM information_schema.statistics;
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..08e49d1bf6f 100644
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -3814,13 +3814,11 @@ 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'
 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`
@@ -3831,13 +3829,11 @@ 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'
 DROP VIEW v1;
 
 
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 a842bbc3ac7..9a14845d0eb 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result
@@ -480,8 +480,9 @@ 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 'SET @counter1 = @counter1 + 1; 
-END' at line 4
+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
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;
 
diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
index dac9e877e48..516eef24439 100644
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -452,7 +452,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
@@ -589,7 +590,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
@@ -609,7 +612,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 ;
@@ -1794,7 +1799,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' ;
@@ -1803,7 +1810,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
@@ -1820,7 +1829,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 ;
@@ -1832,7 +1843,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);
diff --git a/mysql-test/suite/funcs_1/r/memory_views.warnings b/mysql-test/suite/funcs_1/r/memory_views.warnings
deleted file mode 100644
index 2c9dc825a5d..00000000000
--- a/mysql-test/suite/funcs_1/r/memory_views.warnings
+++ /dev/null
@@ -1,2 +0,0 @@
-mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3039: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
-mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3050: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
diff --git a/mysql-test/suite/funcs_1/r/myisam__datadict.result b/mysql-test/suite/funcs_1/r/myisam__datadict.result
index 484b7a7f5e9..e9082e7aee7 100644
--- a/mysql-test/suite/funcs_1/r/myisam__datadict.result
+++ b/mysql-test/suite/funcs_1/r/myisam__datadict.result
@@ -446,13 +446,11 @@ LENGTH( SUBSTRING( u,
 LENGTH( SUBSTRING_INDEX(u, _utf8'@',1)) +3 )) - 1 )
 AS Server_Clean
 FROM db_datadict.vu1;
-SELECT * FROM db_datadict.vu;
+SELECT * FROM db_datadict.vu order by u;
 u	server	Server_Clean
-'root'@'localhost'	localhost'	localhost
 'root'@'127.0.0.1'	127.0.0.1'	127.0.0.1
-''@'localhost'	localhost'	localhost
 'root'@'<SERVER_NAME>'	<SERVER_NAME>'	<SERVER_NAME>
-''@'<SERVER_NAME>'	<SERVER_NAME>'	<SERVER_NAME>
+'root'@'localhost'	localhost'	localhost
 CREATE PROCEDURE db_datadict.sp_1()
 BEGIN
 SELECT * FROM db_datadict.v1;
@@ -502,7 +500,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -523,7 +521,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -544,7 +542,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -565,7 +563,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -586,7 +584,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -607,7 +605,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -628,7 +626,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -649,7 +647,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -670,7 +668,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -691,7 +689,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -712,7 +710,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -733,7 +731,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -754,7 +752,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -775,7 +773,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -796,7 +794,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -817,7 +815,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -840,7 +838,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -861,7 +859,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -882,7 +880,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -903,7 +901,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -924,7 +922,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -945,7 +943,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -966,7 +964,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -987,7 +985,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1008,7 +1006,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1029,7 +1027,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1050,7 +1048,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1071,7 +1069,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1092,7 +1090,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1113,7 +1111,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1134,7 +1132,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	6
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1155,7 +1153,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1176,7 +1174,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1197,7 +1195,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1218,7 +1216,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1230,7 +1228,7 @@ TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
 VERSION	10
 ROW_FORMAT	Dynamic
-TABLE_ROWS	5
+TABLE_ROWS	3
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
 MAX_DATA_LENGTH	#MDL#
@@ -1239,7 +1237,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1260,7 +1258,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1281,7 +1279,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1302,7 +1300,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1323,7 +1321,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1344,7 +1342,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1365,7 +1363,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1386,7 +1384,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1407,7 +1405,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1428,7 +1426,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1449,7 +1447,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1470,7 +1468,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1491,7 +1489,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1512,7 +1510,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1533,7 +1531,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -1554,7 +1552,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -2128,9 +2126,9 @@ NULL	mysql	proc	language	5	SQL	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('
 NULL	mysql	proc	sql_data_access	6	CONTAINS_SQL	NO	enum	17	51	NULL	NULL	utf8	utf8_general_ci	enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA')			select,insert,update,references	
 NULL	mysql	proc	is_deterministic	7	NO	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references	
 NULL	mysql	proc	security_type	8	DEFINER	NO	enum	7	21	NULL	NULL	utf8	utf8_general_ci	enum('INVOKER','DEFINER')			select,insert,update,references	
-NULL	mysql	proc	param_list	9		NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	proc	param_list	9	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
 NULL	mysql	proc	returns	10		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	proc	body	11		NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	proc	body	11	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	mysql	proc	definer	12		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
 NULL	mysql	proc	created	13	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
 NULL	mysql	proc	modified	14	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
@@ -2618,7 +2616,7 @@ NULL	mysql	columns_priv	0	mysql	PRIMARY	5	Column_name	A	0	NULL	NULL		BTREE
 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	NULL	NULL	NULL		BTREE	
+NULL	mysql	db	1	mysql	User	1	User	A	1	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	
@@ -2652,91 +2650,89 @@ NULL	mysql	time_zone_transition	0	mysql	PRIMARY	2	Transition_time	A	393	NULL	NUL
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	1	Time_zone_id	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	2	Transition_type_id	A	31	NULL	NULL		BTREE	
 NULL	mysql	user	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	user	0	mysql	PRIMARY	2	User	A	5	NULL	NULL		BTREE	
+NULL	mysql	user	0	mysql	PRIMARY	2	User	A	3	NULL	NULL		BTREE	
 select * from views;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
 NULL	db_datadict	v1	/* ALGORITHM=UNDEFINED */ select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `information_schema`.`tables`	NONE	NO	root@localhost	DEFINER
 NULL	db_datadict	vu	/* ALGORITHM=UNDEFINED */ select distinct `vu1`.`u` AS `u`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3)) AS `server`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3),(length(substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3))) - 1)) AS `Server_Clean` from `db_datadict`.`vu1`	NONE	NO	root@localhost	DEFINER
 NULL	db_datadict	vu1	/* ALGORITHM=UNDEFINED */ select `user_privileges`.`GRANTEE` AS `u` from `information_schema`.`user_privileges`	NONE	NO	root@localhost	DEFINER
-select * from user_privileges;
+select * from user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	SELECT	NO
@@ -2906,11 +2902,12 @@ Table or view 'tb2' is associated with the database 'test1'.
 Table or view 't6' is associated with the database 'test4'.
 select grantee as "user's having select privilege",
 substring( grantee, length(SUBSTRING_INDEX(grantee,_utf8'@',1))+2 )
-from user_privileges where privilege_type = 'select';
+from user_privileges where privilege_type = 'select'
+  order by grantee;
 user's having select privilege	substring( grantee, length(SUBSTRING_INDEX(grantee,_utf8'@',1))+2 )
-'root'@'localhost'	'localhost'
 'root'@'127.0.0.1'	'127.0.0.1'
 'root'@'<SERVER_NAME>'	'<SERVER_NAME>'
+'root'@'localhost'	'localhost'
 select all table_schema from schema_privileges limit 0,5;
 table_schema
 test
@@ -3143,7 +3140,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3164,7 +3161,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3185,7 +3182,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3206,7 +3203,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3227,7 +3224,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3248,7 +3245,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3269,7 +3266,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3290,7 +3287,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3311,7 +3308,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3332,7 +3329,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3353,7 +3350,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3374,7 +3371,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3395,7 +3392,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3416,7 +3413,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3437,7 +3434,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3458,7 +3455,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
@@ -3481,7 +3478,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -3502,7 +3499,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -3523,7 +3520,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
 CREATE_OPTIONS	NULL
@@ -3544,7 +3541,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3565,7 +3562,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3586,7 +3583,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3607,7 +3604,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3628,7 +3625,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3649,7 +3646,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3670,7 +3667,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3691,7 +3688,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3712,7 +3709,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3733,7 +3730,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3754,7 +3751,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3775,7 +3772,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	6
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3796,7 +3793,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3817,7 +3814,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3838,7 +3835,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3859,7 +3856,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3871,7 +3868,7 @@ TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
 VERSION	10
 ROW_FORMAT	Dynamic
-TABLE_ROWS	5
+TABLE_ROWS	3
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
 MAX_DATA_LENGTH	#MDL#
@@ -3880,7 +3877,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3901,7 +3898,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3922,7 +3919,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3943,7 +3940,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3964,7 +3961,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -3985,7 +3982,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4006,7 +4003,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4027,7 +4024,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4048,7 +4045,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4069,7 +4066,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4090,7 +4087,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4111,7 +4108,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4132,7 +4129,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4153,7 +4150,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4174,7 +4171,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4195,7 +4192,7 @@ DATA_FREE	#DF#
 AUTO_INCREMENT	NULL
 CREATE_TIME	YYYY-MM-DD hh:mm:ss
 UPDATE_TIME	YYYY-MM-DD hh:mm:ss
-CHECK_TIME	NULL
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	
@@ -4623,7 +4620,7 @@ COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-77
+75
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
 28
@@ -4692,7 +4689,7 @@ TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	columns_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	db	1	mysql	User	1	User	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
 select concat(table_schema, ', ', table_name, ', ', view_definition) view_info
 from views;
 view_info
@@ -4747,13 +4744,11 @@ test, tb3
 test, tb4
 test1, tb2
 test4, t6
-select distinct grantee from user_privileges;
+select distinct grantee from user_privileges order by grantee, privilege_type;
 grantee
-'root'@'localhost'
 'root'@'127.0.0.1'
-''@'localhost'
 'root'@'<SERVER_NAME>'
-''@'<SERVER_NAME>'
+'root'@'localhost'
 select * from schema_privileges where table_catalog is null limit 0, 5;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	SELECT	NO
@@ -4790,37 +4785,10 @@ NULL	test1	latin1	latin1_swedish_ci	NULL
 select distinct grantee from user_privileges;
 grantee
 'root'@'localhost'
-'root'@'127.0.0.1'
-''@'localhost'
 'root'@'<SERVER_NAME>'
-''@'<SERVER_NAME>'
-select all      grantee from user_privileges;
+'root'@'127.0.0.1'
+select all      grantee from user_privileges order by grantee, privilege_type;
 grantee
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
-'root'@'localhost'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
@@ -4846,7 +4814,6 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
-''@'localhost'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -4872,7 +4839,31 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
-''@'<SERVER_NAME>'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
+'root'@'localhost'
 select id , character_set_name from collations order by id asc limit 10;
 id	character_set_name
 1	big5
@@ -6345,85 +6336,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6492,86 +6481,84 @@ where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 res_t_401013	db_datadict	i_6_401013	BTREE
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-'u_6_401013'@'localhost'	NULL	USAGE	NO
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
+'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6625,85 +6612,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6770,85 +6755,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -6911,85 +6894,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -7065,86 +7046,84 @@ where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 res_t_401015	db_datadict	i_6_401015	BTREE
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-'u_6_401015'@'localhost'	NULL	USAGE	NO
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
+'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -7197,85 +7176,83 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
-'root'@'localhost'	NULL	SELECT	YES
-'root'@'localhost'	NULL	INSERT	YES
-'root'@'localhost'	NULL	UPDATE	YES
-'root'@'localhost'	NULL	DELETE	YES
-'root'@'localhost'	NULL	CREATE	YES
-'root'@'localhost'	NULL	DROP	YES
-'root'@'localhost'	NULL	RELOAD	YES
-'root'@'localhost'	NULL	SHUTDOWN	YES
-'root'@'localhost'	NULL	PROCESS	YES
-'root'@'localhost'	NULL	FILE	YES
-'root'@'localhost'	NULL	REFERENCES	YES
-'root'@'localhost'	NULL	INDEX	YES
-'root'@'localhost'	NULL	ALTER	YES
-'root'@'localhost'	NULL	SHOW DATABASES	YES
-'root'@'localhost'	NULL	SUPER	YES
-'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'localhost'	NULL	LOCK TABLES	YES
-'root'@'localhost'	NULL	EXECUTE	YES
-'root'@'localhost'	NULL	REPLICATION SLAVE	YES
-'root'@'localhost'	NULL	REPLICATION CLIENT	YES
-'root'@'localhost'	NULL	CREATE VIEW	YES
-'root'@'localhost'	NULL	SHOW VIEW	YES
-'root'@'localhost'	NULL	CREATE ROUTINE	YES
-'root'@'localhost'	NULL	ALTER ROUTINE	YES
-'root'@'localhost'	NULL	CREATE USER	YES
-'root'@'127.0.0.1'	NULL	SELECT	YES
-'root'@'127.0.0.1'	NULL	INSERT	YES
-'root'@'127.0.0.1'	NULL	UPDATE	YES
-'root'@'127.0.0.1'	NULL	DELETE	YES
-'root'@'127.0.0.1'	NULL	CREATE	YES
-'root'@'127.0.0.1'	NULL	DROP	YES
-'root'@'127.0.0.1'	NULL	RELOAD	YES
-'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
-'root'@'127.0.0.1'	NULL	PROCESS	YES
-'root'@'127.0.0.1'	NULL	FILE	YES
-'root'@'127.0.0.1'	NULL	REFERENCES	YES
-'root'@'127.0.0.1'	NULL	INDEX	YES
 'root'@'127.0.0.1'	NULL	ALTER	YES
-'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
-'root'@'127.0.0.1'	NULL	SUPER	YES
-'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
-'root'@'127.0.0.1'	NULL	EXECUTE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
-'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
-'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
-'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
-'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE	YES
+'root'@'127.0.0.1'	NULL	CREATE ROUTINE	YES
+'root'@'127.0.0.1'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'127.0.0.1'	NULL	CREATE USER	YES
-''@'localhost'	NULL	USAGE	NO
-'root'@'<SERVER_NAME>'	NULL	SELECT	YES
-'root'@'<SERVER_NAME>'	NULL	INSERT	YES
-'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
-'root'@'<SERVER_NAME>'	NULL	DELETE	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE	YES
-'root'@'<SERVER_NAME>'	NULL	DROP	YES
-'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
-'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
-'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
-'root'@'<SERVER_NAME>'	NULL	FILE	YES
-'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
-'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'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	EXECUTE	YES
+'root'@'127.0.0.1'	NULL	FILE	YES
+'root'@'127.0.0.1'	NULL	INDEX	YES
+'root'@'127.0.0.1'	NULL	INSERT	YES
+'root'@'127.0.0.1'	NULL	LOCK TABLES	YES
+'root'@'127.0.0.1'	NULL	PROCESS	YES
+'root'@'127.0.0.1'	NULL	REFERENCES	YES
+'root'@'127.0.0.1'	NULL	RELOAD	YES
+'root'@'127.0.0.1'	NULL	REPLICATION CLIENT	YES
+'root'@'127.0.0.1'	NULL	REPLICATION SLAVE	YES
+'root'@'127.0.0.1'	NULL	SELECT	YES
+'root'@'127.0.0.1'	NULL	SHOW DATABASES	YES
+'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	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
-'root'@'<SERVER_NAME>'	NULL	SUPER	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
-'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
-'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
-'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE ROUTINE	YES
+'root'@'<SERVER_NAME>'	NULL	CREATE TEMPORARY TABLES	YES
 'root'@'<SERVER_NAME>'	NULL	CREATE USER	YES
-''@'<SERVER_NAME>'	NULL	USAGE	NO
+'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	DELETE	YES
+'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
+'root'@'<SERVER_NAME>'	NULL	FILE	YES
+'root'@'<SERVER_NAME>'	NULL	INDEX	YES
+'root'@'<SERVER_NAME>'	NULL	INSERT	YES
+'root'@'<SERVER_NAME>'	NULL	LOCK TABLES	YES
+'root'@'<SERVER_NAME>'	NULL	PROCESS	YES
+'root'@'<SERVER_NAME>'	NULL	REFERENCES	YES
+'root'@'<SERVER_NAME>'	NULL	RELOAD	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION CLIENT	YES
+'root'@'<SERVER_NAME>'	NULL	REPLICATION SLAVE	YES
+'root'@'<SERVER_NAME>'	NULL	SELECT	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW DATABASES	YES
+'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
+'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
+'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
+'root'@'localhost'	NULL	ALTER	YES
+'root'@'localhost'	NULL	ALTER ROUTINE	YES
+'root'@'localhost'	NULL	CREATE	YES
+'root'@'localhost'	NULL	CREATE ROUTINE	YES
+'root'@'localhost'	NULL	CREATE TEMPORARY TABLES	YES
+'root'@'localhost'	NULL	CREATE USER	YES
+'root'@'localhost'	NULL	CREATE VIEW	YES
+'root'@'localhost'	NULL	DELETE	YES
+'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EXECUTE	YES
+'root'@'localhost'	NULL	FILE	YES
+'root'@'localhost'	NULL	INDEX	YES
+'root'@'localhost'	NULL	INSERT	YES
+'root'@'localhost'	NULL	LOCK TABLES	YES
+'root'@'localhost'	NULL	PROCESS	YES
+'root'@'localhost'	NULL	REFERENCES	YES
+'root'@'localhost'	NULL	RELOAD	YES
+'root'@'localhost'	NULL	REPLICATION CLIENT	YES
+'root'@'localhost'	NULL	REPLICATION SLAVE	YES
+'root'@'localhost'	NULL	SELECT	YES
+'root'@'localhost'	NULL	SHOW DATABASES	YES
+'root'@'localhost'	NULL	SHOW VIEW	YES
+'root'@'localhost'	NULL	SHUTDOWN	YES
+'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
 where table_schema like 'db_datadict%';
@@ -9205,9 +9182,9 @@ NULL	mysql	proc	language	5	SQL	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('
 NULL	mysql	proc	sql_data_access	6	CONTAINS_SQL	NO	enum	17	51	NULL	NULL	utf8	utf8_general_ci	enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA')			select,insert,update,references	
 NULL	mysql	proc	is_deterministic	7	NO	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references	
 NULL	mysql	proc	security_type	8	DEFINER	NO	enum	7	21	NULL	NULL	utf8	utf8_general_ci	enum('INVOKER','DEFINER')			select,insert,update,references	
-NULL	mysql	proc	param_list	9		NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	proc	param_list	9	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
 NULL	mysql	proc	returns	10		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
-NULL	mysql	proc	body	11		NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	proc	body	11	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	mysql	proc	definer	12		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
 NULL	mysql	proc	created	13	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
 NULL	mysql	proc	modified	14	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
@@ -12180,178 +12157,178 @@ 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb2	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-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	NULL	NULL	NULL	NULL	VIEW
-NULL	test	t1	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb1	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb2	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	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	test	t1	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t10	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t11	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t2	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t3	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t4	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t7	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t8	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t9	BASE TABLE	MyISAM	10	Fixed	10	#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	test	tb1	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb2	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb3	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb4	BASE TABLE	MyISAM	10	Dynamic	10	#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		
 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t1	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb1	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	test	t1	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t10	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t11	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t2	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t3	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t4	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t7	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t8	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t9	BASE TABLE	MyISAM	10	Fixed	10	#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	test	tb1	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb2	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb3	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb4	BASE TABLE	MyISAM	10	Dynamic	10	#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		
 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-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	NULL	NULL	NULL	NULL	VIEW
-NULL	test	t1	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	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	test	t1	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t10	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t11	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t2	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t3	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t4	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t7	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t8	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t9	BASE TABLE	MyISAM	10	Fixed	10	#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	test	tb1	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb2	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb3	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb4	BASE TABLE	MyISAM	10	Dynamic	10	#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		
 	
 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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	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	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	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
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb2	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-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	NULL	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	NULL	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	NULL	utf8_bin	NULL		Database privileges
-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	NULL	utf8_bin	NULL		User defined functions
-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	NULL	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	NULL	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	NULL	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	NULL	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	NULL	utf8_bin	NULL		Host privileges;  Merged with database privileges
-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	NULL	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	NULL	utf8_bin	NULL		Procedure privileges
-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	NULL	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	NULL	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	NULL	utf8_general_ci	NULL		Leap seconds information for time zones
-NULL	mysql	time_zone_name	BASE TABLE	MyISAM	10	Fixed	6	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL		Time zone names
-NULL	mysql	time_zone_transition	BASE TABLE	MyISAM	10	Fixed	393	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL		Time zone transitions
-NULL	mysql	time_zone_transition_type	BASE TABLE	MyISAM	10	Fixed	31	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL		Time zone transition types
-NULL	mysql	user	BASE TABLE	MyISAM	10	Dynamic	8	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_bin	NULL		Users and global privileges
-NULL	test	t1	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test1	tb2	BASE TABLE	MyISAM	10	Dynamic	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
-NULL	test4	t6	BASE TABLE	MyISAM	10	Fixed	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb1	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb2	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	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	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	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	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	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	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	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
+NULL	mysql	time_zone_name	BASE TABLE	MyISAM	10	Fixed	6	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone names
+NULL	mysql	time_zone_transition	BASE TABLE	MyISAM	10	Fixed	393	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone transitions
+NULL	mysql	time_zone_transition_type	BASE TABLE	MyISAM	10	Fixed	31	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone transition types
+NULL	mysql	user	BASE TABLE	MyISAM	10	Dynamic	6	#ARL#	#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		Users and global privileges
+NULL	test	t1	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t10	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t11	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t2	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t3	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t4	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t7	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t8	BASE TABLE	MyISAM	10	Fixed	10	#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	test	t9	BASE TABLE	MyISAM	10	Fixed	10	#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	test	tb1	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb2	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb3	BASE TABLE	MyISAM	10	Dynamic	10	#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	test	tb4	BASE TABLE	MyISAM	10	Dynamic	10	#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	test1	tb2	BASE TABLE	MyISAM	10	Dynamic	10	#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	test4	t6	BASE TABLE	MyISAM	10	Fixed	10	#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		
 DROP USER 'user_1'@'localhost';
 DROP USER 'user_2'@'localhost';
 DROP USER 'user_3'@'localhost';
@@ -12563,7 +12540,7 @@ NULL	mysql	columns_priv	0	mysql	PRIMARY	5	Column_name	A	0	NULL	NULL		BTREE
 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	NULL	NULL	NULL		BTREE	
+NULL	mysql	db	1	mysql	User	1	User	A	1	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	
@@ -12597,7 +12574,7 @@ NULL	mysql	time_zone_transition	0	mysql	PRIMARY	2	Transition_time	A	393	NULL	NUL
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	1	Time_zone_id	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	time_zone_transition_type	0	mysql	PRIMARY	2	Transition_type_id	A	31	NULL	NULL		BTREE	
 NULL	mysql	user	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
-NULL	mysql	user	0	mysql	PRIMARY	2	User	A	7	NULL	NULL		BTREE	
+NULL	mysql	user	0	mysql	PRIMARY	2	User	A	5	NULL	NULL		BTREE	
 	
 user_1@localhost	test
 SELECT * FROM information_schema.statistics;
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..4f8a1b23bc0 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -3814,13 +3814,11 @@ 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'
 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`
@@ -3831,13 +3829,11 @@ 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'
 DROP VIEW v1;
 
 
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 8a13e91d71d..ec8e12ff32d 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
@@ -484,8 +484,9 @@ 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 'SET @counter1 = @counter1 + 1; 
-END' at line 4
+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
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;
 
diff --git a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result
index 3a76024cf80..1dbebbccb29 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);
diff --git a/mysql-test/suite/funcs_1/r/myisam_views.warnings b/mysql-test/suite/funcs_1/r/myisam_views.warnings
deleted file mode 100644
index 2c9dc825a5d..00000000000
--- a/mysql-test/suite/funcs_1/r/myisam_views.warnings
+++ /dev/null
@@ -1,2 +0,0 @@
-mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3039: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
-mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3050: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
diff --git a/mysql-test/suite/funcs_1/t/a_version_check.test b/mysql-test/suite/funcs_1/t/a_version_check.test
deleted file mode 100755
index 60bd5b3c161..00000000000
--- a/mysql-test/suite/funcs_1/t/a_version_check.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#### suite/funcs_1/t/a_version_check.test
-#
-# just a simple check of the version to be sure the correct server version is
-# checked against the funcs_1 tests.
-
-# just show machine and version to be sure we are testing the correct files
-#
-let $message= . Just show the version string for which the results in suite
-              . funcs_1 have been checked.
-              .
-              . I know that the .result file of this check needs to
-              . updated with each new version --- THIS IS INTENDED!;
---source include/show_msg.inc
-
---disable_query_log
-SELECT CONCAT('funcs_1 checked with version: ', SUBSTR(version(), 1, 6 ) ) AS " ";
-#SELECT CONCAT('aa = ', 'bb');
-#SELECT CONCAT('aa = ', 'bb') AS " ";
-
-if (0)
-{
-   # these more detailed results create differences between the OS.
-   # mioght be used later when we enable OS dependent .result files
-   --vertical_results
-   SELECT @@version_compile_os AS 'vers_comp_os', current_date;
-   SHOW VARIABLES LIKE 'vers%';
-   --horizontal_results
-}
-
diff --git a/mysql-test/suite/funcs_1/t/disabled.def b/mysql-test/suite/funcs_1/t/disabled.def
index e65cc8e934c..6833178a353 100644
--- a/mysql-test/suite/funcs_1/t/disabled.def
+++ b/mysql-test/suite/funcs_1/t/disabled.def
@@ -10,6 +10,6 @@
 #
 ##############################################################################
 
-innodb_storedproc: switched off (too much changed output from WL#2984, needs to be checked)
-memory_storedproc: switched off (too much changed output from WL#2984, needs to be checked)
-myisam_storedproc: switched off (too much changed output from WL#2984, needs to be checked)
+innodb_storedproc: (changes of WL#2984, using storeproc_nn instead)
+memory_storedproc: (changes of WL#2984, using storeproc_nn instead)
+myisam_storedproc: (changes of WL#2984, using storeproc_nn instead)
diff --git a/mysql-test/suite/funcs_1/views/views_master.inc b/mysql-test/suite/funcs_1/views/views_master.inc
index f01b1b01c1f..b06873af159 100644
--- a/mysql-test/suite/funcs_1/views/views_master.inc
+++ b/mysql-test/suite/funcs_1/views/views_master.inc
@@ -3036,7 +3036,9 @@ let $sublevel= `SELECT @max_level`;
 eval CREATE VIEW test1.v$level AS SELECT f1, f2
             FROM test3.t1 tab1 NATURAL JOIN test1.v$sublevel tab2;
 eval SHOW CREATE VIEW test1.v$level;
---eror 1116
+# the following line as written as '--eror 1116' and the command
+# is successful so assuming no expected error was intended
+# --error 1116
 eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
             CAST(f2 AS CHAR) AS f2 FROM test1.v$level;
 let $message= The output of following EXPLAIN is deactivated, because the result
@@ -3047,7 +3049,9 @@ if (1)
 {
 --disable_result_log
 }
---eror 1116
+# the following line as written as '--eror 1116' and the command
+# is successful so assuming no expected error was intended
+# --error 1116
 eval EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
                 CAST(f2 AS CHAR) AS f2 FROM test1.v$level;
 if (1)

From 8e8ece72eb0530bee9b200d92ba14a143cd1dec9 Mon Sep 17 00:00:00 2001
From: unknown <igor@olga.mysql.com>
Date: Tue, 1 May 2007 23:34:14 -0700
Subject: [PATCH 08/58] Fixed bug #28188: performance degradation for outer
 join queries to which 'not exists' optimization is applied.

In fact 'not exists' optimization did not work anymore after the patch
introducing the evaluate_join_record function had been applied.

Corrected the evaluate_join_record function to respect the 'not_exists'
optimization.


mysql-test/r/join_outer.result:
  Added a test case for bug #28188.
mysql-test/t/join_outer.test:
  Added a test case for bug #28188.
sql/sql_select.cc:
  Fixed bug #28188: performance degradation for outer join queries to which
  'not exists' optimization is applied.

  Corrected the evaluate_join_record function to respect the 'not_exists'
  optimization.
---
 mysql-test/r/join_outer.result | 25 +++++++++++++++++++++++++
 mysql-test/t/join_outer.test   | 20 ++++++++++++++++++++
 sql/sql_select.cc              |  5 ++---
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
index df66336bd81..c62601946c2 100644
--- a/mysql-test/r/join_outer.result
+++ b/mysql-test/r/join_outer.result
@@ -1214,3 +1214,28 @@ SELECT * FROM t1 LEFT JOIN t2 USING(f1) WHERE f1='Bla';
 f1	f2	f3
 bla	blah	sheep
 DROP TABLE t1,t2;
+CREATE TABLE t1 (id int PRIMARY KEY, a varchar(8));
+CREATE TABLE t2 (id int NOT NULL, b int NOT NULL, INDEX idx(id));
+INSERT INTO t1 VALUES
+(1,'aaaaaaa'), (5,'eeeeeee'), (4,'ddddddd'), (2,'bbbbbbb'), (3,'ccccccc');
+INSERT INTO t2 VALUES
+(3,10), (2,20), (5,30), (3,20), (5,10), (3,40), (3,30), (2,10), (2,40);
+EXPLAIN
+SELECT t1.id, a FROM t1 LEFT JOIN t2 ON t1.id=t2.id WHERE t2.b IS NULL;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	
+1	SIMPLE	t2	ref	idx	idx	4	test.t1.id	2	Using where; Not exists
+flush status;
+SELECT t1.id, a FROM t1 LEFT JOIN t2 ON t1.id=t2.id WHERE t2.b IS NULL;
+id	a
+1	aaaaaaa
+4	ddddddd
+show status like 'Handler_read%';
+Variable_name	Value
+Handler_read_first	0
+Handler_read_key	5
+Handler_read_next	0
+Handler_read_prev	0
+Handler_read_rnd	0
+Handler_read_rnd_next	6
+DROP TABLE t1,t2;
diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test
index a0620e144c2..51e79a20d65 100644
--- a/mysql-test/t/join_outer.test
+++ b/mysql-test/t/join_outer.test
@@ -825,3 +825,23 @@ SELECT * FROM t1 LEFT JOIN t2 USING(f1) WHERE f1='bla';
 SELECT * FROM t1 LEFT JOIN t2 USING(f1) WHERE f1='Bla';
 
 DROP TABLE t1,t2;
+
+#
+# Bug 28188: 'not exists' optimization for outer joins 
+#
+ 
+CREATE TABLE t1 (id int PRIMARY KEY, a varchar(8));
+CREATE TABLE t2 (id int NOT NULL, b int NOT NULL, INDEX idx(id));
+INSERT INTO t1 VALUES
+  (1,'aaaaaaa'), (5,'eeeeeee'), (4,'ddddddd'), (2,'bbbbbbb'), (3,'ccccccc');
+INSERT INTO t2 VALUES
+  (3,10), (2,20), (5,30), (3,20), (5,10), (3,40), (3,30), (2,10), (2,40);
+
+EXPLAIN
+SELECT t1.id, a FROM t1 LEFT JOIN t2 ON t1.id=t2.id WHERE t2.b IS NULL;
+
+flush status;
+SELECT t1.id, a FROM t1 LEFT JOIN t2 ON t1.id=t2.id WHERE t2.b IS NULL;
+show status like 'Handler_read%';
+
+DROP TABLE t1,t2;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index b7ac2130784..acef5a5ff48 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -10526,7 +10526,6 @@ static enum_nested_loop_state
 evaluate_join_record(JOIN *join, JOIN_TAB *join_tab,
                      int error, my_bool *report_error)
 {
-  bool not_exists_optimize= join_tab->table->reginfo.not_exists_optimize;
   bool not_used_in_distinct=join_tab->not_used_in_distinct;
   ha_rows found_records=join->found_records;
   COND *select_cond= join_tab->select_cond;
@@ -10563,6 +10562,8 @@ evaluate_join_record(JOIN *join, JOIN_TAB *join_tab,
       first_unmatched->found= 1;
       for (JOIN_TAB *tab= first_unmatched; tab <= join_tab; tab++)
       {
+        if (tab->table->reginfo.not_exists_optimize)
+          return NESTED_LOOP_NO_MORE_ROWS;
         /* Check all predicates that has just been activated. */
         /*
           Actually all predicates non-guarded by first_unmatched->found
@@ -10608,8 +10609,6 @@ evaluate_join_record(JOIN *join, JOIN_TAB *join_tab,
     if (found)
     {
       enum enum_nested_loop_state rc;
-      if (not_exists_optimize)
-        return NESTED_LOOP_NO_MORE_ROWS;
       /* A match from join_tab is found for the current partial join. */
       rc= (*join_tab->next_select)(join, join_tab+1, 0);
       if (rc != NESTED_LOOP_OK && rc != NESTED_LOOP_NO_MORE_ROWS)

From 4b25d4a0d77e1bf3aebb015f69cf3fcfa524c27f Mon Sep 17 00:00:00 2001
From: unknown <mskold/marty@mysql.com/linux.site>
Date: Wed, 2 May 2007 10:02:27 +0200
Subject: [PATCH 09/58] ndb_insert.test, ndb_insert.result, ha_ndbcluster.cc:  
 Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check
 for null values

mysql-test/t/ndb_insert.test:
  Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values
sql/ha_ndbcluster.cc:
  Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values
mysql-test/r/ndb_insert.result:
  Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values
---
 mysql-test/r/ndb_insert.result |  8 +++++++
 mysql-test/t/ndb_insert.test   |  9 ++++++++
 sql/ha_ndbcluster.cc           | 42 ++++++++++++++++++++++++++++++++--
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/ndb_insert.result b/mysql-test/r/ndb_insert.result
index 0818f9ce9ac..e7275bde2b8 100644
--- a/mysql-test/r/ndb_insert.result
+++ b/mysql-test/r/ndb_insert.result
@@ -649,3 +649,11 @@ pk	a
 6	NULL
 7	4
 DROP TABLE t1;
+create table t1(a int primary key, b int, unique key(b)) engine=ndb;
+insert ignore into t1 values (1,0), (2,0), (2,null), (3,null);
+select * from t1 order by a;
+a	b
+1	0
+2	NULL
+3	NULL
+drop table t1;
diff --git a/mysql-test/t/ndb_insert.test b/mysql-test/t/ndb_insert.test
index bf25ca9a133..f346b7dc4ab 100644
--- a/mysql-test/t/ndb_insert.test
+++ b/mysql-test/t/ndb_insert.test
@@ -630,4 +630,13 @@ INSERT IGNORE INTO t1 VALUES (4,NULL),(5,NULL),(6,NULL),(7,4);
 SELECT * FROM t1 ORDER BY pk;
 DROP TABLE t1;
 
+#
+# Bug #27980  	INSERT IGNORE wrongly ignores NULLs in unique index
+#
+
+create table t1(a int primary key, b int, unique key(b)) engine=ndb;
+insert ignore into t1 values (1,0), (2,0), (2,null), (3,null);
+select * from t1 order by a;
+drop table t1;
+
 # End of 4.1 tests
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 8701a216b8e..9b48e0d4f38 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -1630,6 +1630,34 @@ bool ha_ndbcluster::check_all_operations_for_error(NdbTransaction *trans,
   DBUG_RETURN(true);
 }
 
+
+/**
+ * Check if record contains any null valued columns that are part of a key
+ */
+static
+int
+check_null_in_record(const KEY* key_info, const byte *record)
+{
+  KEY_PART_INFO *curr_part, *end_part;
+  curr_part= key_info->key_part;
+  end_part= curr_part + key_info->key_parts;
+
+  while (curr_part != end_part)
+  {
+    if (curr_part->null_bit &&
+        (record[curr_part->null_offset] & curr_part->null_bit))
+      return 1;
+    curr_part++;
+  }
+  return 0;
+  /*
+    We could instead pre-compute a bitmask in table_share with one bit for
+    every null-bit in the key, and so check this just by OR'ing the bitmask
+    with the null bitmap in the record.
+    But not sure it's worth it.
+  */
+}
+
 /*
  * Peek to check if any rows already exist with conflicting
  * primary key or unique index values
@@ -1671,7 +1699,17 @@ int ha_ndbcluster::peek_indexed_rows(const byte *record, bool check_pk)
     if (i != table->s->primary_key &&
         key_info->flags & HA_NOSAME)
     {
-      // A unique index is defined on table
+      /*
+        A unique index is defined on table.
+        We cannot look up a NULL field value in a unique index. But since
+        keys with NULLs are not indexed, such rows cannot conflict anyway, so
+        we just skip the index in this case.
+      */
+      if (check_null_in_record(key_info, record))
+      {
+	DBUG_PRINT("info", ("skipping check for key with NULL"));
+        continue;
+      } 
       NdbIndexOperation *iop;
       NDBINDEX *unique_index = (NDBINDEX *) m_index[i].unique_index;
       key_part= key_info->key_part;
@@ -2816,7 +2854,7 @@ int ha_ndbcluster::index_end()
 }
 
 /**
- * Check if key contains null
+ * Check if key contains nullable columns
  */
 static
 int

From 589ae7b4e090aa866b492a823f7e773bda03e1ec Mon Sep 17 00:00:00 2001
From: unknown <joerg@trift2.>
Date: Wed, 2 May 2007 14:01:49 +0200
Subject: [PATCH 10/58] Format corrections for various "Makefile.am": Leading
 tab, no trailing blank.

client/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
libmysqld/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
netware/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
scripts/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
win/Makefile.am:
  After a backslash (to mark a continuation line) there must not be a trailing blank.
---
 client/Makefile.am    | 14 +++++++-------
 libmysqld/Makefile.am |  6 +++---
 netware/Makefile.am   |  6 +++---
 scripts/Makefile.am   |  2 +-
 win/Makefile.am       |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/Makefile.am b/client/Makefile.am
index 5f1569ba2c4..c7663c7da82 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -64,13 +64,13 @@ link_sources:
 	for f in $(sql_src) ; do \
 	  rm -f $$f; \
 	  @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
-         done; \
-        for f in $(strings_src) ; do \
-          rm -f $(srcdir)/$$f; \
-          @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
-         done; \
-         rm -f $(srcdir)/my_user.c; \
-         @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
+	done; \
+	for f in $(strings_src) ; do \
+	  rm -f $(srcdir)/$$f; \
+	  @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
+	done; \
+	rm -f $(srcdir)/my_user.c; \
+	@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
 
 
 # Don't update the files from bitkeeper
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 330e72e5507..95e3e539eee 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -127,11 +127,11 @@ link_sources:
 	  for f in $(sqlsources); do \
 	    rm -f $$f; \
 	    if test -e $(top_srcdir)/sql/$$f ; \
-            then \
+	    then \
 	      @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
-            else \
+	    else \
 	      @LN_CP_F@ $(top_builddir)/sql/$$f $$f; \
-            fi ; \
+	    fi ; \
 	  done; \
 	  for f in $(libmysqlsources); do \
 	    rm -f $$f; \
diff --git a/netware/Makefile.am b/netware/Makefile.am
index c83a5b389ab..3ec9c7794bf 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -90,20 +90,20 @@ EXTRA_DIST=	$(BUILT_SOURCES) comp_err.def install_test_db.ncf \
 # Build init_db.sql from the files that contain
 # the system tables for this version of MySQL plus any commands
 init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
-             $(top_srcdir)/scripts/mysql_system_tables_data.sql
+	     $(top_srcdir)/scripts/mysql_system_tables_data.sql
 	@echo "Building $@";
 	@echo "CREATE DATABASE mysql;" > $@;
 	@echo "CREATE DATABASE test;" >> $@;
 	@echo "use mysql;" >> $@;
 	@cat $(top_srcdir)/scripts/mysql_system_tables.sql \
-             $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;
+	     $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;
 
 # Build test_db.sql from init_db.sql plus
 # some test data
 test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
 	@echo "Building $@";
 	@cat init_db.sql \
-             $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
+	     $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
 
 endif
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 79f4666f855..97691318cc6 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -124,7 +124,7 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
 mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
 	$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
 	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
-          mysql_fix_privilege_tables \
+	  mysql_fix_privilege_tables \
 	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
 
 
diff --git a/win/Makefile.am b/win/Makefile.am
index c6632737d7b..89f0d65b528 100755
--- a/win/Makefile.am
+++ b/win/Makefile.am
@@ -14,7 +14,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ## Process this file with automake to create Makefile.in
-EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README \ 
+EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README \
              mysql_manifest.cmake create_manifest.js
 
 # Don't update the files from bitkeeper

From 11a630c4ca7099b8599e63b2f7928d8fac69e86b Mon Sep 17 00:00:00 2001
From: unknown <df@pippilotta.erinye.com>
Date: Wed, 2 May 2007 15:50:08 +0200
Subject: [PATCH 11/58] generate map files on windows

CMakeLists.txt:
  Generate map files for executables
---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a286071bb0..6e6ac835b5d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,6 +116,9 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
 	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 
 	       ${CMAKE_CXX_FLAGS_DEBUG})
 
+	# generate map files
+	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
+
 	# remove support for Exception handling
 	STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

From 36305254293e2562d6c1f5f719a24bd481bc790d Mon Sep 17 00:00:00 2001
From: unknown <omer@linux.site>
Date: Wed, 2 May 2007 07:50:47 -0700
Subject: [PATCH 12/58] Coeection to the bug format to for better search -
 review comment

---
 .../suite/funcs_1/datadict/datadict_master.inc       | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mysql-test/suite/funcs_1/datadict/datadict_master.inc b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
index 385b17be9ee..03d3eeb3777 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_master.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
@@ -460,7 +460,9 @@ eval SELECT *
   LINES TERMINATED BY '\n'
   FROM information_schema.schemata
   WHERE schema_name LIKE 'db_%';
-# The above error is bug 28181 - a regression in 5.0.42
+# 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
   WHERE schema_name LIKE 'db_%';
@@ -473,7 +475,9 @@ eval SELECT *
   FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
   LINES TERMINATED BY '\n'
   FROM schemata LIMIT 0, 5;
-# The above error is bug 28181 - a regression in 5.0.42
+# 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;
 
@@ -483,7 +487,9 @@ eval SELECT *
   LINES TERMINATED BY '\n'
   FROM information_schema.schemata
   WHERE schema_name LIKE 'db_%';
-# The above error is bug 28181 - a regression in 5.0.42
+# 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
   WHERE schema_name LIKE 'db_%';

From 09812630ca71ce1060247035c7d006ffbe7c8827 Mon Sep 17 00:00:00 2001
From: unknown <joerg@trift2.>
Date: Wed, 2 May 2007 16:51:15 +0200
Subject: [PATCH 13/58] RPM spec file error: Trailing '*' to cover '.gz' for a
 man page was missing.

support-files/mysql.spec.sh:
  Man pages may/will be compressed, so the file name needs trailing '*' to cover '.gz'.
---
 support-files/mysql.spec.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index ab544b65f74..b28af51d43e 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -556,7 +556,7 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*

From 2478a8be0c3d438119b3c024822a61a69ea972ce Mon Sep 17 00:00:00 2001
From: unknown <joerg@trift2.>
Date: Wed, 2 May 2007 20:07:01 +0200
Subject: [PATCH 14/58] Resolve a possible timing issue with
 "scripts/mysql_fix_privilege_tables_sql.c" in the source tarball, this is
 essential for cross builds, like for NetWare.

scripts/Makefile.am:
  On a fast build machine, both the source (mysql_fix_privilege_tables.sql)
  and the generated file (mysql_fix_privilege_tables_sql.c) may have identical timestamps
  (granularity is one second only, may be too coarse).
  If that happens, the Makefile rule will fire, and "comp_sql" will be built and called -
  which fails in a cross build, like for NetWare.

  Prevent that by sleeping for 5 (five) seconds, this will ensure a time difference.
---
 scripts/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index cb0658f8756..754ca2ea4c0 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -122,9 +122,11 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
 #
 # Build mysql_fix_privilege_tables_sql.c from
 # mysql_fix_privileges_tables.sql using comp_sql
+# The "sleep" ensures the generated file has a younger timestamp than its source.
 #
 mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
 	$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
+	sleep 5
 	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
 	  mysql_fix_privilege_tables \
 	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@

From ad33a48afc21c7c89e7ea893ea826e305bd09258 Mon Sep 17 00:00:00 2001
From: unknown <joerg@trift2.>
Date: Thu, 3 May 2007 15:51:02 +0200
Subject: [PATCH 15/58] Better distinction between "CLEANFILES" and
 "DISTCLEANFILES" for some generated files (here:
 "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for
 cross-builds.

scripts/Makefile.am:
  Generated files like "mysql_fix_privilege_tables{.sql,_sql.c}" should survive
  a "make clean", this is essential for cross-builds.
  So move them from "CLEANFILES" to "DISTCLEANFILES".
---
 scripts/Makefile.am | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 754ca2ea4c0..d4944962884 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -16,7 +16,7 @@
 ## Process this file with automake to create Makefile.in
 
 BUILT_SOURCES = mysql_fix_privilege_tables.sql \
-                mysql_fix_privilege_tables_sql.c
+		mysql_fix_privilege_tables_sql.c
 
 EXTRA_PROGRAMS = 	comp_sql
 
@@ -70,7 +70,6 @@ EXTRA_DIST =		$(EXTRA_SCRIPTS) \
 			mysqlaccess.conf \
 			mysqlbug \
 			make_win_bin_dist \
-			mysql_fix_privilege_tables.sql \
 			mysql_fix_privilege_tables_sql.c \
 			mysql_system_tables_fix.sql \
 			CMakeLists.txt
@@ -100,13 +99,11 @@ CLEANFILES =		@server_scripts@ \
 			mysql_tableinfo \
 			mysql_upgrade_shell \
 			mysqld_multi \
-			make_win_src_distribution \
-			mysql_fix_privilege_tables.sql \
-			mysql_fix_privilege_tables_sql.c
+			make_win_src_distribution
 
 # mysqlbug should be distributed built so that people can report build
 # failures with it.
-DISTCLEANFILES =        mysqlbug
+DISTCLEANFILES =        $(BUILT_SOURCES) mysqlbug
 
 # We want the right version and configure comand line in mysqlbug
 mysqlbug: ${top_builddir}/config.status mysqlbug.sh
@@ -122,11 +119,12 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
 #
 # Build mysql_fix_privilege_tables_sql.c from
 # mysql_fix_privileges_tables.sql using comp_sql
-# The "sleep" ensures the generated file has a younger timestamp than its source.
+# The "sleep" ensures the generated file has a younger timestamp than its source
+# (which may have been generated in this very same "make" run).
 #
 mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
 	$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
-	sleep 5
+	sleep 2
 	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
 	  mysql_fix_privilege_tables \
 	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@

From 1a0e3a285818f0a71cdc7f387a63f7cc72c72972 Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Fri, 4 May 2007 00:53:37 +0400
Subject: [PATCH 16/58] Bug#23656: Wrong conversion result of a DATETIME to
 integer using CAST function.

The generic string to int conversion was used by the Item_func_signed and
the Item_func_unsigned classes to convert DATE/DATETIME values to the
SIGNED/UNSIGNED type. But this conversion produces wrong results for such
values.

Now if the item which result has to be converted can return its result as
longlong then the item->val_int() method is used to allow the item to carry
out the conversion itself and return the correct result.
This condition is checked in the Item_func_signed::val_int() and the
Item_func_unsigned::val_int() functions.


mysql-test/t/cast.test:
  Added a test case for the bug#23656: Wrong conversion result of a DATETIME to integer using CAST function.
mysql-test/r/cast.result:
  Added a test case for the bug#23656: Wrong conversion result of a DATETIME to integer using CAST function.
sql/item_func.cc:
  Bug#23656: Wrong conversion result of a DATETIME to integer using CAST function.
  Now if the item which result has to be converted can return its result as
  longlong then the item->val_int() method is used to allow the item to carry
  out the conversion itself and return the correct result.
  This condition is checked in the Item_func_signed::val_int() and the
  Item_func_unsigned::val_int() functions.
---
 mysql-test/r/cast.result | 6 ++++++
 mysql-test/t/cast.test   | 6 ++++++
 sql/item_func.cc         | 6 ++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result
index 23c38bb792c..f6f46bd4079 100644
--- a/mysql-test/r/cast.result
+++ b/mysql-test/r/cast.result
@@ -281,4 +281,10 @@ DROP TABLE t1;
 select isnull(date(NULL)), isnull(cast(NULL as DATE));
 isnull(date(NULL))	isnull(cast(NULL as DATE))
 1	1
+SELECT CAST(cast('01-01-01' as date) AS UNSIGNED);
+CAST(cast('01-01-01' as date) AS UNSIGNED)
+20010101
+SELECT CAST(cast('01-01-01' as date) AS SIGNED);
+CAST(cast('01-01-01' as date) AS SIGNED)
+20010101
 End of 4.1 tests
diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test
index 7e8ef031e6b..8eef66f9e1b 100644
--- a/mysql-test/t/cast.test
+++ b/mysql-test/t/cast.test
@@ -173,4 +173,10 @@ DROP TABLE t1;
 
 select isnull(date(NULL)), isnull(cast(NULL as DATE));
 
+#
+# Bug#23656: Wrong result of CAST from DATE to int
+#
+SELECT CAST(cast('01-01-01' as date) AS UNSIGNED);
+SELECT CAST(cast('01-01-01' as date) AS SIGNED);
+
 --echo End of 4.1 tests
diff --git a/sql/item_func.cc b/sql/item_func.cc
index c6b2fa5cc3e..12bb6571369 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -477,7 +477,8 @@ longlong Item_func_signed::val_int()
   longlong value;
   int error;
 
-  if (args[0]->cast_to_int_type() != STRING_RESULT)
+  if (args[0]->cast_to_int_type() != STRING_RESULT ||
+      args[0]->result_as_longlong())
   {
     value= args[0]->val_int();
     null_value= args[0]->null_value; 
@@ -529,7 +530,8 @@ longlong Item_func_unsigned::val_int()
     return (longlong)  (dvalue + (dvalue > 0 ? 0.5 : -0.5));
   }
 
-  if (args[0]->cast_to_int_type() != STRING_RESULT)
+  if (args[0]->cast_to_int_type() != STRING_RESULT ||
+      args[0]->result_as_longlong())
   {
     value= args[0]->val_int();
     null_value= args[0]->null_value; 

From 0ad4e1b2a6f4919afbfc43a7cd71e828e3aeb74a Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Fri, 4 May 2007 10:48:51 +0300
Subject: [PATCH 17/58] Bug #27807. Non-correlated scalar subqueries may get
 executed in EXPLAIN at the optimization phase if they are part of a right
 hand sargable expression. If the scalar subquery uses a temp table to
 materialize its results it will replace the subquery structure from the
 parser with a simple select from the materialization table. As a result the
 EXPLAIN will crash as the temporary materialization table is not to be shown
 in EXPLAIN at all. Fixed by preserving the original query structure right
 after calling optimize() for scalar subqueries with temp tables executed
 during EXPLAIN.

mysql-test/r/subselect.result:
  Bug #27807: test case
mysql-test/t/subselect.test:
  Bug #27807: test case
sql/item_subselect.cc:
  Bug #27807: preserve the join structure
sql/sql_select.cc:
  Bug #27807: introduce initialization function for tmp_join
sql/sql_select.h:
  Bug #27807: introduce initialization function for tmp_join
---
 mysql-test/r/subselect.result |  8 ++++++++
 mysql-test/t/subselect.test   | 10 ++++++++++
 sql/item_subselect.cc         | 15 +++++++++++++++
 sql/sql_select.cc             | 36 +++++++++++++++++++++++++++--------
 sql/sql_select.h              |  1 +
 5 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 94075df57b4..2b16242fac2 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -4012,3 +4012,11 @@ WHERE (SELECT COUNT(t0.b) FROM t1 t WHERE t.b>20) GROUP BY a;
 ERROR HY000: Invalid use of group function
 SET @@sql_mode=default;
 DROP TABLE t1;
+CREATE TABLE t1 (a int, b int, KEY (a));
+INSERT INTO t1 VALUES (1,1),(2,1);
+EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT COUNT(*) FROM t1 GROUP BY b);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ref	a	a	5	const	1	Using where; Using index
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
+DROP TABLE t1;
+End of 5.0 tests.
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 482b3e883e6..123a1ef3282 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -2845,3 +2845,13 @@ SELECT a FROM t1 t0
 SET @@sql_mode=default;
 
 DROP TABLE t1;
+
+#
+# Bug #27807: Server crash when executing subquery with EXPLAIN
+#  
+CREATE TABLE t1 (a int, b int, KEY (a)); 
+INSERT INTO t1 VALUES (1,1),(2,1);
+EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT COUNT(*) FROM t1 GROUP BY b);
+DROP TABLE t1;
+
+--echo End of 5.0 tests.
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index b3744d6eb96..a4d07e08473 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -1774,6 +1774,21 @@ int subselect_single_select_engine::exec()
       thd->lex->current_select= save_select;
       DBUG_RETURN(join->error ? join->error : 1);
     }
+    if (!select_lex->uncacheable && thd->lex->describe && 
+        !(join->select_options & SELECT_DESCRIBE) && 
+        join->need_tmp && item->const_item())
+    {
+      /*
+        Force join->join_tmp creation, because this subquery will be replaced
+        by a simple select from the materialization temp table by optimize()
+        called by EXPLAIN and we need to preserve the initial query structure
+        so we can display it.
+       */
+      select_lex->uncacheable|= UNCACHEABLE_EXPLAIN;
+      select_lex->master_unit()->uncacheable|= UNCACHEABLE_EXPLAIN;
+      if (join->init_save_join_tab())
+        DBUG_RETURN(1);
+    }
     if (item->engine_changed)
     {
       DBUG_RETURN(1);
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 9b27daabc0e..499fed58c4b 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1426,14 +1426,13 @@ JOIN::optimize()
       }
     }
 
-    if (select_lex->uncacheable && !is_top_level_join())
-    {
-      /* If this join belongs to an uncacheable subquery */
-      if (!(tmp_join= (JOIN*)thd->alloc(sizeof(JOIN))))
-	DBUG_RETURN(-1);
-      error= 0;				// Ensure that tmp_join.error= 0
-      restore_tmp();
-    }
+    /* 
+      If this join belongs to an uncacheable subquery save 
+      the original join 
+    */
+    if (select_lex->uncacheable && !is_top_level_join() &&
+        init_save_join_tab())
+      DBUG_RETURN(-1);
   }
 
   error= 0;
@@ -1495,6 +1494,27 @@ JOIN::reinit()
   DBUG_RETURN(0);
 }
 
+/**
+   @brief Save the original join layout
+      
+   @details Saves the original join layout so it can be reused in 
+   re-execution and for EXPLAIN.
+             
+   @return Operation status
+   @retval 0      success.
+   @retval 1      error occurred.
+*/
+
+bool
+JOIN::init_save_join_tab()
+{
+  if (!(tmp_join= (JOIN*)thd->alloc(sizeof(JOIN))))
+    return 1;
+  error= 0;				       // Ensure that tmp_join.error= 0
+  restore_tmp();
+  return 0;
+}
+
 
 bool
 JOIN::save_join_tab()
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 9aa6fc1cfcd..5081366c10b 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -434,6 +434,7 @@ public:
   void cleanup(bool full);
   void clear();
   bool save_join_tab();
+  bool init_save_join_tab();
   bool send_row_on_empty_set()
   {
     return (do_send_rows && tmp_table_param.sum_func_count != 0 &&

From 13cfc4775c4e310ad8a8c44efa512944b4c7a11d Mon Sep 17 00:00:00 2001
From: unknown <gluh@mysql.com/eagle.(none)>
Date: Fri, 4 May 2007 14:41:58 +0500
Subject: [PATCH 18/58] Bug#28181 Access denied to 'information_schema when
 select into out file (regression) allow select into out file from I_S if user
 has FILE privilege otherwise issue an error

mysql-test/r/outfile.result:
  test result
mysql-test/t/outfile.test:
  test case
sql/sql_parse.cc:
  allow select into out file from I_S if user has FILE privilege
  otherwise issue an error
---
 mysql-test/r/outfile.result | Bin 1382 -> 2135 bytes
 mysql-test/t/outfile.test   |  35 +++++++++++++++++++++++++++++++++++
 sql/sql_parse.cc            |   3 ++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/outfile.result b/mysql-test/r/outfile.result
index 023c4ea205f4c5a038bf841e341968343f71ad5e..8503df545d2d0bfc67d5c8aa9e6e8a51ca23d5ca 100644
GIT binary patch
delta 766
zcmb`_y-ve05C`yy#S@Qk%3`U4G@wpoDFZW7XQaw?F0F+>g6$S%$}90UyaCU_If(*N
zVTjZvQFQ+J=XdwTKCeIOt4?|p5up-M>_k8?ZFtiWLoC@?ItKKR9^1RMc2ekrOVzy>
zHiFO^oc-CAFCe-<RtMB5BLsOsBeqr;WXjUY&K+Z|G(wi=%V?VA_<frq<g1L;3Uw7A
zqBqJ?(h7Dh@EZ=UiON~JzXh~XyD*kA&Oj@RXM0{OXSH_*l&zgNB5mJxL!x|mMZw+=
z=<#<>I_wpJPcFP<Pn*s223Ge)Q9Qt-lo$e3XcZ-(ll#91K8W!(pUilonV@+eqZ@M!
z_w!M;7a`WgT+Z2=-DNpvYo3Ucq^Q4XraYb;VW**LygJcb?5U3<MBlsfIjp>E2J(Mu
Kllaual6?b_NfAN-

delta 7
OcmcaE@QiCi8Y=(|&jRxR

diff --git a/mysql-test/t/outfile.test b/mysql-test/t/outfile.test
index 7c90fd32909..f285407efd4 100644
--- a/mysql-test/t/outfile.test
+++ b/mysql-test/t/outfile.test
@@ -96,3 +96,38 @@ create table t1(a int);
 eval select * into outfile "$MYSQL_TEST_DIR/outfile-test1" from t1;
 drop table t1;
 
+#
+# Bug#28181 Access denied to 'information_schema when
+# select into out file (regression)
+#
+create database mysqltest;
+create user user_1@localhost;
+grant all on mysqltest.* to user_1@localhost;
+connect (con28181_1,localhost,user_1,,mysqltest);
+
+--error 1044
+eval select schema_name
+into outfile "../tmp/outfile-test.4"
+fields terminated by ',' optionally enclosed by '"'
+ lines terminated by '\n'
+from information_schema.schemata
+where schema_name like 'mysqltest';
+
+connection default;
+grant file on *.* to user_1@localhost;
+
+connect (con28181_2,localhost,user_1,,mysqltest);
+eval select schema_name
+into outfile "../tmp/outfile-test.4"
+fields terminated by ',' optionally enclosed by '"'
+ lines terminated by '\n'
+from information_schema.schemata
+where schema_name like 'mysqltest';
+
+connection default;
+--exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.4
+use test;
+revoke all privileges on *.* from user_1@localhost;
+drop user user_1@localhost;
+drop database mysqltest;
+
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 35089bbb251..3ca0c78d96a 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5261,7 +5261,8 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
 
   if (schema_db)
   {
-    if (want_access & ~(SELECT_ACL | EXTRA_ACL))
+    if (!(sctx->master_access & FILE_ACL) && (want_access & FILE_ACL) ||
+        (want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL)))
     {
       if (!no_errors)
       {

From 353b6f26b1469f4d77d2eedee9653207503377ed Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Fri, 4 May 2007 16:43:29 +0300
Subject: [PATCH 19/58] Bug #27531: the 4.1 fix. When checking for
 applicability of join cache we must disable its usage only if there is no
 temp table in use. When a temp table is used we can use join cache (and it
 will not make the result-set unordered) to fill the temp table. The
 filesort() operation is then applied to the data in the temp table and hence
 is not affected by join cache usage. Fixed by narrowing the condition for
 disabling join cache to exclude the case where temp table is used.

mysql-test/r/join.result:
  Bug #27531: test case
mysql-test/t/join.test:
  Bug #27531: test case
sql/sql_select.cc:
  Bug #27531:
  Disable join cache only if not using temp table
---
 mysql-test/r/join.result | 50 ++++++++++++++++++++++++++++++++++++++++
 mysql-test/t/join.test   | 24 +++++++++++++++++++
 sql/sql_select.cc        |  9 +++++---
 3 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index dc763472b0e..9ac8825fcb8 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -376,3 +376,53 @@ i	i	i
 2	NULL	4
 2	2	2
 drop table t1,t2,t3;
+CREATE TABLE t1 (a int, b int default 0, c int default 1);
+INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+INSERT INTO t1 (a) SELECT a + 8 FROM t1;
+INSERT INTO t1 (a) SELECT a + 16 FROM t1;
+CREATE TABLE t2 (a int, d int, e int default 0);
+INSERT INTO t2 (a, d) VALUES (1,1),(2,2),(3,3),(4,4);
+INSERT INTO t2 (a, d) SELECT a+4, a+4 FROM t2;
+INSERT INTO t2 (a, d) SELECT a+8, a+8 FROM t2;
+EXPLAIN
+SELECT STRAIGHT_JOIN t2.e FROM t1,t2 WHERE t2.d=1 AND t1.b=t2.e
+ORDER BY t1.b, t1.c;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	32	Using temporary; Using filesort
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	16	Using where
+SELECT STRAIGHT_JOIN t2.e FROM t1,t2 WHERE t2.d=1 AND t1.b=t2.e
+ORDER BY t1.b, t1.c;
+e
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+DROP TABLE t1,t2;
diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test
index 2715f30b6cf..0fe5de8c9b7 100644
--- a/mysql-test/t/join.test
+++ b/mysql-test/t/join.test
@@ -326,4 +326,28 @@ select t1.i,t2.i,t3.i from t2 natural right join t3,t1 order by t1.i,t2.i,t3.i;
 select t1.i,t2.i,t3.i from t2 right join t3 on (t2.i=t3.i),t1 order by t1.i,t2.i,t3.i;
 drop table t1,t2,t3;
 
+#
+# Bug #27531: Query performance degredation in 4.1.22 and greater
+#
+CREATE TABLE t1 (a int, b int default 0, c int default 1);
+
+INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+INSERT INTO t1 (a) SELECT a + 8 FROM t1;
+INSERT INTO t1 (a) SELECT a + 16 FROM t1;
+
+CREATE TABLE t2 (a int, d int, e int default 0);
+
+INSERT INTO t2 (a, d) VALUES (1,1),(2,2),(3,3),(4,4);
+INSERT INTO t2 (a, d) SELECT a+4, a+4 FROM t2;
+INSERT INTO t2 (a, d) SELECT a+8, a+8 FROM t2;
+
+# should use join cache
+EXPLAIN
+SELECT STRAIGHT_JOIN t2.e FROM t1,t2 WHERE t2.d=1 AND t1.b=t2.e
+  ORDER BY t1.b, t1.c;
+SELECT STRAIGHT_JOIN t2.e FROM t1,t2 WHERE t2.d=1 AND t1.b=t2.e
+  ORDER BY t1.b, t1.c;
+
+DROP TABLE t1,t2;
+
 # End of 4.1 tests
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 36a15841065..656d1b5639a 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -3939,14 +3939,17 @@ make_join_readinfo(JOIN *join, uint options)
       disable join cache because it will change the ordering of the results.
       Code handles sort table that is at any location (not only first after 
       the const tables) despite the fact that it's currently prohibited.
+      We must disable join cache if the first non-const table alone is
+      ordered. If there is a temp table the ordering is done as a last
+      operation and doesn't prevent join cache usage.
     */
-    if (!ordered_set && 
-        (table == join->sort_by_table &&
+    if (!ordered_set && !join->need_tmp &&
+        ((table == join->sort_by_table &&
          (!join->order || join->skip_sort_order ||
           test_if_skip_sort_order(tab, join->order, join->select_limit,
                                   1))
         ) ||
-        (join->sort_by_table == (TABLE *) 1 && i != join->const_tables))
+        (join->sort_by_table == (TABLE *) 1 && i != join->const_tables)))
       ordered_set= 1;
 
     switch (tab->type) {

From 99bde6d9ecf76fabfa1460b9780134f40663a11f Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Fri, 4 May 2007 18:57:10 +0400
Subject: [PATCH 20/58] Bug#27759: Wrong DATE/DATETIME comparison in
 LEAST()/GREATEST() functions.

The LEAST/GREATEST functions compared DATE/DATETIME values as
strings which in some cases could lead to a wrong result.

A new member function called cmp_datetimes() is added to the
Item_func_min_max class. It compares arguments in DATETIME context
and returns index of the least/greatest argument.
The Item_func_min_max::fix_length_and_dec() function now detects when
arguments should be compared in DATETIME context and sets the newly
added flag compare_as_dates. It indicates that the cmp_datetimes() function
should be called to get a correct result.
Item_func_min_max::val_xxx() methods are corrected to call the
cmp_datetimes() function when needed.
Objects of the Item_splocal class now stores and reports correct original
field type.


mysql-test/t/type_datetime.test:
  Added a test case for the bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
mysql-test/r/type_datetime.result:
  Added a test case for the bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
mysql-test/r/sp-vars.result:
  A test case result corrected after the fix for the bug#27759.
sql/mysql_priv.h:
  Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
  Added the prototype of the get_datetime_value() function.
sql/item_func.h:
  Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
  A new member function called cmp_datetimes() is added to the
  Item_func_min_max class.
sql/item_func.cc:
  Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
  A new member function called cmp_datetimes() is added to the
  Item_func_min_max class. It compares arguments in DATETIME context
  and returns index of the least/greatest argument.
  The Item_func_min_max::fix_length_and_dec() function now detects when
  arguments should be compared in DATETIME context and sets the newly
  added flag compare_as_dates. It indicates that the cmp_datetimes() function
  should be called to get a correct result.
  Item_func_min_max::val_xxx() methods are corrected to call the
  cmp_datetimes() function when needed.
sql/item_cmpfunc.cc:
  Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
  The get_datetime_value() function is no longer static.
sql/item.h:
  Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
  Objects of the Item_splocal class now stores and reports correct original
  field type.
sql/item.cc:
  Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
  Objects of the Item_splocal class now stores and reports correct original
  field type.
---
 mysql-test/r/sp-vars.result       |  4 +-
 mysql-test/r/type_datetime.result | 30 +++++++++++
 mysql-test/t/type_datetime.test   | 26 +++++++++
 sql/item.cc                       |  1 +
 sql/item.h                        |  3 +-
 sql/item_cmpfunc.cc               |  4 +-
 sql/item_func.cc                  | 90 +++++++++++++++++++++++++++++++
 sql/item_func.h                   | 10 +++-
 sql/mysql_priv.h                  |  2 +
 9 files changed, 164 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/sp-vars.result b/mysql-test/r/sp-vars.result
index 6090dfdf737..b112c6bece6 100644
--- a/mysql-test/r/sp-vars.result
+++ b/mysql-test/r/sp-vars.result
@@ -690,12 +690,12 @@ END|
 CALL p1(NOW());
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "x" varbinary(19) default NULL
+  "x" datetime default NULL
 )
 CALL p1('test');
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "x" varbinary(19) default NULL
+  "x" datetime default NULL
 )
 Warnings:
 Warning	1264	Out of range value adjusted for column 'x' at row 1
diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result
index 3a28410b7dc..3a7313f48eb 100644
--- a/mysql-test/r/type_datetime.result
+++ b/mysql-test/r/type_datetime.result
@@ -264,3 +264,33 @@ f2
 SELECT 1 from dual where NOW() BETWEEN CURRENT_DATE() - INTERVAL 1 DAY AND CURRENT_DATE();
 1
 drop table t1;
+select least(cast('01-01-01' as date), '01-01-02');
+least(cast('01-01-01' as date), '01-01-02')
+2001-01-01
+select greatest(cast('01-01-01' as date), '01-01-02');
+greatest(cast('01-01-01' as date), '01-01-02')
+01-01-02
+select least(cast('01-01-01' as date), '01-01-02') + 0;
+least(cast('01-01-01' as date), '01-01-02') + 0
+20010101
+select greatest(cast('01-01-01' as date), '01-01-02') + 0;
+greatest(cast('01-01-01' as date), '01-01-02') + 0
+20010102
+select least(cast('01-01-01' as datetime), '01-01-02') + 0;
+least(cast('01-01-01' as datetime), '01-01-02') + 0
+20010101000000
+DROP PROCEDURE IF EXISTS test27759 ;
+CREATE PROCEDURE test27759()
+BEGIN
+declare v_a date default '2007-4-10';
+declare v_b date default '2007-4-11';
+declare v_c datetime default '2004-4-9 0:0:0';
+select v_a as a,v_b as b,
+least( v_a, v_b ) as a_then_b,
+least( v_b, v_a ) as b_then_a,
+least( v_c, v_a ) as c_then_a;
+END;|
+call test27759();
+a	b	a_then_b	b_then_a	c_then_a
+2007-04-10	2007-04-11	2007-04-10	2007-04-10	2004-04-09 00:00:00
+drop procedure test27759;
diff --git a/mysql-test/t/type_datetime.test b/mysql-test/t/type_datetime.test
index fc7b20d77a4..c82dee168d2 100644
--- a/mysql-test/t/type_datetime.test
+++ b/mysql-test/t/type_datetime.test
@@ -178,3 +178,29 @@ select f2, f3 from t1 where '01-03-10' between f2 and f3;
 select f2 from t1 where DATE(f2) between "2001-4-15" AND "01-4-15";
 SELECT 1 from dual where NOW() BETWEEN CURRENT_DATE() - INTERVAL 1 DAY AND CURRENT_DATE();
 drop table t1;
+
+#
+# Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
+#
+select least(cast('01-01-01' as date), '01-01-02');
+select greatest(cast('01-01-01' as date), '01-01-02');
+select least(cast('01-01-01' as date), '01-01-02') + 0;
+select greatest(cast('01-01-01' as date), '01-01-02') + 0;
+select least(cast('01-01-01' as datetime), '01-01-02') + 0;
+--disable_warnings
+DROP PROCEDURE IF EXISTS test27759 ;
+--enable_warnings
+DELIMITER |;
+CREATE PROCEDURE test27759()
+BEGIN
+declare v_a date default '2007-4-10';
+declare v_b date default '2007-4-11';
+declare v_c datetime default '2004-4-9 0:0:0';
+select v_a as a,v_b as b,
+       least( v_a, v_b ) as a_then_b,
+       least( v_b, v_a ) as b_then_a,
+       least( v_c, v_a ) as c_then_a;
+END;|
+DELIMITER ;|
+call test27759();
+drop procedure test27759;
diff --git a/sql/item.cc b/sql/item.cc
index 28729e9936f..30486e7559a 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1011,6 +1011,7 @@ Item_splocal::Item_splocal(const LEX_STRING &sp_var_name,
   maybe_null= TRUE;
 
   m_type= sp_map_item_type(sp_var_type);
+  m_field_type= sp_var_type;
   m_result_type= sp_map_result_type(sp_var_type);
 }
 
diff --git a/sql/item.h b/sql/item.h
index 43afbd30d47..18a05b0b4ad 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -946,7 +946,7 @@ class Item_splocal :public Item_sp_variable,
 
   Type m_type;
   Item_result m_result_type;
-
+  enum_field_types m_field_type;
 public:
   /* 
     Position of this reference to SP variable in the statement (the
@@ -978,6 +978,7 @@ public:
 
   inline enum Type type() const;
   inline Item_result result_type() const;
+  inline enum_field_types field_type() const { return m_field_type; }
 
 private:
   bool set_value(THD *thd, sp_rcontext *ctx, Item **it);
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 66c73dd910e..5d614e7cd04 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -745,7 +745,7 @@ void Arg_comparator::set_datetime_cmp_func(Item **a1, Item **b1)
     obtained value
 */
 
-static ulonglong
+ulonglong
 get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
                    Item *warn_item, bool *is_null)
 {
@@ -781,7 +781,7 @@ get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
       MYSQL_TYPE_DATE ? MYSQL_TIMESTAMP_DATE : MYSQL_TIMESTAMP_DATETIME;
     value= get_date_from_str(thd, str, t_type, warn_item->name, &error);
   }
-  if (item->const_item())
+  if (item->const_item() && cache_arg)
   {
     Item_cache_int *cache= new Item_cache_int();
     /* Mark the cache as non-const to prevent re-caching. */
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 503b4362e7a..4ee6af37dad 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2120,6 +2120,7 @@ double Item_func_units::val_real()
 void Item_func_min_max::fix_length_and_dec()
 {
   int max_int_part=0;
+  bool datetime_found= FALSE;
   decimals=0;
   max_length=0;
   maybe_null=0;
@@ -2133,18 +2134,88 @@ void Item_func_min_max::fix_length_and_dec()
     if (args[i]->maybe_null)
       maybe_null=1;
     cmp_type=item_cmp_type(cmp_type,args[i]->result_type());
+    if (args[i]->result_type() != ROW_RESULT && args[i]->is_datetime())
+    {
+      datetime_found= TRUE;
+      if (!datetime_item || args[i]->field_type() == MYSQL_TYPE_DATETIME)
+        datetime_item= args[i];
+    }
   }
   if (cmp_type == STRING_RESULT)
+  {
     agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV, 1);
+    if (datetime_found)
+    {
+      thd= current_thd;
+      compare_as_dates= TRUE;
+    }
+  }
   else if ((cmp_type == DECIMAL_RESULT) || (cmp_type == INT_RESULT))
     max_length= my_decimal_precision_to_length(max_int_part+decimals, decimals,
                                             unsigned_flag);
 }
 
 
+/*
+  Compare item arguments in the DATETIME context.
+
+  SYNOPSIS
+    cmp_datetimes()
+    value [out]   found least/greatest DATE/DATETIME value
+
+  DESCRIPTION
+    Compare item arguments as DATETIME values and return the index of the
+    least/greatest argument in the arguments array.
+    The correct integer DATE/DATETIME value of the found argument is
+    stored to the value pointer, if latter is provided.
+
+  RETURN
+   0	If one of arguments is NULL
+   #	index of the least/greatest argument
+*/
+
+uint Item_func_min_max::cmp_datetimes(ulonglong *value)
+{
+  ulonglong min_max;
+  uint min_max_idx= 0;
+  LINT_INIT(min_max);
+
+  for (uint i=0; i < arg_count ; i++)
+  {
+    Item **arg= args + i;
+    bool is_null;
+    ulonglong res= get_datetime_value(thd, &arg, 0, datetime_item, &is_null);
+    if ((null_value= args[i]->null_value))
+      return 0;
+    if (i == 0 || (res < min_max ? cmp_sign : -cmp_sign) > 0)
+    {
+      min_max= res;
+      min_max_idx= i;
+    }
+  }
+  if (value)
+  {
+    *value= min_max;
+    if (datetime_item->field_type() == MYSQL_TYPE_DATE)
+      *value/= 1000000L;
+  }
+  return min_max_idx;
+}
+
+
 String *Item_func_min_max::val_str(String *str)
 {
   DBUG_ASSERT(fixed == 1);
+  if (compare_as_dates)
+  {
+    String *str_res;
+    uint min_max_idx= cmp_datetimes(NULL);
+    if (null_value)
+      return 0;
+    str_res= args[min_max_idx]->val_str(str);
+    str_res->set_charset(collation.collation);
+    return str_res;
+  }
   switch (cmp_type) {
   case INT_RESULT:
   {
@@ -2212,6 +2283,12 @@ double Item_func_min_max::val_real()
 {
   DBUG_ASSERT(fixed == 1);
   double value=0.0;
+  if (compare_as_dates)
+  {
+    ulonglong result;
+    (void)cmp_datetimes(&result);
+    return (double)result;
+  }
   for (uint i=0; i < arg_count ; i++)
   {
     if (i == 0)
@@ -2233,6 +2310,12 @@ longlong Item_func_min_max::val_int()
 {
   DBUG_ASSERT(fixed == 1);
   longlong value=0;
+  if (compare_as_dates)
+  {
+    ulonglong result;
+    (void)cmp_datetimes(&result);
+    return (longlong)result;
+  }
   for (uint i=0; i < arg_count ; i++)
   {
     if (i == 0)
@@ -2256,6 +2339,13 @@ my_decimal *Item_func_min_max::val_decimal(my_decimal *dec)
   my_decimal tmp_buf, *tmp, *res;
   LINT_INIT(res);
 
+  if (compare_as_dates)
+  {
+    ulonglong value;
+    (void)cmp_datetimes(&value);
+    ulonglong2decimal(value, dec);
+    return dec;
+  }
   for (uint i=0; i < arg_count ; i++)
   {
     if (i == 0)
diff --git a/sql/item_func.h b/sql/item_func.h
index ec5d6bcda02..99e5328c39c 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -693,15 +693,23 @@ class Item_func_min_max :public Item_func
   Item_result cmp_type;
   String tmp_value;
   int cmp_sign;
+  /* TRUE <=> arguments should be compared in the DATETIME context. */
+  bool compare_as_dates;
+  /* An item used for issuing warnings while string to DATETIME conversion. */
+  Item *datetime_item;
+  THD *thd;
+
 public:
   Item_func_min_max(List<Item> &list,int cmp_sign_arg) :Item_func(list),
-    cmp_type(INT_RESULT), cmp_sign(cmp_sign_arg) {}
+    cmp_type(INT_RESULT), cmp_sign(cmp_sign_arg), compare_as_dates(FALSE),
+    datetime_item(0) {}
   double val_real();
   longlong val_int();
   String *val_str(String *);
   my_decimal *val_decimal(my_decimal *);
   void fix_length_and_dec();
   enum Item_result result_type () const { return cmp_type; }
+  uint cmp_datetimes(ulonglong *value);
 };
 
 class Item_func_min :public Item_func_min_max
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 7e873dd7cc6..9995afb8287 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1525,6 +1525,8 @@ void make_date(const DATE_TIME_FORMAT *format, const TIME *l_time,
                String *str);
 void make_time(const DATE_TIME_FORMAT *format, const TIME *l_time,
                String *str);
+ulonglong get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
+                             Item *warn_item, bool *is_null);
 
 int test_if_number(char *str,int *res,bool allow_wildcards);
 void change_byte(byte *,uint,char,char);

From 359b0e59c9375fbaa2beb84f02e01c6fbbf8d31d Mon Sep 17 00:00:00 2001
From: unknown <gkodinov/kgeorge@magare.gmz>
Date: Fri, 4 May 2007 18:55:01 +0300
Subject: [PATCH 21/58] bug #27531:  fixed coverage of out-of-mem errors

---
 sql/item_subselect.cc | 2 +-
 sql/sql_select.cc     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index a4d07e08473..ccd361dba99 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -1787,7 +1787,7 @@ int subselect_single_select_engine::exec()
       select_lex->uncacheable|= UNCACHEABLE_EXPLAIN;
       select_lex->master_unit()->uncacheable|= UNCACHEABLE_EXPLAIN;
       if (join->init_save_join_tab())
-        DBUG_RETURN(1);
+        DBUG_RETURN(1);                        /* purecov: inspected */
     }
     if (item->engine_changed)
     {
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index efdc834f04a..3a480c01ac1 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1432,7 +1432,7 @@ JOIN::optimize()
     */
     if (select_lex->uncacheable && !is_top_level_join() &&
         init_save_join_tab())
-      DBUG_RETURN(-1);
+      DBUG_RETURN(-1);                         /* purecov: inspected */
   }
 
   error= 0;
@@ -1509,7 +1509,7 @@ bool
 JOIN::init_save_join_tab()
 {
   if (!(tmp_join= (JOIN*)thd->alloc(sizeof(JOIN))))
-    return 1;
+    return 1;                                  /* purecov: inspected */
   error= 0;				       // Ensure that tmp_join.error= 0
   restore_tmp();
   return 0;

From 72569cc66d2a1d8edcc3e368213619f7ea855329 Mon Sep 17 00:00:00 2001
From: unknown <thek@adventure.(none)>
Date: Mon, 7 May 2007 10:23:10 +0200
Subject: [PATCH 22/58] Bug#26977 exception handlers never hreturn   - In some
 cases, flow control optimization implemented in sp::optimize     removes
 hreturn instructions, causing SQL exception handlers to:       * never return
       * execute wrong logic   - This patch overrides default short cut
 optimization on hreturn instructions     to avoid this problem.

mysql-test/r/sp-code.result:
  Added test case
mysql-test/t/sp-code.test:
  Added test case
sql/sp_head.cc:
  Override opt_mark to get correct execution paths without jump short cut
  optimization.
sql/sp_head.h:
  Added override sp_instr_hreturn::opt_shortcut_jump so that jump short cuts aren't
  performed on hreturn instructions operating on handlers which are set to CONTINUE
  after interruption.
---
 mysql-test/r/sp-code.result | 113 ++++++++++++++++++++++++++++++++++++
 mysql-test/t/sp-code.test   |  75 ++++++++++++++++++++++++
 sql/sp_head.cc              |  16 ++++-
 sql/sp_head.h               |   6 ++
 4 files changed, 207 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result
index 9d86a6bc08d..219f3c9b37a 100644
--- a/mysql-test/r/sp-code.result
+++ b/mysql-test/r/sp-code.result
@@ -620,4 +620,117 @@ SHOW PROCEDURE CODE p1;
 Pos	Instruction
 0	stmt 2 "CREATE INDEX idx ON t1 (c1)"
 DROP PROCEDURE p1;
+drop table if exists t1;
+drop procedure if exists proc_26977_broken;
+drop procedure if exists proc_26977_works;
+create table t1(a int unique);
+create procedure proc_26977_broken(v int)
+begin
+declare i int default 5;
+declare continue handler for sqlexception
+begin
+select 'caught something';
+retry:
+while i > 0 do
+begin
+set i = i - 1;
+select 'looping', i;
+end;
+end while retry;
+end;
+select 'do something';
+insert into t1 values (v);
+select 'do something again';
+insert into t1 values (v);
+end//
+create procedure proc_26977_works(v int)
+begin
+declare i int default 5;
+declare continue handler for sqlexception
+begin
+select 'caught something';
+retry:
+while i > 0 do
+begin
+set i = i - 1;
+select 'looping', i;
+end;
+end while retry;
+select 'optimizer: keep hreturn';
+end;
+select 'do something';
+insert into t1 values (v);
+select 'do something again';
+insert into t1 values (v);
+end//
+show procedure code proc_26977_broken;
+Pos	Instruction
+0	set i@1 5
+1	hpush_jump 8 2 CONTINUE
+2	stmt 0 "select 'caught something'"
+3	jump_if_not 7(7) (i@1 > 0)
+4	set i@1 (i@1 - 1)
+5	stmt 0 "select 'looping', i"
+6	jump 3
+7	hreturn 2
+8	stmt 0 "select 'do something'"
+9	stmt 5 "insert into t1 values (v)"
+10	stmt 0 "select 'do something again'"
+11	stmt 5 "insert into t1 values (v)"
+12	hpop 1
+show procedure code proc_26977_works;
+Pos	Instruction
+0	set i@1 5
+1	hpush_jump 9 2 CONTINUE
+2	stmt 0 "select 'caught something'"
+3	jump_if_not 7(7) (i@1 > 0)
+4	set i@1 (i@1 - 1)
+5	stmt 0 "select 'looping', i"
+6	jump 3
+7	stmt 0 "select 'optimizer: keep hreturn'"
+8	hreturn 2
+9	stmt 0 "select 'do something'"
+10	stmt 5 "insert into t1 values (v)"
+11	stmt 0 "select 'do something again'"
+12	stmt 5 "insert into t1 values (v)"
+13	hpop 1
+call proc_26977_broken(1);
+do something
+do something
+do something again
+do something again
+caught something
+caught something
+looping	i
+looping	4
+looping	i
+looping	3
+looping	i
+looping	2
+looping	i
+looping	1
+looping	i
+looping	0
+call proc_26977_works(2);
+do something
+do something
+do something again
+do something again
+caught something
+caught something
+looping	i
+looping	4
+looping	i
+looping	3
+looping	i
+looping	2
+looping	i
+looping	1
+looping	i
+looping	0
+optimizer: keep hreturn
+optimizer: keep hreturn
+drop table t1;
+drop procedure proc_26977_broken;
+drop procedure proc_26977_works;
 End of 5.0 tests.
diff --git a/mysql-test/t/sp-code.test b/mysql-test/t/sp-code.test
index 97bc29fcad2..0f249c95172 100644
--- a/mysql-test/t/sp-code.test
+++ b/mysql-test/t/sp-code.test
@@ -446,4 +446,79 @@ SHOW PROCEDURE CODE p1;
 DROP PROCEDURE p1;
 
 
+#
+# Bug#26977 exception handlers never hreturn
+#
+--disable_warnings
+drop table if exists t1;
+drop procedure if exists proc_26977_broken;
+drop procedure if exists proc_26977_works;
+--enable_warnings
+
+create table t1(a int unique);
+
+delimiter //;
+
+create procedure proc_26977_broken(v int)
+begin
+  declare i int default 5;
+
+  declare continue handler for sqlexception
+  begin
+    select 'caught something';
+    retry:
+    while i > 0 do
+      begin
+        set i = i - 1;
+        select 'looping', i;
+      end;
+    end while retry;
+  end;
+
+  select 'do something';
+  insert into t1 values (v);
+  select 'do something again';
+  insert into t1 values (v);
+end//
+
+create procedure proc_26977_works(v int)
+begin
+  declare i int default 5;
+
+  declare continue handler for sqlexception
+  begin
+    select 'caught something';
+    retry:
+    while i > 0 do
+      begin
+        set i = i - 1;
+        select 'looping', i;
+      end;
+    end while retry;
+    select 'optimizer: keep hreturn';
+  end;
+
+  select 'do something';
+  insert into t1 values (v);
+  select 'do something again';
+  insert into t1 values (v);
+end//
+delimiter ;//
+
+show procedure code proc_26977_broken;
+
+show procedure code proc_26977_works;
+
+## This caust an error because of jump short cut
+## optimization.
+call proc_26977_broken(1);
+
+## This works
+call proc_26977_works(2);
+
+drop table t1;
+drop procedure proc_26977_broken;
+drop procedure proc_26977_works;
+
+
 --echo End of 5.0 tests.
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 1ebef4f8bee..5a1faf50296 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -2982,10 +2982,20 @@ sp_instr_hreturn::print(String *str)
 uint
 sp_instr_hreturn::opt_mark(sp_head *sp, List<sp_instr> *leads)
 {
-  if (m_dest)
-    return sp_instr_jump::opt_mark(sp, leads);
-
   marked= 1;
+  
+  if (m_dest)
+  {
+    /*
+      This is an EXIT handler; next instruction step is in m_dest.
+     */
+    return m_dest;
+  }
+  
+  /*
+    This is a CONTINUE handler; next instruction step will come from
+    the handler stack and not from opt_mark.
+   */
   return UINT_MAX;
 }
 
diff --git a/sql/sp_head.h b/sql/sp_head.h
index 4632f6808fd..ed99885ae9a 100644
--- a/sql/sp_head.h
+++ b/sql/sp_head.h
@@ -973,6 +973,12 @@ public:
 
   virtual void print(String *str);
 
+  /* This instruction will not be short cut optimized. */
+  virtual uint opt_shortcut_jump(sp_head *sp, sp_instr *start)
+  {
+    return m_ip;
+  }
+
   virtual uint opt_mark(sp_head *sp, List<sp_instr> *leads);
 
 private:

From cc33cf29834abff0e07dac5f9c0e083c37722267 Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Mon, 7 May 2007 18:24:46 +0400
Subject: [PATCH 23/58] item_func.cc:   Fixed compiler warnings.

sql/item_func.cc:
  Fixed compiler warnings.
---
 sql/item_func.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sql/item_func.cc b/sql/item_func.cc
index e761cf7fb43..7a31b564502 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2328,7 +2328,7 @@ double Item_func_min_max::val_real()
   double value=0.0;
   if (compare_as_dates)
   {
-    ulonglong result;
+    ulonglong result= 0;
     (void)cmp_datetimes(&result);
     return (double)result;
   }
@@ -2355,7 +2355,7 @@ longlong Item_func_min_max::val_int()
   longlong value=0;
   if (compare_as_dates)
   {
-    ulonglong result;
+    ulonglong result= 0;
     (void)cmp_datetimes(&result);
     return (longlong)result;
   }
@@ -2384,7 +2384,7 @@ my_decimal *Item_func_min_max::val_decimal(my_decimal *dec)
 
   if (compare_as_dates)
   {
-    ulonglong value;
+    ulonglong value= 0;
     (void)cmp_datetimes(&value);
     ulonglong2decimal(value, dec);
     return dec;

From 0fd2b3ddc6535334cb52e600e3e7636c77d0e4af Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Mon, 7 May 2007 22:20:43 +0400
Subject: [PATCH 24/58] Bug#28133: Wrong DATE/DATETIME comparison in IN()
 function.

The IN function was comparing DATE/DATETIME values either as ints or as
strings. Both methods have their disadvantages and may lead to a wrong
result.

Now IN function checks whether all of its arguments has the STRING result
types and at least one of them is a DATE/DATETIME item. If so it uses either
an object of the in_datetime class or an object of the cmp_item_datetime
class to perform its work. If the IN() function arguments are rows then
row columns are checked whether the DATE/DATETIME comparator should be used
to compare them.
The in_datetime class is used to find occurence of the item to be checked
in the vector of the constant DATE/DATETIME values. The cmp_item_datetime
class is used to compare items one by one in the DATE/DATETIME context.
Both classes obtain values from items with help of the get_datetime_value()
function and cache the left item if it is a constant one.



mysql-test/t/type_datetime.test:
  Added a test case for the bug#28133: Wrong DATE/DATETIME comparison in IN() function.
mysql-test/r/type_datetime.result:
  Added a test case for the bug#28133: Wrong DATE/DATETIME comparison in IN() function.
mysql-test/r/func_in.result:
  A test case result is corrected after the fix for the bug#28133.
sql/item_cmpfunc.h:
  Bug#28133: Wrong DATE/DATETIME comparison in IN() function.
  Two DATE/DATETIME comparison classes are added.
  The in_datetime class is used to find occurence of the item to be checked
  in the vector of the constant DATE/DATETIME values. The cmp_item_datetime
  class is used to compare items one by one in the DATE/DATETIME context.
  Both classes obtain values from items with help of the get_datetime_value()
  function and cache the left item if it is a constant one.
sql/item_cmpfunc.cc:
  Bug#28133: Wrong DATE/DATETIME comparison in IN() function.
  Now IN function checks whether all of its arguments has the STRING result
  types and at least one of them is a DATE/DATETIME item. If so it uses either
  an object of the in_datetime class or an object of the cmp_item_datetime
  class to perform its work. If the IN() function arguments are rows then
  row columns are checked whether the DATE/DATETIME comparator should be used
  to compare them.
---
 mysql-test/r/func_in.result       |   1 +
 mysql-test/r/type_datetime.result |  46 ++++++
 mysql-test/t/type_datetime.test   |  19 +++
 sql/item_cmpfunc.cc               | 254 ++++++++++++++++++++++++------
 sql/item_cmpfunc.h                | 102 +++++++++---
 5 files changed, 351 insertions(+), 71 deletions(-)

diff --git a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result
index 87855091699..a3e0773649f 100644
--- a/mysql-test/r/func_in.result
+++ b/mysql-test/r/func_in.result
@@ -467,6 +467,7 @@ CREATE TABLE t4 (a DATE);
 INSERT INTO t4 VALUES ('1972-02-06'), ('1972-07-29');
 SELECT * FROM t4 WHERE a IN ('1972-02-06','19772-07-29');
 a
+1972-02-06
 Warnings:
 Warning	1292	Incorrect date value: '19772-07-29' for column 'a' at row 1
 DROP TABLE t1,t2,t3,t4;
diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result
index f5ff3369c8b..0d03446c7eb 100644
--- a/mysql-test/r/type_datetime.result
+++ b/mysql-test/r/type_datetime.result
@@ -266,3 +266,49 @@ f2
 SELECT 1 from dual where NOW() BETWEEN CURRENT_DATE() - INTERVAL 1 DAY AND CURRENT_DATE();
 1
 drop table t1;
+create table t1 (f1 date);
+insert into t1 values('01-01-01'),('01-01-02'),('01-01-03');
+select * from t1 where f1 in ('01-01-01','2001-01-02','2001-01-03 00:00:00');
+f1
+2001-01-01
+2001-01-02
+2001-01-03
+create table t2(f2 datetime);
+insert into t2 values('01-01-01 00:00:00'),('01-02-03 12:34:56'),('02-04-06 11:22:33');
+select * from t2 where f2 in ('01-01-01','01-02-03 12:34:56','01-02-03');
+f2
+2001-01-01 00:00:00
+2001-02-03 12:34:56
+select * from t1,t2 where '01-01-02' in (f1, cast(f2 as date));
+f1	f2
+2001-01-02	2001-01-01 00:00:00
+2001-01-02	2001-02-03 12:34:56
+2001-01-02	2002-04-06 11:22:33
+select * from t1,t2 where '01-01-01' in (f1, '01-02-03');
+f1	f2
+2001-01-01	2001-01-01 00:00:00
+2001-01-01	2001-02-03 12:34:56
+2001-01-01	2002-04-06 11:22:33
+select * from t1,t2 where if(1,'01-02-03 12:34:56','') in (f1, f2);
+f1	f2
+2001-01-01	2001-02-03 12:34:56
+2001-01-02	2001-02-03 12:34:56
+2001-01-03	2001-02-03 12:34:56
+create table t3(f3 varchar(20));
+insert into t3 select * from t2;
+select * from t2,t3 where f2 in (f3,'03-04-05');
+f2	f3
+2001-01-01 00:00:00	2001-01-01 00:00:00
+2001-02-03 12:34:56	2001-02-03 12:34:56
+2002-04-06 11:22:33	2002-04-06 11:22:33
+select f1,f2,f3 from t1,t2,t3 where (f1,'1') in ((f2,'1'),(f3,'1'));
+f1	f2	f3
+2001-01-01	2001-01-01 00:00:00	2001-01-01 00:00:00
+2001-01-01	2001-02-03 12:34:56	2001-01-01 00:00:00
+2001-01-01	2002-04-06 11:22:33	2001-01-01 00:00:00
+2001-01-01	2001-01-01 00:00:00	2001-02-03 12:34:56
+2001-01-01	2001-01-01 00:00:00	2002-04-06 11:22:33
+select f1 from t1 where ('1',f1) in (('1','01-01-01'),('1','2001-1-1 0:0:0'),('1','02-02-02'));
+f1
+2001-01-01
+drop table t1,t2,t3;
diff --git a/mysql-test/t/type_datetime.test b/mysql-test/t/type_datetime.test
index 2c38b3ea9e3..90ca1ce9832 100644
--- a/mysql-test/t/type_datetime.test
+++ b/mysql-test/t/type_datetime.test
@@ -180,3 +180,22 @@ select f2, f3 from t1 where '01-03-10' between f2 and f3;
 select f2 from t1 where DATE(f2) between "2001-4-15" AND "01-4-15";
 SELECT 1 from dual where NOW() BETWEEN CURRENT_DATE() - INTERVAL 1 DAY AND CURRENT_DATE();
 drop table t1;
+
+#
+# Bug#28133: Wrong DATE/DATETIME comparison in IN() function.
+#
+create table t1 (f1 date);
+insert into t1 values('01-01-01'),('01-01-02'),('01-01-03');
+select * from t1 where f1 in ('01-01-01','2001-01-02','2001-01-03 00:00:00');
+create table t2(f2 datetime);
+insert into t2 values('01-01-01 00:00:00'),('01-02-03 12:34:56'),('02-04-06 11:22:33');
+select * from t2 where f2 in ('01-01-01','01-02-03 12:34:56','01-02-03');
+select * from t1,t2 where '01-01-02' in (f1, cast(f2 as date));
+select * from t1,t2 where '01-01-01' in (f1, '01-02-03');
+select * from t1,t2 where if(1,'01-02-03 12:34:56','') in (f1, f2);
+create table t3(f3 varchar(20));
+insert into t3 select * from t2;
+select * from t2,t3 where f2 in (f3,'03-04-05');
+select f1,f2,f3 from t1,t2,t3 where (f1,'1') in ((f2,'1'),(f3,'1'));
+select f1 from t1 where ('1',f1) in (('1','01-01-01'),('1','2001-1-1 0:0:0'),('1','02-02-02'));
+drop table t1,t2,t3;
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 169c017c914..5127336f4f9 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -780,7 +780,7 @@ get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
       MYSQL_TYPE_DATE ? MYSQL_TIMESTAMP_DATE : MYSQL_TIMESTAMP_DATETIME;
     value= get_date_from_str(thd, str, t_type, warn_item->name, &error);
   }
-  if (item->const_item())
+  if (item->const_item() && cache_arg)
   {
     Item_cache_int *cache= new Item_cache_int();
     /* Mark the cache as non-const to prevent re-caching. */
@@ -2785,7 +2785,6 @@ in_row::in_row(uint elements, Item * item)
   base= (char*) new cmp_item_row[count= elements];
   size= sizeof(cmp_item_row);
   compare= (qsort2_cmp) cmp_row;
-  tmp.store_value(item);
   /*
     We need to reset these as otherwise we will call sort() with
     uninitialized (even if not used) elements
@@ -2837,6 +2836,27 @@ byte *in_longlong::get_value(Item *item)
   return (byte*) &tmp;
 }
 
+void in_datetime::set(uint pos,Item *item)
+{
+  Item **tmp= &item;
+  bool is_null;
+  struct packed_longlong *buff= &((packed_longlong*) base)[pos];
+
+  buff->val= get_datetime_value(thd, &tmp, 0, warn_item, &is_null);
+  buff->unsigned_flag= 1L;
+}
+
+byte *in_datetime::get_value(Item *item)
+{
+  bool is_null;
+  Item **tmp_item= lval_cache ? &lval_cache : &item;
+  tmp.val= get_datetime_value(thd, &tmp_item, &lval_cache, warn_item, &is_null);
+  if (item->null_value)
+    return 0;
+  tmp.unsigned_flag= 1L;
+  return (byte*) &tmp;
+}
+
 in_double::in_double(uint elements)
   :in_vector(elements,sizeof(double),(qsort2_cmp) cmp_double, 0)
 {}
@@ -2941,12 +2961,18 @@ cmp_item_row::~cmp_item_row()
 }
 
 
+void cmp_item_row::alloc_comparators()
+{
+  if (!comparators)
+    comparators= (cmp_item **) current_thd->calloc(sizeof(cmp_item *)*n);
+}
+
+
 void cmp_item_row::store_value(Item *item)
 {
   DBUG_ENTER("cmp_item_row::store_value");
   n= item->cols();
-  if (!comparators)
-    comparators= (cmp_item **) current_thd->calloc(sizeof(cmp_item *)*n);
+  alloc_comparators();
   if (comparators)
   {
     item->bring_value();
@@ -3058,6 +3084,36 @@ cmp_item* cmp_item_decimal::make_same()
 }
 
 
+void cmp_item_datetime::store_value(Item *item)
+{
+  bool is_null;
+  Item **tmp_item= lval_cache ? &lval_cache : &item;
+  value= get_datetime_value(thd, &tmp_item, &lval_cache, warn_item, &is_null);
+}
+
+
+int cmp_item_datetime::cmp(Item *arg)
+{
+  bool is_null;
+  Item **tmp_item= &arg;
+  return value !=
+    get_datetime_value(thd, &tmp_item, 0, warn_item, &is_null);
+}
+
+
+int cmp_item_datetime::compare(cmp_item *ci)
+{
+  cmp_item_datetime *l_cmp= (cmp_item_datetime *)ci;
+  return (value < l_cmp->value) ? -1 : ((value == l_cmp->value) ? 0 : 1);
+}
+
+
+cmp_item *cmp_item_datetime::make_same()
+{
+  return new cmp_item_datetime(warn_item);
+}
+
+
 bool Item_func_in::nulls_in_row()
 {
   Item **arg,**arg_end;
@@ -3133,7 +3189,11 @@ void Item_func_in::fix_length_and_dec()
   Item **arg, **arg_end;
   uint const_itm= 1;
   THD *thd= current_thd;
-  
+  bool datetime_found= FALSE;
+  /* TRUE <=> arguments values will be compared as DATETIMEs. */
+  bool compare_as_datetime= FALSE;
+  Item *date_arg= 0;
+
   if (agg_cmp_type(thd, &cmp_type, args, arg_count))
     return;
 
@@ -3149,58 +3209,148 @@ void Item_func_in::fix_length_and_dec()
       break;
     }
   }
+  /*
+    When comparing rows create the row comparator object beforehand to ease
+    the DATETIME comparison detection procedure.
+  */
+  if (cmp_type == ROW_RESULT)
+  {
+    cmp_item_row *cmp= 0;
+    if (const_itm && !nulls_in_row())
+    {
+      array= new in_row(arg_count-1, 0);
+      cmp= &((in_row*)array)->tmp;
+    }
+    else
+    {
+      if (!(cmp= new cmp_item_row))
+        return;
+      in_item= cmp;
+    }
+    cmp->n= args[0]->cols();
+    cmp->alloc_comparators();
+  }
+  /* All DATE/DATETIME fields/functions has the STRING result type. */
+  if (cmp_type == STRING_RESULT || cmp_type == ROW_RESULT)
+  {
+    uint col, cols= args[0]->cols();
 
+    for (col= 0; col < cols; col++)
+    {
+      bool skip_column= FALSE;
+      /*
+        Check that all items to be compared has the STRING result type and at
+        least one of them is a DATE/DATETIME item.
+      */
+      for (arg= args, arg_end= args + arg_count; arg != arg_end ; arg++)
+      {
+        Item *itm= ((cmp_type == STRING_RESULT) ? arg[0] :
+                    arg[0]->element_index(col));
+        if (itm->result_type() != STRING_RESULT)
+        {
+          skip_column= TRUE;
+          break;
+        }
+        else if (itm->is_datetime())
+        {
+          datetime_found= TRUE;
+          /*
+            Internally all DATE/DATETIME values are converted to the DATETIME
+            type. So try to find a DATETIME item to issue correct warnings.
+          */
+          if (!date_arg)
+            date_arg= itm;
+          else if (itm->field_type() == MYSQL_TYPE_DATETIME)
+          {
+            date_arg= itm;
+            /* All arguments are already checked to have the STRING result. */
+            if (cmp_type == STRING_RESULT)
+              break;
+          }
+        }
+      }
+      if (skip_column)
+        continue;
+      if (datetime_found)
+      {
+        if (cmp_type == ROW_RESULT)
+        {
+          cmp_item **cmp= 0;
+          if (array)
+            cmp= ((in_row*)array)->tmp.comparators + col;
+          else
+            cmp= ((cmp_item_row*)in_item)->comparators + col;
+          *cmp= new cmp_item_datetime(date_arg);
+          /* Reset variables for the next column. */
+          date_arg= 0;
+          datetime_found= FALSE;
+        }
+        else
+          compare_as_datetime= TRUE;
+      }
+    }
+  }
   /*
     Row item with NULLs inside can return NULL or FALSE => 
     they can't be processed as static
   */
   if (const_itm && !nulls_in_row())
   {
-    /*
-      IN must compare INT/DATE/DATETIME/TIMESTAMP columns and constants
-      as int values (the same way as equality does).
-      So we must check here if the column on the left and all the constant 
-      values on the right can be compared as integers and adjust the 
-      comparison type accordingly.
-    */  
-    if (args[0]->real_item()->type() == FIELD_ITEM &&
-        thd->lex->sql_command != SQLCOM_CREATE_VIEW &&
-        thd->lex->sql_command != SQLCOM_SHOW_CREATE &&
-        cmp_type != INT_RESULT)
+    if (compare_as_datetime)
+      array= new in_datetime(date_arg, arg_count - 1);
+    else
     {
-      Field *field= ((Item_field*) (args[0]->real_item()))->field;
-      if (field->can_be_compared_as_longlong())
+      /*
+        IN must compare INT columns and constants as int values (the same
+        way as equality does).
+        So we must check here if the column on the left and all the constant 
+        values on the right can be compared as integers and adjust the 
+        comparison type accordingly.
+      */  
+      if (args[0]->real_item()->type() == FIELD_ITEM &&
+          thd->lex->sql_command != SQLCOM_CREATE_VIEW &&
+          thd->lex->sql_command != SQLCOM_SHOW_CREATE &&
+          cmp_type != INT_RESULT)
       {
-        bool all_converted= TRUE;
-        for (arg=args+1, arg_end=args+arg_count; arg != arg_end ; arg++)
+        Field *field= ((Item_field*) (args[0]->real_item()))->field;
+        if (field->can_be_compared_as_longlong())
         {
-          if (!convert_constant_item (thd, field, &arg[0]))
-            all_converted= FALSE;
+          bool all_converted= TRUE;
+          for (arg=args+1, arg_end=args+arg_count; arg != arg_end ; arg++)
+          {
+            if (!convert_constant_item (thd, field, &arg[0]))
+              all_converted= FALSE;
+          }
+          if (all_converted)
+            cmp_type= INT_RESULT;
         }
-        if (all_converted)
-          cmp_type= INT_RESULT;
       }
-    }
-    switch (cmp_type) {
-    case STRING_RESULT:
-      array=new in_string(arg_count-1,(qsort2_cmp) srtcmp_in, 
-			  cmp_collation.collation);
-      break;
-    case INT_RESULT:
-      array= new in_longlong(arg_count-1);
-      break;
-    case REAL_RESULT:
-      array= new in_double(arg_count-1);
-      break;
-    case ROW_RESULT:
-      array= new in_row(arg_count-1, args[0]);
-      break;
-    case DECIMAL_RESULT:
-      array= new in_decimal(arg_count - 1);
-      break;
-    default:
-      DBUG_ASSERT(0);
-      return;
+      switch (cmp_type) {
+      case STRING_RESULT:
+        array=new in_string(arg_count-1,(qsort2_cmp) srtcmp_in, 
+                            cmp_collation.collation);
+        break;
+      case INT_RESULT:
+        array= new in_longlong(arg_count-1);
+        break;
+      case REAL_RESULT:
+        array= new in_double(arg_count-1);
+        break;
+      case ROW_RESULT:
+        /*
+          The row comparator was created at the beginning but only DATETIME
+          items comparators were initialized. Call store_value() to setup
+          others.
+        */
+        ((in_row*)array)->tmp.store_value(args[0]);
+        break;
+      case DECIMAL_RESULT:
+        array= new in_decimal(arg_count - 1);
+        break;
+      default:
+        DBUG_ASSERT(0);
+        return;
+      }
     }
     if (array && !(thd->is_fatal_error))		// If not EOM
     {
@@ -3219,7 +3369,19 @@ void Item_func_in::fix_length_and_dec()
   }
   else
   {
-    in_item= cmp_item::get_comparator(cmp_type, cmp_collation.collation);
+    if (in_item)
+    {
+      /*
+        The row comparator was created at the beginning but only DATETIME
+        items comparators were initialized. Call store_value() to setup
+        others.
+      */
+      in_item->store_value(args[0]);
+    }
+    else if (compare_as_datetime)
+      in_item= new cmp_item_datetime(date_arg);
+    else
+      in_item= cmp_item::get_comparator(cmp_type, cmp_collation.collation);
     if (cmp_type  == STRING_RESULT)
       in_item->cmp_charset= cmp_collation.collation;
   }
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 761ca90d0a7..79091b9c87d 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -833,6 +833,7 @@ public:
 
 class in_longlong :public in_vector
 {
+protected:
   /*
     Here we declare a temporary variable (tmp) of the same type as the
     elements of this vector. tmp is used in finding if a given value is in 
@@ -866,6 +867,30 @@ public:
   friend int cmp_longlong(void *cmp_arg, packed_longlong *a,packed_longlong *b);
 };
 
+
+/*
+  Class to represent a vector of constant DATE/DATETIME values.
+  Values are obtained with help of the get_datetime_value() function.
+  If the left item is a constant one then its value is cached in the
+  lval_cache variable.
+*/
+class in_datetime :public in_longlong
+{
+public:
+  THD *thd;
+  /* An item used to issue warnings. */
+  Item *warn_item;
+  /* Cache for the left item. */
+  Item *lval_cache;
+
+  in_datetime(Item *warn_item_arg, uint elements)
+    :in_longlong(elements), thd(current_thd), warn_item(warn_item_arg),
+     lval_cache(0) {};
+  void set(uint pos,Item *item);
+  byte *get_value(Item *item);
+  friend int cmp_longlong(void *cmp_arg, packed_longlong *a,packed_longlong *b);
+};
+
 class in_double :public in_vector
 {
   double tmp;
@@ -986,6 +1011,30 @@ public:
   cmp_item *make_same();
 };
 
+/*
+  Compare items in the DATETIME context.
+  Values are obtained with help of the get_datetime_value() function.
+  If the left item is a constant one then its value is cached in the
+  lval_cache variable.
+*/
+class cmp_item_datetime :public cmp_item
+{
+  ulonglong value;
+public:
+  THD *thd;
+  /* Item used for issuing warnings. */
+  Item *warn_item;
+  /* Cache for the left item. */
+  Item *lval_cache;
+
+  cmp_item_datetime(Item *warn_item_arg)
+    :thd(current_thd), warn_item(warn_item_arg), lval_cache(0) {}
+  void store_value(Item *item);
+  int cmp(Item *arg);
+  int compare(cmp_item *ci);
+  cmp_item *make_same();
+};
+
 class cmp_item_real :public cmp_item
 {
   double value;
@@ -1020,31 +1069,6 @@ public:
 };
 
 
-class cmp_item_row :public cmp_item
-{
-  cmp_item **comparators;
-  uint n;
-public:
-  cmp_item_row(): comparators(0), n(0) {}
-  ~cmp_item_row();
-  void store_value(Item *item);
-  int cmp(Item *arg);
-  int compare(cmp_item *arg);
-  cmp_item *make_same();
-  void store_value_by_template(cmp_item *tmpl, Item *);
-};
-
-
-class in_row :public in_vector
-{
-  cmp_item_row tmp;
-public:
-  in_row(uint elements, Item *);
-  ~in_row();
-  void set(uint pos,Item *item);
-  byte *get_value(Item *item);
-};
-
 /* 
    cmp_item for optimized IN with row (right part string, which never
    be changed)
@@ -1120,6 +1144,34 @@ public:
   CHARSET_INFO *compare_collation() { return cmp_collation.collation; }
 };
 
+class cmp_item_row :public cmp_item
+{
+  cmp_item **comparators;
+  uint n;
+public:
+  cmp_item_row(): comparators(0), n(0) {}
+  ~cmp_item_row();
+  void store_value(Item *item);
+  inline void alloc_comparators();
+  int cmp(Item *arg);
+  int compare(cmp_item *arg);
+  cmp_item *make_same();
+  void store_value_by_template(cmp_item *tmpl, Item *);
+  friend void Item_func_in::fix_length_and_dec();
+};
+
+
+class in_row :public in_vector
+{
+  cmp_item_row tmp;
+public:
+  in_row(uint elements, Item *);
+  ~in_row();
+  void set(uint pos,Item *item);
+  byte *get_value(Item *item);
+  friend void Item_func_in::fix_length_and_dec();
+};
+
 /* Functions used by where clause */
 
 class Item_func_isnull :public Item_bool_func

From 35659a285d3bf1c18798cd2819c18d3d6fca8e55 Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Tue, 8 May 2007 00:24:25 +0500
Subject: [PATCH 25/58] Fixed bug #27954. This bug affects multi-row INSERT ...
 ON DUPLICATE into table with PRIMARY KEY of AUTO_INCREMENT field and some
 additional UNIQUE indices. If the first row in multi-row INSERT contains
 duplicated values of UNIQUE indices, then following rows of multi-row INSERT
 (with either duplicated or unique key field values) may me applied to
 _arbitrary_ records of table as updates. This bug was introduced in 5.0.
 Related code was widely rewritten in 5.1, and 5.1 is already free of this
 problem. 4.1 was not affected too.

When updating the row during INSERT ON DUPLICATE KEY UPDATE, we called
restore_auto_increment(), which set next_insert_id back to 0, but we
forgot to set clear_next_insert_id back to 0.
restore_auto_increment() function has been fixed.


sql/sql_class.h:
  Fixed bug #27954.
  Added commentary for THD::clear_next_insert_id variable.
sql/handler.cc:
  Fixed bug #27954.
  When updating the row during INSERT ON DUPLICATE KEY UPDATE, we called
  restore_auto_increment(), which set next_insert_id back to 0, but we
  forgot to set clear_next_insert_id back to 0.
  restore_auto_increment() function has been fixed.
mysql-test/t/insert_update.test:
  Added test case for bug #27954.
mysql-test/r/insert_update.result:
  Added test case for bug #27954.
---
 mysql-test/r/insert_update.result | 22 ++++++++++++++++++++++
 mysql-test/t/insert_update.test   | 17 +++++++++++++++++
 sql/handler.cc                    |  7 +++++++
 sql/sql_class.h                   |  4 ++++
 4 files changed, 50 insertions(+)

diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result
index fd70fcb9084..4a3e87d9d48 100644
--- a/mysql-test/r/insert_update.result
+++ b/mysql-test/r/insert_update.result
@@ -336,3 +336,25 @@ id	f1
 0	test1
 DROP TABLE t1;
 SET SQL_MODE='';
+CREATE TABLE t1 (
+id INT AUTO_INCREMENT PRIMARY KEY,
+c1 CHAR(1) UNIQUE KEY,
+cnt INT DEFAULT 1
+);
+INSERT INTO t1 (c1) VALUES ('A'), ('B'), ('C');
+SELECT * FROM t1;
+id	c1	cnt
+1	A	1
+2	B	1
+3	C	1
+INSERT  INTO t1 (c1) VALUES ('A'), ('X'), ('Y'), ('Z')
+ON DUPLICATE KEY UPDATE cnt=cnt+1;
+SELECT * FROM t1;
+id	c1	cnt
+1	A	2
+2	B	1
+3	C	1
+4	X	1
+5	Y	1
+6	Z	1
+DROP TABLE t1;
diff --git a/mysql-test/t/insert_update.test b/mysql-test/t/insert_update.test
index 76df4502769..0e199dab4bd 100644
--- a/mysql-test/t/insert_update.test
+++ b/mysql-test/t/insert_update.test
@@ -247,3 +247,20 @@ REPLACE INTO t1 VALUES (0,"test1",null);
 SELECT id, f1 FROM t1;
 DROP TABLE t1;
 SET SQL_MODE='';
+
+#
+# Bug#27954: multi-row INSERT ... ON DUPLICATE with duplicated
+# row at the first place into table with AUTO_INCREMENT and
+# additional UNIQUE key.
+#
+CREATE TABLE t1 (
+  id INT AUTO_INCREMENT PRIMARY KEY,
+  c1 CHAR(1) UNIQUE KEY,
+  cnt INT DEFAULT 1
+);
+INSERT INTO t1 (c1) VALUES ('A'), ('B'), ('C');
+SELECT * FROM t1;
+INSERT  INTO t1 (c1) VALUES ('A'), ('X'), ('Y'), ('Z')
+  ON DUPLICATE KEY UPDATE cnt=cnt+1;
+SELECT * FROM t1;
+DROP TABLE t1;
diff --git a/sql/handler.cc b/sql/handler.cc
index c6c31593a5f..867ac7ff778 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1685,7 +1685,14 @@ void handler::restore_auto_increment()
 {
   THD *thd= table->in_use;
   if (thd->next_insert_id)
+  {
     thd->next_insert_id= thd->prev_insert_id;
+    if (thd->next_insert_id == 0)
+    {
+      /* we didn't generate a value, engine will be called again */
+      thd->clear_next_insert_id= 0;
+    }
+  }
 }
 
 
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 12d7cb2368f..7dd46e2efe7 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1431,6 +1431,10 @@ public:
   */
   bool       insert_id_used;
 
+  /* 
+    clear_next_insert_id is set if engine was called at least once
+    for this statement to generate auto_increment value.
+  */
   bool       clear_next_insert_id;
   /* for IS NULL => = last_insert_id() fix in remove_eq_conds() */
   bool       substitute_null_with_insert_id;

From dd3f1be8374cf8c48e74c2975fa9c6f770642da9 Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Tue, 8 May 2007 00:08:00 +0400
Subject: [PATCH 26/58] Additional fix for the bug#27759: Wrong DATE/DATETIME
 comparison in LEAST()/GREATEST() functions.

mysql-test/t/type_datetime.test:
  Additional test case for the bug#27759.
sql/item_func.h:
  Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
  Now the Item_func_min_max::result_as_longlong() returns TRUE when LEAST()
  compares DATE/DATETIME values. This allows caller to obtain correct integer
  values through the val_int() function.
---
 mysql-test/t/type_datetime.test | 2 ++
 sql/item_func.h                 | 1 +
 2 files changed, 3 insertions(+)

diff --git a/mysql-test/t/type_datetime.test b/mysql-test/t/type_datetime.test
index d0fcf9c57de..5eb9d317a8c 100644
--- a/mysql-test/t/type_datetime.test
+++ b/mysql-test/t/type_datetime.test
@@ -206,6 +206,8 @@ select greatest(cast('01-01-01' as date), '01-01-02');
 select least(cast('01-01-01' as date), '01-01-02') + 0;
 select greatest(cast('01-01-01' as date), '01-01-02') + 0;
 select least(cast('01-01-01' as datetime), '01-01-02') + 0;
+select cast(least(cast('01-01-01' as datetime), '01-01-02') as signed);
+select cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal);
 --disable_warnings
 DROP PROCEDURE IF EXISTS test27759 ;
 --enable_warnings
diff --git a/sql/item_func.h b/sql/item_func.h
index 952c828b251..0443e394585 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -703,6 +703,7 @@ public:
   my_decimal *val_decimal(my_decimal *);
   void fix_length_and_dec();
   enum Item_result result_type () const { return cmp_type; }
+  bool result_as_longlong() { return compare_as_dates; };
   uint cmp_datetimes(ulonglong *value);
 };
 

From be5ff3e2ba4ddf32241348de6184be0172d34a37 Mon Sep 17 00:00:00 2001
From: unknown <igor@olga.mysql.com>
Date: Mon, 7 May 2007 16:58:38 -0700
Subject: [PATCH 27/58] Adjusted results after the latest addition of test
 cases.

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

diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result
index 0316ed7e428..8e671597bca 100644
--- a/mysql-test/r/type_datetime.result
+++ b/mysql-test/r/type_datetime.result
@@ -325,6 +325,12 @@ greatest(cast('01-01-01' as date), '01-01-02') + 0
 select least(cast('01-01-01' as datetime), '01-01-02') + 0;
 least(cast('01-01-01' as datetime), '01-01-02') + 0
 20010101000000
+select cast(least(cast('01-01-01' as datetime), '01-01-02') as signed);
+cast(least(cast('01-01-01' as datetime), '01-01-02') as signed)
+20010101000000
+select cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal);
+cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal)
+20010101000000.00
 DROP PROCEDURE IF EXISTS test27759 ;
 CREATE PROCEDURE test27759()
 BEGIN

From 3962e2d47271aee3a0e115145767a2cbc25b26f8 Mon Sep 17 00:00:00 2001
From: unknown <jonas@perch.ndb.mysql.com>
Date: Tue, 8 May 2007 07:49:05 +0200
Subject: [PATCH 28/58] ndb - bug#27437   bug in interpretedupdate (used for
 auto-increment) that made TUPKEYREF be sent twice   this was however
 "normally" shadowed, but made LQH crash when LCP was about to start

mysql-test/r/ndb_basic.result:
  testcase
mysql-test/t/ndb_basic.test:
  testcase
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  make sure TUPKEYREF is not sent twice in case of "error" in interpreted program
---
 mysql-test/r/ndb_basic.result                  |  6 ++++++
 mysql-test/t/ndb_basic.test                    | 15 +++++++++++++++
 ndb/src/kernel/blocks/dblqh/Dblqh.hpp          |  3 +++
 ndb/src/kernel/blocks/dblqh/DblqhMain.cpp      | 17 +++++++++++++++++
 ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp |  6 +++++-
 5 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result
index 09c4f9b29f9..91427701c05 100644
--- a/mysql-test/r/ndb_basic.result
+++ b/mysql-test/r/ndb_basic.result
@@ -667,6 +667,12 @@ counter	datavalue
 57	newval
 58	newval
 drop table t1;
+create table t1 (a int primary key auto_increment) engine = ndb;
+insert into t1() values (),(),(),(),(),(),(),(),(),(),(),();
+insert into t1(a) values (20),(28);
+insert into t1() values (),(),(),(),(),(),(),(),(),(),(),();
+insert into t1() values (21), (22);
+drop table t1;
 CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;
 select * from t1;
 b
diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index 5d79d5eb9f9..5b13eab546e 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/mysql-test/t/ndb_basic.test
@@ -606,6 +606,21 @@ select * from t1 order by counter;
 
 drop table t1;
 
+#
+# bug#27437
+connection con1;
+create table t1 (a int primary key auto_increment) engine = ndb;
+insert into t1() values (),(),(),(),(),(),(),(),(),(),(),();
+connection con2;
+insert into t1(a) values (20),(28);
+connection con1;
+insert into t1() values (),(),(),(),(),(),(),(),(),(),(),();
+connection con2;
+insert into t1() values (21), (22);
+connection con1;
+
+drop table t1;
+
 #
 # BUG#14514 Creating table with packed key fails silently
 #
diff --git a/ndb/src/kernel/blocks/dblqh/Dblqh.hpp b/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
index 0691e52d0ee..3c0faff7236 100644
--- a/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
+++ b/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
@@ -2059,6 +2059,9 @@ public:
     Uint8 simpleRead;
     Uint8 seqNoReplica;
     Uint8 tcNodeFailrec;
+#ifdef VM_TRACE
+    Uint8 tupkeyref;
+#endif
   }; /* p2c: size = 280 bytes */
   
   typedef Ptr<TcConnectionrec> TcConnectionrecPtr;
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 5847e1063aa..b8ab0eec902 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -2766,6 +2766,12 @@ void Dblqh::execTUPKEYREF(Signal* signal)
   tcConnectptr.i = tupKeyRef->userRef;
   terrorCode = tupKeyRef->errorCode;
   ptrCheckGuard(tcConnectptr, ctcConnectrecFileSize, tcConnectionrec);
+
+#ifdef VM_TRACE
+  ndbrequire(tcConnectptr.p->tupkeyref == 0);
+  tcConnectptr.p->tupkeyref = 1;
+#endif
+
   switch (tcConnectptr.p->transactionState) {
   case TcConnectionrec::WAIT_TUP:
     jam();
@@ -3331,6 +3337,10 @@ void Dblqh::seizeTcrec()
   locTcConnectptr.p->tcTimer = cLqhTimeOutCount;
   locTcConnectptr.p->tableref = RNIL;
   locTcConnectptr.p->savePointId = 0;
+#ifdef VM_TRACE
+  locTcConnectptr.p->tupkeyref = 0;
+#endif
+
   cfirstfreeTcConrec = nextTc;
   tcConnectptr = locTcConnectptr;
   locTcConnectptr.p->connectState = TcConnectionrec::CONNECTED;
@@ -5861,6 +5871,10 @@ void Dblqh::completeUnusualLab(Signal* signal)
 void Dblqh::releaseTcrec(Signal* signal, TcConnectionrecPtr locTcConnectptr) 
 {
   jam();
+#ifdef VM_TRACE
+  locTcConnectptr.p->tupkeyref = 0;
+#endif
+
   locTcConnectptr.p->tcTimer = 0;
   locTcConnectptr.p->transactionState = TcConnectionrec::TC_NOT_CONNECTED;
   locTcConnectptr.p->nextTcConnectrec = cfirstfreeTcConrec;
@@ -5883,6 +5897,9 @@ void Dblqh::releaseTcrec(Signal* signal, TcConnectionrecPtr locTcConnectptr)
 void Dblqh::releaseTcrecLog(Signal* signal, TcConnectionrecPtr locTcConnectptr) 
 {
   jam();
+#ifdef VM_TRACE
+  locTcConnectptr.p->tupkeyref = 0;
+#endif
   locTcConnectptr.p->tcTimer = 0;
   locTcConnectptr.p->transactionState = TcConnectionrec::TC_NOT_CONNECTED;
   locTcConnectptr.p->nextTcConnectrec = cfirstfreeTcConrec;
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
index 15ce54e594c..a94d2f70343 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
@@ -1139,7 +1139,11 @@ Dbtup::updateStartLab(Signal* signal,
                                 regOperPtr->attrinbufLen);
   } else {
     jam();
-    retValue = interpreterStartLab(signal, pagePtr, regOperPtr->pageOffset);
+    if (interpreterStartLab(signal, pagePtr, regOperPtr->pageOffset) == -1)
+    {
+      jam();
+      return -1;
+    }
   }//if
 
   if (retValue == -1) {

From ed9474993de9b073225d33020e2864d67a065a24 Mon Sep 17 00:00:00 2001
From: unknown <thek@adventure.(none)>
Date: Tue, 8 May 2007 09:09:25 +0200
Subject: [PATCH 29/58] Bug #27792 query cache returns wrong result, with
 certain system variables  - Queries in the query cache are identified by the
 individual    characters in the query statement, the current database and   
 the current environment expressed as a set of system variable    flags.  -
 Since the set of environment flags didn't properly describe the    current
 environment unexpected results were returned from the    query cache.  -
 Query cache is now cleared when the variable ft_boolean_syntax is    updated.
  - An identification flag for the variable default_week_format is    added to
 the query cache record.

Thanks to Martin Friebe who has supplied significant parts of this patch.


mysql-test/r/query_cache.result:
  Added test case
mysql-test/t/query_cache.test:
  Added test case
sql/mysql_priv.h:
  - Added missing flags to reflect the significant local environment
    settings of the cached query.
sql/set_var.cc:
  - Added query cache flush when system variable ft_boolean_syntax is
    updated since this also invalidates all cached result sets using this
    variable.
sql/sql_cache.cc:
  - Added another local system variable as an identification flag
    for cached queries.
---
 mysql-test/r/query_cache.result | 52 +++++++++++++++++++++++++++++++++
 mysql-test/t/query_cache.test   | 46 +++++++++++++++++++++++++++++
 sql/mysql_priv.h                |  1 +
 sql/set_var.cc                  |  8 +++--
 sql/sql_cache.cc                |  2 ++
 5 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index 24363ea27ab..4d0c262898b 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -1008,3 +1008,55 @@ Variable_name	Value
 Qcache_hits	1
 drop table t1;
 set GLOBAL query_cache_size=0;
+create table t1 (a int);
+insert into t1 values (1),(2),(3);
+set GLOBAL query_cache_type=1;
+set GLOBAL query_cache_limit=10000;
+set GLOBAL query_cache_min_res_unit=0;
+set GLOBAL query_cache_size= 100000;
+reset query cache;
+set LOCAL default_week_format = 0;
+select week('2007-01-04');
+week('2007-01-04')
+0
+select week('2007-01-04') from t1;
+week('2007-01-04')
+0
+0
+0
+set LOCAL default_week_format = 2;
+select week('2007-01-04');
+week('2007-01-04')
+53
+select week('2007-01-04') from t1;
+week('2007-01-04')
+53
+53
+53
+drop table t1;
+CREATE TABLE t1 (a VARCHAR(200), b TEXT, FULLTEXT (a,b));
+INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),
+('Full-text indexes', 'are called collections'),
+('Only MyISAM tables','support collections'),
+('Function MATCH ... AGAINST()','is used to do a search'),
+('Full-text search in MySQL', 'implements vector space model');
+set GLOBAL ft_boolean_syntax='+ -><()~*:""&|';
+select *, MATCH(a,b) AGAINST("+called +collections" IN BOOLEAN MODE) as x from t1;
+a	b	x
+MySQL has now support	for full-text search	0
+Full-text indexes	are called collections	1
+Only MyISAM tables	support collections	0
+Function MATCH ... AGAINST()	is used to do a search	0
+Full-text search in MySQL	implements vector space model	0
+set GLOBAL ft_boolean_syntax='- +><()~*:""&|';
+select *, MATCH(a,b) AGAINST("+called +collections" IN BOOLEAN MODE) as x from t1;
+a	b	x
+MySQL has now support	for full-text search	0
+Full-text indexes	are called collections	0
+Only MyISAM tables	support collections	0
+Function MATCH ... AGAINST()	is used to do a search	0
+Full-text search in MySQL	implements vector space model	0
+set GLOBAL query_cache_type=default;
+set GLOBAL query_cache_limit=default;
+set GLOBAL query_cache_min_res_unit=default;
+set GLOBAL query_cache_size=default;
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index 3140739309e..d447df9187b 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -729,4 +729,50 @@ drop table t1;
 
 set GLOBAL query_cache_size=0;
 
+#
+# Bug #27792 query cache returns wrong result, with certain system variables
+#
+
+create table t1 (a int);
+insert into t1 values (1),(2),(3);
+set GLOBAL query_cache_type=1;
+set GLOBAL query_cache_limit=10000;
+set GLOBAL query_cache_min_res_unit=0;
+set GLOBAL query_cache_size= 100000;
+
+# default_week_format
+reset query cache;
+set LOCAL default_week_format = 0;
+select week('2007-01-04');
+select week('2007-01-04') from t1;
+
+set LOCAL default_week_format = 2;
+select week('2007-01-04');
+select week('2007-01-04') from t1;
+
+drop table t1;
+
+CREATE TABLE t1 (a VARCHAR(200), b TEXT, FULLTEXT (a,b));
+INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),
+                       ('Full-text indexes', 'are called collections'),
+                          ('Only MyISAM tables','support collections'),
+             ('Function MATCH ... AGAINST()','is used to do a search'),
+        ('Full-text search in MySQL', 'implements vector space model');
+
+
+set GLOBAL ft_boolean_syntax='+ -><()~*:""&|';
+
+select *, MATCH(a,b) AGAINST("+called +collections" IN BOOLEAN MODE) as x from t1;
+
+# swap +/-
+set GLOBAL ft_boolean_syntax='- +><()~*:""&|';
+
+select *, MATCH(a,b) AGAINST("+called +collections" IN BOOLEAN MODE) as x from t1;
+
+set GLOBAL query_cache_type=default;
+set GLOBAL query_cache_limit=default;
+set GLOBAL query_cache_min_res_unit=default;
+set GLOBAL query_cache_size=default;
+
+
 # End of 4.1 tests
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index e5ac91e1814..6bd60280399 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -426,6 +426,7 @@ struct Query_cache_query_flags
   ulong sql_mode;
   ulong max_sort_length;
   ulong group_concat_max_len;
+  ulong default_week_format;
   MY_LOCALE *lc_time_names;
 };
 #define QUERY_CACHE_FLAGS_SIZE sizeof(Query_cache_query_flags)
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 57bb93ef4b1..520ee5c9f70 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -490,7 +490,7 @@ static sys_var_rand_seed1	sys_rand_seed1("rand_seed1");
 static sys_var_rand_seed2	sys_rand_seed2("rand_seed2");
 
 static sys_var_thd_ulong        sys_default_week_format("default_week_format",
-					                &SV::default_week_format);
+                                                     &SV::default_week_format);
 
 sys_var_thd_ulong               sys_group_concat_max_len("group_concat_max_len",
                                                          &SV::group_concat_max_len);
@@ -992,7 +992,6 @@ bool update_sys_var_str(sys_var_str *var_str, rw_lock_t *var_mutex,
   return 0;
 }
 
-
 static bool sys_update_init_connect(THD *thd, set_var *var)
 {
   return update_sys_var_str(&sys_init_connect, &LOCK_sys_init_connect, var);
@@ -1032,6 +1031,11 @@ static bool sys_update_ftb_syntax(THD *thd, set_var * var)
 {
   strmake(ft_boolean_syntax, var->value->str_value.c_ptr(),
 	  sizeof(ft_boolean_syntax)-1);
+
+#ifdef HAVE_QUERY_CACHE
+  query_cache.flush();
+#endif /* HAVE_QUERY_CACHE */
+
   return 0;
 }
 
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index fc03e03dee7..ee26bda3307 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -813,6 +813,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
     flags.sql_mode= thd->variables.sql_mode;
     flags.max_sort_length= thd->variables.max_sort_length;
     flags.group_concat_max_len= thd->variables.group_concat_max_len;
+    flags.default_week_format= thd->variables.default_week_format;
     flags.lc_time_names= thd->variables.lc_time_names; 
     STRUCT_LOCK(&structure_guard_mutex);
 
@@ -1016,6 +1017,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
   flags.sql_mode= thd->variables.sql_mode;
   flags.max_sort_length= thd->variables.max_sort_length;
   flags.group_concat_max_len= thd->variables.group_concat_max_len;
+  flags.default_week_format= thd->variables.default_week_format;
   flags.lc_time_names= thd->variables.lc_time_names; 
   memcpy((void *)(sql + (tot_length - QUERY_CACHE_FLAGS_SIZE)),
 	 &flags, QUERY_CACHE_FLAGS_SIZE);

From 2c3a4641077264b54f894782170ba58129ee547f Mon Sep 17 00:00:00 2001
From: unknown <thek@adventure.(none)>
Date: Tue, 8 May 2007 11:24:07 +0200
Subject: [PATCH 30/58] 4.1 -> 5.0 Manual merge for Bug #27792

mysql-test/r/query_cache.result:
  Added 5.0 testcase
mysql-test/t/query_cache.test:
  Added 5.0 test case
sql/mysql_priv.h:
  Added support for div_precision_increment
sql/set_var.cc:
  - Added query cache flush when system variable ft_boolean_syntax is
    updated since this also invalidates all cached result sets using this
    variable.
sql/sql_cache.cc:
  - Added the local system variable div_precision_increment as an identification flag
    for cached queries.
---
 mysql-test/r/query_cache.result | 94 +++++++++++++++++++++++++++++++++
 mysql-test/t/query_cache.test   | 72 +++++++++++++++++++++++++
 sql/mysql_priv.h                |  1 +
 sql/set_var.cc                  |  5 ++
 sql/sql_cache.cc                | 19 +++++--
 5 files changed, 186 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index d77745176f7..3be2a388860 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -1321,3 +1321,97 @@ insert into t1(c1) select c1 from v1;
 drop table t1, t2, t3;
 drop view v1;
 set global query_cache_size=0;
+create table t1 (a int);
+insert into t1 values (1),(2),(3);
+set GLOBAL query_cache_type=1;
+set GLOBAL query_cache_limit=10000;
+set GLOBAL query_cache_min_res_unit=0;
+set GLOBAL query_cache_size= 100000;
+reset query cache;
+set LOCAL default_week_format = 0;
+select week('2007-01-04');
+week('2007-01-04')
+0
+select week('2007-01-04') from t1;
+week('2007-01-04')
+0
+0
+0
+select extract(WEEK FROM '2007-01-04') from t1;
+extract(WEEK FROM '2007-01-04')
+0
+0
+0
+set LOCAL default_week_format = 2;
+select week('2007-01-04');
+week('2007-01-04')
+53
+select week('2007-01-04') from t1;
+week('2007-01-04')
+53
+53
+53
+select extract(WEEK FROM '2007-01-04') from t1;
+extract(WEEK FROM '2007-01-04')
+53
+53
+53
+reset query cache;
+set LOCAL div_precision_increment=2;
+select 1/7;
+1/7
+0.14
+select 1/7 from t1;
+1/7
+0.14
+0.14
+0.14
+set LOCAL div_precision_increment=4;
+select 1/7;
+1/7
+0.1429
+select 1/7 from t1;
+1/7
+0.1429
+0.1429
+0.1429
+drop table t1;
+CREATE TABLE t1 (a VARCHAR(200), b TEXT, FULLTEXT (a,b));
+INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),
+('Full-text indexes', 'are called collections'),
+('Only MyISAM tables','support collections'),
+('Function MATCH ... AGAINST()','is used to do a search'),
+('Full-text search in MySQL', 'implements vector space model');
+set GLOBAL ft_boolean_syntax='+ -><()~*:""&|';
+select *, MATCH(a,b) AGAINST("+called +collections" IN BOOLEAN MODE) as x from t1;
+a	b	x
+MySQL has now support	for full-text search	0
+Full-text indexes	are called collections	1
+Only MyISAM tables	support collections	0
+Function MATCH ... AGAINST()	is used to do a search	0
+Full-text search in MySQL	implements vector space model	0
+set GLOBAL ft_boolean_syntax='- +><()~*:""&|';
+select *, MATCH(a,b) AGAINST("+called +collections" IN BOOLEAN MODE) as x from t1;
+a	b	x
+MySQL has now support	for full-text search	0
+Full-text indexes	are called collections	0
+Only MyISAM tables	support collections	0
+Function MATCH ... AGAINST()	is used to do a search	0
+Full-text search in MySQL	implements vector space model	0
+create function change_global() returns integer
+begin
+set global ft_boolean_syntax='+ -><()~*:""&|';
+return 1;
+end|
+select *, change_global() from t1;
+a	b	change_global()
+MySQL has now support	for full-text search	1
+Full-text indexes	are called collections	1
+Only MyISAM tables	support collections	1
+Function MATCH ... AGAINST()	is used to do a search	1
+Full-text search in MySQL	implements vector space model	1
+drop function change_global;
+set GLOBAL query_cache_type=default;
+set GLOBAL query_cache_limit=default;
+set GLOBAL query_cache_min_res_unit=default;
+set GLOBAL query_cache_size= default;
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index 427334805ce..1ef104f820b 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -899,3 +899,75 @@ insert into t1(c1) select c1 from v1;
 drop table t1, t2, t3;
 drop view v1;
 set global query_cache_size=0;
+
+#
+# Query cache and changes to system variables
+#
+
+create table t1 (a int);
+insert into t1 values (1),(2),(3);
+set GLOBAL query_cache_type=1;
+set GLOBAL query_cache_limit=10000;
+set GLOBAL query_cache_min_res_unit=0;
+set GLOBAL query_cache_size= 100000;
+
+# default_week_format
+reset query cache;
+set LOCAL default_week_format = 0;
+select week('2007-01-04');
+select week('2007-01-04') from t1;
+select extract(WEEK FROM '2007-01-04') from t1;
+
+set LOCAL default_week_format = 2;
+select week('2007-01-04');
+select week('2007-01-04') from t1;
+select extract(WEEK FROM '2007-01-04') from t1;
+
+# div_precision_increment
+reset query cache;
+set LOCAL div_precision_increment=2;
+select 1/7;
+select 1/7 from t1;
+
+set LOCAL div_precision_increment=4;
+select 1/7;
+select 1/7 from t1;
+
+drop table t1;
+
+CREATE TABLE t1 (a VARCHAR(200), b TEXT, FULLTEXT (a,b));
+INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),
+                       ('Full-text indexes', 'are called collections'),
+                          ('Only MyISAM tables','support collections'),
+             ('Function MATCH ... AGAINST()','is used to do a search'),
+        ('Full-text search in MySQL', 'implements vector space model');
+
+
+set GLOBAL ft_boolean_syntax='+ -><()~*:""&|';
+
+select *, MATCH(a,b) AGAINST("+called +collections" IN BOOLEAN MODE) as x from t1;
+
+# swap +/-
+set GLOBAL ft_boolean_syntax='- +><()~*:""&|';
+
+select *, MATCH(a,b) AGAINST("+called +collections" IN BOOLEAN MODE) as x from t1;
+
+# If in the future we need to cache queries with functions
+# be sure not to cause dead lock if the query cache is flushed
+# while inserting a query in the query cache.
+delimiter |;
+create function change_global() returns integer
+begin
+  set global ft_boolean_syntax='+ -><()~*:""&|';
+  return 1;
+end|
+delimiter ;|
+select *, change_global() from t1;
+drop function change_global;
+
+set GLOBAL query_cache_type=default;
+set GLOBAL query_cache_limit=default;
+set GLOBAL query_cache_min_res_unit=default;
+set GLOBAL query_cache_size= default;
+
+# End of 5.0 tests
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index f5b22c2d004..f73b0c6cd01 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -643,6 +643,7 @@ struct Query_cache_query_flags
   ulong max_sort_length;
   ulong group_concat_max_len;
   ulong default_week_format;
+  ulong div_precision_increment;
   MY_LOCALE *lc_time_names;
 };
 #define QUERY_CACHE_FLAGS_SIZE sizeof(Query_cache_query_flags)
diff --git a/sql/set_var.cc b/sql/set_var.cc
index c7eddcdd317..1952ae9e7c6 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1200,6 +1200,11 @@ static bool sys_update_ftb_syntax(THD *thd, set_var * var)
 {
   strmake(ft_boolean_syntax, var->value->str_value.c_ptr(),
 	  sizeof(ft_boolean_syntax)-1);
+
+#ifdef HAVE_QUERY_CACHE
+  query_cache.flush();
+#endif /* HAVE_QUERY_CACHE */
+
   return 0;
 }
 
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 795711b34d8..96a8dc577df 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -865,10 +865,12 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
     flags.max_sort_length= thd->variables.max_sort_length;
     flags.lc_time_names= thd->variables.lc_time_names;
     flags.group_concat_max_len= thd->variables.group_concat_max_len;
+    flags.div_precision_increment= thd->variables.div_precincrement;
+    flags.default_week_format= thd->variables.default_week_format;
     DBUG_PRINT("qcache", ("long %d, 4.1: %d, more results %d, pkt_nr: %d, \
 CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \
-sql mode: 0x%lx, sort len: %lu, conncat len: %lu",
-                          (int)flags.client_long_flag,
+sql mode: 0x%lx, sort len: %lu, conncat len: %lu, div_precision: %lu, \
+def_week_frmt: %lu",                          
                           (int)flags.client_protocol_41,
                           (int)flags.more_results_exists,
                           flags.pkt_nr,
@@ -879,7 +881,9 @@ sql mode: 0x%lx, sort len: %lu, conncat len: %lu",
                           (ulong) flags.time_zone,
                           flags.sql_mode,
                           flags.max_sort_length,
-                          flags.group_concat_max_len));
+                          flags.group_concat_max_len,
+                          flags.div_precision_increment,
+                          flags.default_week_format));
     /*
      Make InnoDB to release the adaptive hash index latch before
      acquiring the query cache mutex.
@@ -1107,10 +1111,13 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
   flags.sql_mode= thd->variables.sql_mode;
   flags.max_sort_length= thd->variables.max_sort_length;
   flags.group_concat_max_len= thd->variables.group_concat_max_len;
+  flags.div_precision_increment= thd->variables.div_precincrement;
+  flags.default_week_format= thd->variables.default_week_format;
   flags.lc_time_names= thd->variables.lc_time_names;
   DBUG_PRINT("qcache", ("long %d, 4.1: %d, more results %d, pkt_nr: %d, \
 CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \
-sql mode: 0x%lx, sort len: %lu, conncat len: %lu",
+sql mode: 0x%lx, sort len: %lu, conncat len: %lu, div_precision: %lu, \
+def_week_frmt: %lu",                          
                           (int)flags.client_long_flag,
                           (int)flags.client_protocol_41,
                           (int)flags.more_results_exists,
@@ -1122,7 +1129,9 @@ sql mode: 0x%lx, sort len: %lu, conncat len: %lu",
                           (ulong) flags.time_zone,
                           flags.sql_mode,
                           flags.max_sort_length,
-                          flags.group_concat_max_len));
+                          flags.group_concat_max_len,
+                          flags.div_precision_increment,
+                          flags.default_week_format));
   memcpy((void *)(sql + (tot_length - QUERY_CACHE_FLAGS_SIZE)),
 	 &flags, QUERY_CACHE_FLAGS_SIZE);
   query_block = (Query_cache_block *)  hash_search(&queries, (byte*) sql,

From c02934a58d77e88005821a483ecbd5fd644e2eb1 Mon Sep 17 00:00:00 2001
From: unknown <jonas@perch.ndb.mysql.com>
Date: Tue, 8 May 2007 12:53:12 +0200
Subject: [PATCH 31/58] ndb - bug#27437   redo extra verification code so that
 tupkeyref is reset just before tupkeyreq

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  redo extra verification code so that tupkeyref is reset just before tupkeyreq
---
 ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index b8ab0eec902..f4b99e8be2f 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -3338,7 +3338,7 @@ void Dblqh::seizeTcrec()
   locTcConnectptr.p->tableref = RNIL;
   locTcConnectptr.p->savePointId = 0;
 #ifdef VM_TRACE
-  locTcConnectptr.p->tupkeyref = 0;
+  locTcConnectptr.p->tupkeyref = 1;
 #endif
 
   cfirstfreeTcConrec = nextTc;
@@ -4060,6 +4060,9 @@ void Dblqh::execACCKEYCONF(Signal* signal)
   tupKeyReq->tcOpIndex = tcConnectptr.p->tcOprec;
   tupKeyReq->savePointId = tcConnectptr.p->savePointId;
 
+#ifdef VM_TRACE
+  tcConnectptr.p->tupkeyref = 0;
+#endif
   EXECUTE_DIRECT(tup, GSN_TUPKEYREQ, signal, TupKeyReq::SignalLength);
 }//Dblqh::execACCKEYCONF()
 
@@ -5872,7 +5875,7 @@ void Dblqh::releaseTcrec(Signal* signal, TcConnectionrecPtr locTcConnectptr)
 {
   jam();
 #ifdef VM_TRACE
-  locTcConnectptr.p->tupkeyref = 0;
+  locTcConnectptr.p->tupkeyref = 1;
 #endif
 
   locTcConnectptr.p->tcTimer = 0;
@@ -5898,7 +5901,7 @@ void Dblqh::releaseTcrecLog(Signal* signal, TcConnectionrecPtr locTcConnectptr)
 {
   jam();
 #ifdef VM_TRACE
-  locTcConnectptr.p->tupkeyref = 0;
+  locTcConnectptr.p->tupkeyref = 1;
 #endif
   locTcConnectptr.p->tcTimer = 0;
   locTcConnectptr.p->transactionState = TcConnectionrec::TC_NOT_CONNECTED;
@@ -8356,8 +8359,11 @@ void Dblqh::nextScanConfLoopLab(Signal* signal)
     tupKeyReq->tcOpIndex = tcConnectptr.p->tcOprec;
     tupKeyReq->savePointId = tcConnectptr.p->savePointId;
     Uint32 blockNo = refToBlock(tcConnectptr.p->tcTupBlockref);
+#ifdef VM_TRACE
+    tcConnectptr.p->tupkeyref = 0;
+#endif
     EXECUTE_DIRECT(blockNo, GSN_TUPKEYREQ, signal, 
-               TupKeyReq::SignalLength);
+                   TupKeyReq::SignalLength);
   }
 }
 
@@ -9479,6 +9485,9 @@ void Dblqh::copySendTupkeyReqLab(Signal* signal)
     tupKeyReq->tcOpIndex = tcConnectptr.p->tcOprec;
     tupKeyReq->savePointId = tcConnectptr.p->savePointId;
     Uint32 blockNo = refToBlock(tcConnectptr.p->tcTupBlockref);
+#ifdef VM_TRACE
+    tcConnectptr.p->tupkeyref = 0;
+#endif
     EXECUTE_DIRECT(blockNo, GSN_TUPKEYREQ, signal, 
                TupKeyReq::SignalLength);
   }

From e9315793229d8b7bedc31f1bb0a9a0d586e9a7f0 Mon Sep 17 00:00:00 2001
From: unknown <tomas@whalegate.ndb.mysql.com>
Date: Tue, 8 May 2007 18:30:03 +0200
Subject: [PATCH 32/58] increate hearbeat interval to avoid load related start
 up issues in mysql-test-run

---
 mysql-test/ndb/ndb_config_1_node.ini | 4 +++-
 mysql-test/ndb/ndb_config_2_node.ini | 4 +++-
 mysql-test/ndb/ndb_config_4_node.ini | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mysql-test/ndb/ndb_config_1_node.ini b/mysql-test/ndb/ndb_config_1_node.ini
index 7b0d2829530..68533396930 100644
--- a/mysql-test/ndb/ndb_config_1_node.ini
+++ b/mysql-test/ndb/ndb_config_1_node.ini
@@ -13,9 +13,11 @@ TimeBetweenGlobalCheckpoints= 500
 NoOfFragmentLogFiles= 3
 
 #
-# Increase deadlock-timeout to cater for slow test-machines
+# Increase timeouts to cater for slow test-machines
 #   (possibly running several tests in parallell)
 #
+HeartbeatIntervalDbDb= 30000
+HeartbeatIntervalDbApi= 30000
 #TransactionDeadlockDetectionTimeout= 7500
 
 [ndbd]
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini
index aafed28dbc6..55c9c285310 100644
--- a/mysql-test/ndb/ndb_config_2_node.ini
+++ b/mysql-test/ndb/ndb_config_2_node.ini
@@ -13,9 +13,11 @@ TimeBetweenGlobalCheckpoints= 500
 NoOfFragmentLogFiles= 3
 
 #
-# Increase deadlock-timeout to cater for slow test-machines
+# Increase timeouts to cater for slow test-machines
 #   (possibly running several tests in parallell)
 #
+HeartbeatIntervalDbDb= 30000
+HeartbeatIntervalDbApi= 30000
 #TransactionDeadlockDetectionTimeout= 7500
 
 [ndbd]
diff --git a/mysql-test/ndb/ndb_config_4_node.ini b/mysql-test/ndb/ndb_config_4_node.ini
index 2154475aa37..779432e1660 100644
--- a/mysql-test/ndb/ndb_config_4_node.ini
+++ b/mysql-test/ndb/ndb_config_4_node.ini
@@ -13,9 +13,11 @@ TimeBetweenGlobalCheckpoints= 500
 NoOfFragmentLogFiles= 3
 
 #
-# Increase deadlock-timeout to cater for slow test-machines
+# Increase timeouts to cater for slow test-machines
 #   (possibly running several tests in parallell)
 #
+HeartbeatIntervalDbDb= 30000
+HeartbeatIntervalDbApi= 30000
 #TransactionDeadlockDetectionTimeout= 7500
 
 [ndbd]

From 80788a3462c18d5c603ee4badb2c51e7f87205ae Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Wed, 9 May 2007 00:23:16 +0400
Subject: [PATCH 33/58] Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
 default value for a TIMESTAMP field when no value has been provided.

The LOAD DATA sets the current time in the TIMESTAMP field with
CURRENT_TIMESTAMP default value when the field is detected as a null.
But when the LOAD DATA command loads data from a file that doesn't contain
enough data for all fields then the rest of fields are simply set to null
without any check. This leads to no value being inserted to such TIMESTAMP
field.

Now the read_sep_field() and the read_fixed_length() functions set current
time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
when a NULL value is loaded to the field.


mysql-test/t/loaddata.test:
  Added a test case for the bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
  default value for a TIMESTAMP field when no value has been provided.
mysql-test/r/loaddata.result:
  Added a test case for the bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
  default value for a TIMESTAMP field when no value has been provided.
sql/sql_load.cc:
  Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a
  TIMESTAMP field when no value has been provided.
  Now the read_sep_field() and the read_fixed_length() functions set current
  time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
  when a NULL value is loaded to the field.
---
 mysql-test/r/loaddata.result | 19 +++++++++++++++++++
 mysql-test/t/loaddata.test   | 26 ++++++++++++++++++++++++++
 sql/sql_load.cc              |  4 ++++
 3 files changed, 49 insertions(+)

diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index 0478e48025f..f66aa78377d 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -165,3 +165,22 @@ f2
 2
 SET @@SQL_MODE=@OLD_SQL_MODE;
 drop table t1,t2;
+create table t1(f1 int, f2 timestamp not null default current_timestamp);
+create table t2(f1 int);
+insert into t2 values(1),(2);
+Warnings:
+Warning	1261	Row 1 doesn't contain data for all columns
+Warning	1261	Row 2 doesn't contain data for all columns
+select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+f1
+1
+2
+delete from t1;
+Warnings:
+Warning	1261	Row 1 doesn't contain data for all columns
+Warning	1261	Row 2 doesn't contain data for all columns
+select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+f1
+1
+2
+drop table t1,t2;
diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test
index e6788cd7798..171479163fe 100644
--- a/mysql-test/t/loaddata.test
+++ b/mysql-test/t/loaddata.test
@@ -152,4 +152,30 @@ select * from t2;
 --exec rm $MYSQLTEST_VARDIR/tmp/t1
 SET @@SQL_MODE=@OLD_SQL_MODE;
 drop table t1,t2;
+
+#
+# Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a
+#            TIMESTAMP field when no value has been provided.
+#
+create table t1(f1 int, f2 timestamp not null default current_timestamp);
+create table t2(f1 int);
+insert into t2 values(1),(2);
+disable_query_log;
+eval select * into outfile '$MYSQLTEST_VARDIR/tmp/t2' from t2;
+eval load data infile '$MYSQLTEST_VARDIR/tmp/t2' into table t1;
+enable_query_log;
+select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+--exec rm $MYSQLTEST_VARDIR/tmp/t2
+delete from t1;
+disable_query_log;
+eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t2'
+FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n'
+FROM t2;
+eval load data infile '$MYSQLTEST_VARDIR/tmp/t2' into table t1
+FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n';
+enable_query_log;
+select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+--exec rm $MYSQLTEST_VARDIR/tmp/t2
+drop table t1,t2;
+
 # End of 5.0 tests
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index ee6d2d0a572..d14e165a788 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -585,6 +585,8 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
         push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 
                             ER_WARN_TOO_FEW_RECORDS, 
                             ER(ER_WARN_TOO_FEW_RECORDS), thd->row_count);
+        if (!field->maybe_null() && field->type() == FIELD_TYPE_TIMESTAMP)
+            ((Field_timestamp*) field)->set_time();
       }
       else
       {
@@ -770,6 +772,8 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
                      thd->row_count);
             DBUG_RETURN(1);
           }
+          if (!field->maybe_null() && field->type() == FIELD_TYPE_TIMESTAMP)
+              ((Field_timestamp*) field)->set_time();
           /*
             QQ: We probably should not throw warning for each field.
             But how about intention to always have the same number

From 643cb9b8f30c8028403d5b38d6c6f65cf902e5a1 Mon Sep 17 00:00:00 2001
From: unknown <tomas@whalegate.ndb.mysql.com>
Date: Wed, 9 May 2007 10:22:26 +0200
Subject: [PATCH 34/58] Bug #28287 Sign problem in test "ndb_restore_print" -
 some platforms do strange things with char... use Int8 to be sure of
 signedness

---
 ndb/include/ndbapi/NdbRecAttr.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ndb/include/ndbapi/NdbRecAttr.hpp b/ndb/include/ndbapi/NdbRecAttr.hpp
index f5777cdddb3..92cd5706a8d 100644
--- a/ndb/include/ndbapi/NdbRecAttr.hpp
+++ b/ndb/include/ndbapi/NdbRecAttr.hpp
@@ -164,7 +164,7 @@ public:
    *
    * @return  Char value.
    */           
-  char  char_value() const;           
+  Int8  char_value() const;           
 
   /**
    * Get value stored in NdbRecAttr object.
@@ -340,10 +340,10 @@ NdbRecAttr::short_value() const
 }
 
 inline
-char
+Int8
 NdbRecAttr::char_value() const
 {
-  return *(char*)theRef;
+  return *(Int8*)theRef;
 }
 
 inline

From ba9657bcc60270cbda65f3b44933bb92f31c599f Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Wed, 9 May 2007 14:46:11 +0400
Subject: [PATCH 35/58] loaddata.result, loaddata.test:   A test case is
 corrected.

mysql-test/t/loaddata.test:
  A test case is corrected.
mysql-test/r/loaddata.result:
  A test case is corrected.
---
 mysql-test/r/loaddata.result | 4 ++--
 mysql-test/t/loaddata.test   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index f66aa78377d..a02aaccf8f6 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -171,7 +171,7 @@ insert into t2 values(1),(2);
 Warnings:
 Warning	1261	Row 1 doesn't contain data for all columns
 Warning	1261	Row 2 doesn't contain data for all columns
-select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1;
 f1
 1
 2
@@ -179,7 +179,7 @@ delete from t1;
 Warnings:
 Warning	1261	Row 1 doesn't contain data for all columns
 Warning	1261	Row 2 doesn't contain data for all columns
-select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1;
 f1
 1
 2
diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test
index 171479163fe..2757a37b881 100644
--- a/mysql-test/t/loaddata.test
+++ b/mysql-test/t/loaddata.test
@@ -164,7 +164,7 @@ disable_query_log;
 eval select * into outfile '$MYSQLTEST_VARDIR/tmp/t2' from t2;
 eval load data infile '$MYSQLTEST_VARDIR/tmp/t2' into table t1;
 enable_query_log;
-select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1;
 --exec rm $MYSQLTEST_VARDIR/tmp/t2
 delete from t1;
 disable_query_log;
@@ -174,7 +174,7 @@ FROM t2;
 eval load data infile '$MYSQLTEST_VARDIR/tmp/t2' into table t1
 FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n';
 enable_query_log;
-select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1;
 --exec rm $MYSQLTEST_VARDIR/tmp/t2
 drop table t1,t2;
 

From 82b7c54338a3465790e4e64a647e82b9d7ea59b6 Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Wed, 9 May 2007 17:27:14 +0500
Subject: [PATCH 36/58] Bug #27957 cast as decimal does not check overflow,
 also inconsistent with group, subselect Missing check for overflow added to
 the Item_decimal_typecast::val_decimal

include/decimal.h:
  Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
  decimal_intg() declaration
mysql-test/r/cast.result:
  Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
  result fixed
mysql-test/r/type_newdecimal.result:
  Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
  test result
mysql-test/t/type_newdecimal.test:
  Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
  test case added
sql/item_func.cc:
  Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
  now we check for possible ovreflow in Item_decimal_typecast::val_decimal
sql/my_decimal.h:
  Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
  my_decimal_intg() implemented
strings/decimal.c:
  Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
  decimal_intg() implemented
---
 include/decimal.h                   |  1 +
 mysql-test/r/cast.result            |  4 +++-
 mysql-test/r/type_newdecimal.result | 35 +++++++++++++++++++++++++++++
 mysql-test/t/type_newdecimal.test   | 19 ++++++++++++++++
 sql/item_func.cc                    | 23 +++++++++++++++++++
 sql/my_decimal.h                    |  8 +++++++
 strings/decimal.c                   |  8 +++++++
 7 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/include/decimal.h b/include/decimal.h
index 56962009025..c5385b58658 100644
--- a/include/decimal.h
+++ b/include/decimal.h
@@ -47,6 +47,7 @@ int decimal_bin_size(int precision, int scale);
 int decimal_result_size(decimal_t *from1, decimal_t *from2, char op,
                         int param);
 
+int decimal_intg(decimal_t *from);
 int decimal_add(decimal_t *from1, decimal_t *from2, decimal_t *to);
 int decimal_sub(decimal_t *from1, decimal_t *from2, decimal_t *to);
 int decimal_cmp(decimal_t *from1, decimal_t *from2);
diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result
index 454a3766572..c0dab1c3293 100644
--- a/mysql-test/r/cast.result
+++ b/mysql-test/r/cast.result
@@ -378,7 +378,9 @@ create table t1(s1 time);
 insert into t1 values ('11:11:11');
 select cast(s1 as decimal(7,2)) from t1;
 cast(s1 as decimal(7,2))
-111111.00
+99999.99
+Warnings:
+Error	1264	Out of range value adjusted for column 'cast(s1 as decimal(7,2))' at row 1
 drop table t1;
 CREATE TABLE t1 (v varchar(10), tt tinytext, t text,
 mt mediumtext, lt longtext);
diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result
index c103de81bd7..cbcab126439 100644
--- a/mysql-test/r/type_newdecimal.result
+++ b/mysql-test/r/type_newdecimal.result
@@ -1430,4 +1430,39 @@ select * from t1;
 a
 123456789012345678
 drop table t1;
+select cast(11.1234 as DECIMAL(3,2));
+cast(11.1234 as DECIMAL(3,2))
+9.99
+Warnings:
+Error	1264	Out of range value adjusted for column 'cast(11.1234 as DECIMAL(3,2))' at row 1
+select * from (select cast(11.1234 as DECIMAL(3,2))) t;
+cast(11.1234 as DECIMAL(3,2))
+9.99
+Warnings:
+Error	1264	Out of range value adjusted for column 'cast(11.1234 as DECIMAL(3,2))' at row 1
+select cast(a as DECIMAL(3,2))
+from (select 11.1233 as a
+UNION select 11.1234
+UNION select 12.1234
+) t;
+cast(a as DECIMAL(3,2))
+9.99
+9.99
+9.99
+Warnings:
+Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
+select cast(a as DECIMAL(3,2)), count(*)
+from (select 11.1233 as a
+UNION select 11.1234
+UNION select 12.1234
+) t group by 1;
+cast(a as DECIMAL(3,2))	count(*)
+9.99	3
+Warnings:
+Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
 End of 5.0 tests
diff --git a/mysql-test/t/type_newdecimal.test b/mysql-test/t/type_newdecimal.test
index 4c6098d2121..a7906be79d4 100644
--- a/mysql-test/t/type_newdecimal.test
+++ b/mysql-test/t/type_newdecimal.test
@@ -1130,4 +1130,23 @@ alter table t1 modify column a decimal(19);
 select * from t1;
 drop table t1;
 
+#
+# Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect 
+#
+
+select cast(11.1234 as DECIMAL(3,2));
+select * from (select cast(11.1234 as DECIMAL(3,2))) t;
+
+select cast(a as DECIMAL(3,2))
+ from (select 11.1233 as a
+  UNION select 11.1234
+  UNION select 12.1234
+ ) t;
+
+select cast(a as DECIMAL(3,2)), count(*)
+ from (select 11.1233 as a
+  UNION select 11.1234
+  UNION select 12.1234
+ ) t group by 1;
+
 --echo End of 5.0 tests
diff --git a/sql/item_func.cc b/sql/item_func.cc
index e761cf7fb43..382e197acfe 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1050,9 +1050,32 @@ longlong Item_decimal_typecast::val_int()
 my_decimal *Item_decimal_typecast::val_decimal(my_decimal *dec)
 {
   my_decimal tmp_buf, *tmp= args[0]->val_decimal(&tmp_buf);
+  bool sign;
   if ((null_value= args[0]->null_value))
     return NULL;
   my_decimal_round(E_DEC_FATAL_ERROR, tmp, decimals, FALSE, dec);
+  sign= dec->sign();
+  if (unsigned_flag)
+  {
+    if (sign)
+    {
+      my_decimal_set_zero(dec);
+      goto err;
+    }
+  }
+  if (max_length - 2 - decimals < (uint) my_decimal_intg(dec))
+  {
+    max_my_decimal(dec, max_length - 2, decimals);
+    dec->sign(sign);
+    goto err;
+  }
+  return dec;
+
+err:
+  push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+                      ER_WARN_DATA_OUT_OF_RANGE,
+                      ER(ER_WARN_DATA_OUT_OF_RANGE),
+                      name, 1);
   return dec;
 }
 
diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index 45270150d22..731a3bd505c 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -387,5 +387,13 @@ int my_decimal_cmp(const my_decimal *a, const my_decimal *b)
   return decimal_cmp((decimal_t*) a, (decimal_t*) b);
 }
 
+
+inline
+int my_decimal_intg(const my_decimal *a)
+{
+    return decimal_intg((decimal_t*) a);
+}
+
+
 #endif /*my_decimal_h*/
 
diff --git a/strings/decimal.c b/strings/decimal.c
index ea92174bfc8..65db68b1b59 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -1911,6 +1911,14 @@ static int do_sub(decimal_t *from1, decimal_t *from2, decimal_t *to)
   return error;
 }
 
+int decimal_intg(decimal_t *from)
+{
+  int res;
+  dec1 *tmp_res;
+  tmp_res= remove_leading_zeroes(from, &res);
+  return res;
+}
+
 int decimal_add(decimal_t *from1, decimal_t *from2, decimal_t *to)
 {
   if (likely(from1->sign == from2->sign))

From 7ef22d8d22ee46ca69026563dbdc9bcccf5e7524 Mon Sep 17 00:00:00 2001
From: unknown <tomas@whalegate.ndb.mysql.com>
Date: Wed, 9 May 2007 14:31:22 +0200
Subject: [PATCH 37/58] Bug #28287 Sign problem in test "ndb_restore_print"   -
 corrected previous patch   - some platforms do strange things with char...
 use Int8 to be sure of signedness

---
 ndb/include/ndbapi/NdbRecAttr.hpp | 32 +++++++++++++++++++++++++++++--
 ndb/src/ndbapi/NdbRecAttr.cpp     |  6 +++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/ndb/include/ndbapi/NdbRecAttr.hpp b/ndb/include/ndbapi/NdbRecAttr.hpp
index 92cd5706a8d..9679d3995d3 100644
--- a/ndb/include/ndbapi/NdbRecAttr.hpp
+++ b/ndb/include/ndbapi/NdbRecAttr.hpp
@@ -164,7 +164,14 @@ public:
    *
    * @return  Char value.
    */           
-  Int8  char_value() const;           
+  char  char_value() const;           
+
+  /**
+   * Get value stored in NdbRecAttr object.
+   *
+   * @return  Int8 value.
+   */           
+  Int8  int8_value() const;           
 
   /**
    * Get value stored in NdbRecAttr object.
@@ -201,6 +208,13 @@ public:
    */   
   Uint8 u_char_value() const;        
 
+  /**
+   * Get value stored in NdbRecAttr object.
+   *
+   * @return  Uint8 value.
+   */   
+  Uint8 u_8_value() const;
+
   /**
    * Get value stored in NdbRecAttr object.
    *
@@ -340,8 +354,15 @@ NdbRecAttr::short_value() const
 }
 
 inline
-Int8
+char
 NdbRecAttr::char_value() const
+{
+  return *(char*)theRef;
+}
+
+inline
+Int8
+NdbRecAttr::int8_value() const
 {
   return *(Int8*)theRef;
 }
@@ -367,6 +388,13 @@ NdbRecAttr::u_char_value() const
   return *(Uint8*)theRef;
 }
 
+inline
+Uint8
+NdbRecAttr::u_8_value() const
+{
+  return *(Uint8*)theRef;
+}
+
 inline
 void
 NdbRecAttr::release()
diff --git a/ndb/src/ndbapi/NdbRecAttr.cpp b/ndb/src/ndbapi/NdbRecAttr.cpp
index 996c0256baa..8de163d1c22 100644
--- a/ndb/src/ndbapi/NdbRecAttr.cpp
+++ b/ndb/src/ndbapi/NdbRecAttr.cpp
@@ -272,7 +272,7 @@ ndbrecattr_print_formatted(NdbOut& out, const NdbRecAttr &r,
       out << r.u_short_value();
       break;
     case NdbDictionary::Column::Tinyunsigned:
-      out << (unsigned) r.u_char_value();
+      out << (unsigned) r.u_8_value();
       break;
     case NdbDictionary::Column::Bigint:
       out << r.int64_value();
@@ -287,7 +287,7 @@ ndbrecattr_print_formatted(NdbOut& out, const NdbRecAttr &r,
       out << r.short_value();
       break;
     case NdbDictionary::Column::Tinyint:
-      out << (int) r.char_value();
+      out << (int) r.int8_value();
       break;
     case NdbDictionary::Column::Binary:
       if (!f.hex_format)
@@ -413,7 +413,7 @@ ndbrecattr_print_formatted(NdbOut& out, const NdbRecAttr &r,
     break;
     case NdbDictionary::Column::Year:
     {
-      uint year = 1900 + r.u_char_value();
+      uint year = 1900 + r.u_8_value();
       char buf[40];
       sprintf(buf, "%04d", year);
       out << buf;

From 198a7991c0738ea4ffbca828aa683020bb6243be Mon Sep 17 00:00:00 2001
From: unknown <tomas@whalegate.ndb.mysql.com>
Date: Wed, 9 May 2007 15:03:01 +0200
Subject: [PATCH 38/58] enable setting api reg req frequency to be higher than
 heartbeat setting to ensure we have reasonably up-to-date info from ndb nodes
 + do this for management server

---
 ndb/src/mgmsrv/MgmtSrvr.cpp   | 10 ++++++++++
 ndb/src/ndbapi/ClusterMgr.cpp | 13 ++++---------
 ndb/src/ndbapi/ClusterMgr.hpp |  2 ++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 3d7eb5bd4f1..409694fead1 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -627,6 +627,16 @@ MgmtSrvr::start(BaseString &error_string)
     ndbout_c("This is probably a bug.");
   }
 
+  /*
+    set api reg req frequency quite high:
+
+    100 ms interval to make sure we have fairly up-to-date
+    info from the nodes.  This to make sure that this info
+    is not dependent on heart beat settings in the
+    configuration
+  */
+  theFacade->theClusterMgr->set_max_api_reg_req_interval(100);
+
   TransporterRegistry *reg = theFacade->get_registry();
   for(unsigned int i=0;i<reg->m_transporter_interface.size();i++) {
     BaseString msg;
diff --git a/ndb/src/ndbapi/ClusterMgr.cpp b/ndb/src/ndbapi/ClusterMgr.cpp
index 7ab3ee07197..d3946dddfb7 100644
--- a/ndb/src/ndbapi/ClusterMgr.cpp
+++ b/ndb/src/ndbapi/ClusterMgr.cpp
@@ -68,6 +68,7 @@ ClusterMgr::ClusterMgr(TransporterFacade & _facade):
   clusterMgrThreadMutex = NdbMutex_Create();
   waitForHBCond= NdbCondition_Create();
   waitingForHB= false;
+  m_max_api_reg_req_interval= 0xFFFFFFFF; // MAX_INT
   noOfAliveNodes= 0;
   noOfConnectedNodes= 0;
   theClusterMgrThread= 0;
@@ -251,7 +252,7 @@ ClusterMgr::threadMain( ){
      * Start of Secure area for use of Transporter
      */
     theFacade.lock_mutex();
-    for (int i = 1; i < MAX_NODES; i++){
+    for (int i = 1; i < MAX_NDB_NODES; i++){
       /**
        * Send register request (heartbeat) to all available nodes 
        * at specified timing intervals
@@ -272,7 +273,8 @@ ClusterMgr::threadMain( ){
       }
       
       theNode.hbCounter += timeSlept;
-      if (theNode.hbCounter >= theNode.hbFrequency) {
+      if (theNode.hbCounter >= m_max_api_reg_req_interval ||
+          theNode.hbCounter >= theNode.hbFrequency) {
 	/**
 	 * It is now time to send a new Heartbeat
 	 */
@@ -281,13 +283,6 @@ ClusterMgr::threadMain( ){
 	  theNode.hbCounter = 0;
 	}
 
-	/**
-	 * If the node is of type REP, 
-	 * then the receiver of the signal should be API_CLUSTERMGR
-	 */
-	if (theNode.m_info.m_type == NodeInfo::REP) {
-	  signal.theReceiversBlockNumber = API_CLUSTERMGR;
-	}
 #ifdef DEBUG_REG
 	ndbout_c("ClusterMgr: Sending API_REGREQ to node %d", (int)nodeId);
 #endif
diff --git a/ndb/src/ndbapi/ClusterMgr.hpp b/ndb/src/ndbapi/ClusterMgr.hpp
index f5d84fee01d..467b18f2330 100644
--- a/ndb/src/ndbapi/ClusterMgr.hpp
+++ b/ndb/src/ndbapi/ClusterMgr.hpp
@@ -50,6 +50,7 @@ public:
   void startThread();
 
   void forceHB();
+  void set_max_api_reg_req_interval(unsigned int millisec) { m_max_api_reg_req_interval = millisec; }
 
 private:
   void threadMain();
@@ -83,6 +84,7 @@ public:
 
   Uint32        m_connect_count;
 private:
+  Uint32        m_max_api_reg_req_interval;
   Uint32        noOfAliveNodes;
   Uint32        noOfConnectedNodes;
   Node          theNodes[MAX_NODES];

From f2a52dd0f021b02177c10443cb1ee6b7ad20281a Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Thu, 10 May 2007 00:17:21 +0500
Subject: [PATCH 39/58] Bug #27921 View ignores precision for CAST()
 Item_decimal_typecast::print properly implemented

mysql-test/r/view.result:
  Bug #27921 View ignores precision for CAST()
  test result
mysql-test/t/view.test:
  Bug #27921 View ignores precision for CAST()
  test case
sql/field.cc:
  zero decimals handling unified
sql/item_create.cc:
  Bug #27921 View ignores precision for CAST()
  create_func_cast parameters changed, zero precision handling unified
sql/item_create.h:
  Bug #27921 View ignores precision for CAST()
  create_func_cast parameters changed
sql/item_func.cc:
  Bug #27921 View ignores precision for CAST()
  Item_decimal_typecast::print properly implemented
sql/item_func.h:
  Bug #27921 View ignores precision for CAST()
  max_length counting fixed
sql/my_decimal.h:
  Bug #27921 View ignores precision for CAST()
  my_decimal_trim() implemented to unify zero precision handling
sql/sql_yacc.yy:
  Bug #27921 View ignores precision for CAST()
  create_func_cast calls simplified
---
 mysql-test/r/view.result | 15 ++++++++++++++-
 mysql-test/t/view.test   | 12 ++++++++++++
 sql/field.cc             |  3 +--
 sql/item_create.cc       | 16 +++++++++++-----
 sql/item_create.h        |  3 ++-
 sql/item_func.cc         | 19 ++++++++++++++++++-
 sql/item_func.h          |  2 +-
 sql/my_decimal.h         | 13 +++++++++++++
 sql/sql_yacc.yy          | 12 +++---------
 9 files changed, 75 insertions(+), 20 deletions(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 70dd6b2550f..8d9d802949d 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -1789,7 +1789,7 @@ drop table t1;
 create view v1 as select cast(1 as decimal);
 select * from v1;
 cast(1 as decimal)
-1.00
+1
 drop view v1;
 create table t1(f1 int);
 create table t2(f2 int);
@@ -3354,4 +3354,17 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	Using filesort
 DROP VIEW v1;
 DROP TABLE t1;
+CREATE VIEW v1 AS SELECT CAST( 1.23456789 AS DECIMAL( 7,5 ) ) AS col;
+SELECT * FROM v1;
+col
+1.23457
+DESCRIBE v1;
+Field	Type	Null	Key	Default	Extra
+col	decimal(7,5)	NO		0.00000	
+DROP VIEW v1;
+CREATE VIEW v1 AS SELECT CAST(1.23456789 AS DECIMAL(8,0)) AS col;
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(1.23456789 as decimal(8,0)) AS `col`
+DROP VIEW v1;
 End of 5.0 tests.
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index e5bf9de13eb..3275ba0a687 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -3221,4 +3221,16 @@ EXPLAIN SELECT * FROM t1 UNION SELECT * FROM v1 ORDER BY a;
 DROP VIEW v1;
 DROP TABLE t1;
 
+#
+# Bug #27921 View ignores precision for CAST()
+#
+CREATE VIEW v1 AS SELECT CAST( 1.23456789 AS DECIMAL( 7,5 ) ) AS col;
+SELECT * FROM v1;
+DESCRIBE v1;
+DROP VIEW v1;
+
+CREATE VIEW v1 AS SELECT CAST(1.23456789 AS DECIMAL(8,0)) AS col;
+SHOW CREATE VIEW v1;
+DROP VIEW v1;
+
 --echo End of 5.0 tests.
diff --git a/sql/field.cc b/sql/field.cc
index b2def4ca8d2..d2e72371bc1 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -8426,8 +8426,7 @@ bool create_field::init(THD *thd, char *fld_name, enum_field_types fld_type,
   case FIELD_TYPE_NULL:
     break;
   case FIELD_TYPE_NEWDECIMAL:
-    if (!fld_length && !decimals)
-      length= 10;
+    my_decimal_trim(&length, &decimals);
     if (length > DECIMAL_MAX_PRECISION)
     {
       my_error(ER_TOO_BIG_PRECISION, MYF(0), length, fld_name,
diff --git a/sql/item_create.cc b/sql/item_create.cc
index c1a81da0285..c4008d36aae 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -445,11 +445,13 @@ Item *create_load_file(Item* a)
 }
 
 
-Item *create_func_cast(Item *a, Cast_target cast_type, int len, int dec,
+Item *create_func_cast(Item *a, Cast_target cast_type,
+                       const char *c_len, const char *c_dec,
 		       CHARSET_INFO *cs)
 {
   Item *res;
-  int tmp_len;
+  ulong len;
+  uint dec;
   LINT_INIT(res);
 
   switch (cast_type) {
@@ -460,15 +462,18 @@ Item *create_func_cast(Item *a, Cast_target cast_type, int len, int dec,
   case ITEM_CAST_TIME:		res= new Item_time_typecast(a); break;
   case ITEM_CAST_DATETIME:	res= new Item_datetime_typecast(a); break;
   case ITEM_CAST_DECIMAL:
-    tmp_len= (len>0) ? len : 10;
-    if (tmp_len < dec)
+    len= c_len ? atoi(c_len) : 0;
+    dec= c_dec ? atoi(c_dec) : 0;
+    my_decimal_trim(&len, &dec);
+    if (len < dec)
     {
       my_error(ER_M_BIGGER_THAN_D, MYF(0), "");
       return 0;
     }
-    res= new Item_decimal_typecast(a, tmp_len, dec ? dec : 2);
+    res= new Item_decimal_typecast(a, len, dec);
     break;
   case ITEM_CAST_CHAR:
+    len= c_len ? atoi(c_len) : -1;
     res= new Item_char_typecast(a, len, cs ? cs : 
 				current_thd->variables.collation_connection);
     break;
@@ -476,6 +481,7 @@ Item *create_func_cast(Item *a, Cast_target cast_type, int len, int dec,
   return res;
 }
 
+
 Item *create_func_is_free_lock(Item* a)
 {
   current_thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
diff --git a/sql/item_create.h b/sql/item_create.h
index 2ff849263c6..46b209b3e49 100644
--- a/sql/item_create.h
+++ b/sql/item_create.h
@@ -27,7 +27,8 @@ Item *create_func_bit_length(Item* a);
 Item *create_func_coercibility(Item* a);
 Item *create_func_ceiling(Item* a);
 Item *create_func_char_length(Item* a);
-Item *create_func_cast(Item *a, Cast_target cast_type, int len, int dec,
+Item *create_func_cast(Item *a, Cast_target cast_type,
+                       const char *len, const char *dec,
                        CHARSET_INFO *cs);
 Item *create_func_connection_id(void);
 Item *create_func_conv(Item* a, Item *b, Item *c);
diff --git a/sql/item_func.cc b/sql/item_func.cc
index e761cf7fb43..aa04e4176d6 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1059,9 +1059,26 @@ my_decimal *Item_decimal_typecast::val_decimal(my_decimal *dec)
 
 void Item_decimal_typecast::print(String *str)
 {
+  char len_buf[20*3 + 1];
+  char *end;
+  CHARSET_INFO *cs= str->charset();
+
+  uint precision= my_decimal_length_to_precision(max_length, decimals,
+                                                 unsigned_flag);
   str->append(STRING_WITH_LEN("cast("));
   args[0]->print(str);
-  str->append(STRING_WITH_LEN(" as decimal)"));
+  str->append(STRING_WITH_LEN(" as decimal("));
+
+  end=int10_to_str(precision, len_buf,10);
+  str->append(len_buf, (uint32) (end - len_buf));
+
+  str->append(',');
+
+  end=int10_to_str(decimals, len_buf,10);
+  str->append(len_buf, (uint32) (end - len_buf));
+
+  str->append(')');
+  str->append(')');
 }
 
 
diff --git a/sql/item_func.h b/sql/item_func.h
index 952c828b251..597728cea6d 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -331,8 +331,8 @@ class Item_decimal_typecast :public Item_func
 public:
   Item_decimal_typecast(Item *a, int len, int dec) :Item_func(a)
   {
-    max_length= len + 2;
     decimals= dec;
+    max_length= my_decimal_precision_to_length(len, dec, unsigned_flag);
   }
   String *val_str(String *str);
   double val_real();
diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index 45270150d22..a30dceab19d 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -387,5 +387,18 @@ int my_decimal_cmp(const my_decimal *a, const my_decimal *b)
   return decimal_cmp((decimal_t*) a, (decimal_t*) b);
 }
 
+
+inline
+void my_decimal_trim(ulong *precision, uint *scale)
+{
+  if (!(*precision) && !(*scale))
+  {
+    *precision= 10;
+    *scale= 0;
+    return;
+  }
+}
+
+
 #endif /*my_decimal_h*/
 
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 4a50a602121..0bb5f6a5e25 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -4699,15 +4699,12 @@ simple_expr:
 	| ASCII_SYM '(' expr ')' { $$= new Item_func_ascii($3); }
 	| BINARY simple_expr %prec NEG
 	  {
-            $$= create_func_cast($2, ITEM_CAST_CHAR, -1, 0, &my_charset_bin);
+            $$= create_func_cast($2, ITEM_CAST_CHAR, NULL, NULL, &my_charset_bin);
 	  }
 	| CAST_SYM '(' expr AS cast_type ')'
 	  {
             LEX *lex= Lex;
-	    $$= create_func_cast($3, $5,
-                                 lex->length ? atoi(lex->length) : -1,
-                                 lex->dec ? atoi(lex->dec) : 0,
-                                 lex->charset);
+	    $$= create_func_cast($3, $5, lex->length, lex->dec, lex->charset);
             if (!$$)
               MYSQL_YYABORT;
 	  }
@@ -4715,10 +4712,7 @@ simple_expr:
 	  { $$= new Item_func_case(* $3, $2, $4 ); }
 	| CONVERT_SYM '(' expr ',' cast_type ')'
 	  {
-	    $$= create_func_cast($3, $5,
-				 Lex->length ? atoi(Lex->length) : -1,
-                                 Lex->dec ? atoi(Lex->dec) : 0,
-				 Lex->charset);
+	    $$= create_func_cast($3, $5, Lex->length, Lex->dec, Lex->charset);
             if (!$$)
               MYSQL_YYABORT;
 	  }

From a6da564a1d15925780f45d4bef439d4ae548f70d Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Thu, 10 May 2007 08:14:53 +0500
Subject: [PATCH 40/58] bug 27921 (Views ignore precision for CAST) test result
 fixed

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

diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result
index 454a3766572..15fa05da384 100644
--- a/mysql-test/r/cast.result
+++ b/mysql-test/r/cast.result
@@ -103,7 +103,7 @@ Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'a'
 select 10.0+cast('a' as decimal);
 10.0+cast('a' as decimal)
-10.00
+10.0
 Warnings:
 Warning	1292	Truncated incorrect DECIMAL value: 'a'
 select 10E+0+'a';
@@ -386,7 +386,7 @@ INSERT INTO t1 VALUES ('1.01', '2.02', '3.03', '4.04', '5.05');
 SELECT CAST(v AS DECIMAL), CAST(tt AS DECIMAL), CAST(t AS DECIMAL),
 CAST(mt AS DECIMAL), CAST(lt AS DECIMAL) from t1;
 CAST(v AS DECIMAL)	CAST(tt AS DECIMAL)	CAST(t AS DECIMAL)	CAST(mt AS DECIMAL)	CAST(lt AS DECIMAL)
-1.01	2.02	3.03	4.04	5.05
+1	2	3	4	5
 DROP TABLE t1;
 select cast(NULL as decimal(6)) as t1;
 t1

From 184cc3b5fa723e81236c34a2e60c1b5fc0a37406 Mon Sep 17 00:00:00 2001
From: unknown <igor@olga.mysql.com>
Date: Thu, 10 May 2007 00:06:24 -0700
Subject: [PATCH 41/58] Fixed bug #28189: in some rare cases optimizer
 preferred a more expensive ref access to a less expensive range access. This
 occurred only with InnoDB tables.

mysql-test/r/innodb_mysql.result:
  Added a test case for bug #28189.
mysql-test/t/innodb_mysql.test:
  Added a test case for bug #28189.
---
 mysql-test/r/innodb_mysql.result | 52 ++++++++++++++++++++++++++++++
 mysql-test/t/innodb_mysql.test   | 54 ++++++++++++++++++++++++++++++++
 sql/sql_select.cc                |  2 +-
 3 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index 009ae8776c3..48e01d8dd6f 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -544,4 +544,56 @@ id	c	counter
 3	b	2
 4	a	2
 drop table t1;
+CREATE TABLE t1(
+id int AUTO_INCREMENT PRIMARY KEY,
+stat_id int NOT NULL,
+acct_id int DEFAULT NULL,
+INDEX idx1 (stat_id, acct_id),
+INDEX idx2 (acct_id)
+) ENGINE=MyISAM;
+CREATE TABLE t2(
+id int AUTO_INCREMENT PRIMARY KEY,
+stat_id int NOT NULL,
+acct_id int DEFAULT NULL,
+INDEX idx1 (stat_id, acct_id),
+INDEX idx2 (acct_id)
+) ENGINE=InnoDB;
+INSERT INTO t1(stat_id,acct_id) VALUES
+(1,759), (2,831), (3,785), (4,854), (1,921),
+(1,553), (2,589), (3,743), (2,827), (2,545),
+(4,779), (4,783), (1,597), (1,785), (4,832),
+(1,741), (1,833), (3,788), (2,973), (1,907);
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+UPDATE t1 SET acct_id=785 
+WHERE MOD(stat_id,2)=0 AND MOD(id,stat_id)=MOD(acct_id,stat_id);
+OPTIMIZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	status	OK
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+40960
+SELECT COUNT(*) FROM t1 WHERE acct_id=785;
+COUNT(*)
+8702
+EXPLAIN SELECT COUNT(*) FROM t1 WHERE stat_id IN (1,3) AND acct_id=785;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	idx1,idx2	idx1	9	NULL	2	Using where; Using index
+INSERT INTO t2 SELECT * FROM t1;
+OPTIMIZE TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	optimize	status	OK
+EXPLAIN SELECT COUNT(*) FROM t2 WHERE stat_id IN (1,3) AND acct_id=785;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	range	idx1,idx2	idx1	9	NULL	2	Using where; Using index
+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 c9e1de8c3ab..90f9047291c 100644
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
@@ -518,4 +518,58 @@ select * from t1;
 
 drop table t1;
 
+#
+# Bug #28189: optimizer erroniously prefers ref access to range access 
+#             for an InnoDB table
+#
+
+CREATE TABLE t1(
+  id int AUTO_INCREMENT PRIMARY KEY,
+  stat_id int NOT NULL,
+  acct_id int DEFAULT NULL,
+  INDEX idx1 (stat_id, acct_id),
+  INDEX idx2 (acct_id)
+) ENGINE=MyISAM;
+
+CREATE TABLE t2(
+  id int AUTO_INCREMENT PRIMARY KEY,
+  stat_id int NOT NULL,
+  acct_id int DEFAULT NULL,
+  INDEX idx1 (stat_id, acct_id),
+  INDEX idx2 (acct_id)
+) ENGINE=InnoDB;
+
+INSERT INTO t1(stat_id,acct_id) VALUES
+  (1,759), (2,831), (3,785), (4,854), (1,921),
+  (1,553), (2,589), (3,743), (2,827), (2,545),
+  (4,779), (4,783), (1,597), (1,785), (4,832),
+  (1,741), (1,833), (3,788), (2,973), (1,907);
+
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
+UPDATE t1 SET acct_id=785 
+  WHERE MOD(stat_id,2)=0 AND MOD(id,stat_id)=MOD(acct_id,stat_id);
+OPTIMIZE TABLE t1;
+
+SELECT COUNT(*) FROM t1;
+SELECT COUNT(*) FROM t1 WHERE acct_id=785;
+
+EXPLAIN SELECT COUNT(*) FROM t1 WHERE stat_id IN (1,3) AND acct_id=785; 
+
+INSERT INTO t2 SELECT * FROM t1;
+OPTIMIZE TABLE t2;
+
+EXPLAIN SELECT COUNT(*) FROM t2 WHERE stat_id IN (1,3) AND acct_id=785;
+
+DROP TABLE t1,t2; 
+
 --echo End of 5.0 tests
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 3a480c01ac1..967322600a7 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -4189,7 +4189,7 @@ best_access_path(JOIN      *join,
       !(s->quick && best_key && s->quick->index == best_key->key &&      // (2)
         best_max_key_part >= s->table->quick_key_parts[best_key->key]) &&// (2)
       !((s->table->file->table_flags() & HA_TABLE_SCAN_ON_INDEX) &&      // (3)
-        ! s->table->used_keys.is_clear_all() && best_key) &&             // (3)
+        ! s->table->used_keys.is_clear_all() && best_key && !s->quick) &&// (3)
       !(s->table->force_index && best_key && !s->quick))                 // (4)
   {                                             // Check full join
     ha_rows rnd_records= s->found_records;

From d12a8413e37482307da04a2324d69e38800fb004 Mon Sep 17 00:00:00 2001
From: unknown <kostja@vajra.(none)>
Date: Thu, 10 May 2007 16:18:01 +0400
Subject: [PATCH 42/58] No semantical change. Move checks of compatibility of
 requested lock type and requested table operation from mysql_insert into a
 separate function.

sql/sql_insert.cc:
  Cleanup: move a number of locking related checks from mysql_insert
  to a separate function.
  Add comments.
---
 sql/sql_insert.cc | 176 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 126 insertions(+), 50 deletions(-)

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index f1d86224adb..1154e98475d 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -401,6 +401,79 @@ void mark_fields_used_by_triggers_for_insert_stmt(THD *thd, TABLE *table,
 }
 
 
+/**
+  Upgrade table-level lock of INSERT statement to TL_WRITE if
+  a more concurrent lock is infeasible for some reason. This is
+  necessary for engines without internal locking support (MyISAM).
+  An engine with internal locking implementation might later
+  downgrade the lock in handler::store_lock() method.
+*/
+
+void upgrade_lock_type(THD *thd, thr_lock_type *lock_type,
+                       enum_duplicates duplic,
+                       bool is_multi_insert)
+{
+  if (duplic == DUP_UPDATE ||
+      duplic == DUP_REPLACE && *lock_type == TL_WRITE_CONCURRENT_INSERT)
+  {
+    *lock_type= TL_WRITE;
+    return;
+  }
+
+  if (*lock_type == TL_WRITE_DELAYED)
+  {
+#ifdef EMBEDDED_LIBRARY
+    /* No auxiliary threads in the embedded server. */
+    *lock_type= TL_WRITE;
+    return;
+#else
+    /*
+      We do not use delayed threads if:
+      - we're running in the safe mode or skip-new - the feature
+         is disabled in these modes
+      - we're running this query in statement level replication,
+        on a replication slave - because we must ensure serial
+        execution of queries on the slave
+      - it is INSERT .. ON DUPLICATE KEY UPDATE - in this case the
+        insert cannot be concurrent
+    */
+    if (specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE) ||
+        thd->slave_thread ||
+        thd->variables.max_insert_delayed_threads == 0)
+    {
+      *lock_type= TL_WRITE;
+      return;
+    }
+#endif
+    bool log_on= (thd->options & OPTION_BIN_LOG ||
+                  ! (thd->security_ctx->master_access & SUPER_ACL));
+    if (log_on && mysql_bin_log.is_open() && is_multi_insert)
+    {
+      /*
+        Statement-based binary logging does not work in this case, because:
+        a) two concurrent statements may have their rows intermixed in the
+        queue, leading to autoincrement replication problems on slave (because
+        the values generated used for one statement don't depend only on the
+        value generated for the first row of this statement, so are not
+        replicable)
+        b) if first row of the statement has an error the full statement is
+        not binlogged, while next rows of the statement may be inserted.
+        c) if first row succeeds, statement is binlogged immediately with a
+        zero error code (i.e. "no error"), if then second row fails, query
+        will fail on slave too and slave will stop (wrongly believing that the
+        master got no error).
+        So we fall back to non-delayed INSERT.
+      */
+      *lock_type= TL_WRITE;
+    }
+  }
+}
+
+
+/**
+  INSERT statement implementation
+*/
+
 bool mysql_insert(THD *thd,TABLE_LIST *table_list,
                   List<Item> &fields,
                   List<List_item> &values_list,
@@ -436,58 +509,31 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   DBUG_ENTER("mysql_insert");
 
   /*
-    in safe mode or with skip-new change delayed insert to be regular
-    if we are told to replace duplicates, the insert cannot be concurrent
-    delayed insert changed to regular in slave thread
-   */
-#ifdef EMBEDDED_LIBRARY
-  if (lock_type == TL_WRITE_DELAYED)
-    lock_type=TL_WRITE;
-#else
-  if ((lock_type == TL_WRITE_DELAYED &&
-       ((specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) ||
-	thd->slave_thread || !thd->variables.max_insert_delayed_threads)) ||
-      (lock_type == TL_WRITE_CONCURRENT_INSERT && duplic == DUP_REPLACE) ||
-      (duplic == DUP_UPDATE))
-    lock_type=TL_WRITE;
-#endif
-  if ((lock_type == TL_WRITE_DELAYED) &&
-      log_on && mysql_bin_log.is_open() &&
-      (values_list.elements > 1))
+    Upgrade lock type if the requested lock is incompatible with
+    the current connection mode or table operation.
+  */
+  upgrade_lock_type(thd, &table_list->lock_type, duplic,
+                    values_list.elements > 1);
+  lock_type= table_list->lock_type;
+
+  /*
+    We can't write-delayed into a table locked with LOCK TABLES:
+    this will lead to a deadlock, since the delayed thread will
+    never be able to get a lock on the table. QQQ: why not
+    upgrade the lock here instead?
+  */
+  if (lock_type == TL_WRITE_DELAYED && thd->locked_tables &&
+      find_locked_table(thd, table_list->db, table_list->table_name))
   {
-    /*
-      Statement-based binary logging does not work in this case, because:
-      a) two concurrent statements may have their rows intermixed in the
-      queue, leading to autoincrement replication problems on slave (because
-      the values generated used for one statement don't depend only on the
-      value generated for the first row of this statement, so are not
-      replicable)
-      b) if first row of the statement has an error the full statement is
-      not binlogged, while next rows of the statement may be inserted.
-      c) if first row succeeds, statement is binlogged immediately with a
-      zero error code (i.e. "no error"), if then second row fails, query
-      will fail on slave too and slave will stop (wrongly believing that the
-      master got no error).
-      So we fallback to non-delayed INSERT.
-    */
-    lock_type= TL_WRITE;
+    my_error(ER_DELAYED_INSERT_TABLE_LOCKED, MYF(0),
+             table_list->table_name);
+    DBUG_RETURN(TRUE);
   }
-  table_list->lock_type= lock_type;
 
 #ifndef EMBEDDED_LIBRARY
   if (lock_type == TL_WRITE_DELAYED)
   {
     res= 1;
-    if (thd->locked_tables)
-    {
-      DBUG_ASSERT(table_list->db); /* Must be set in the parser */
-      if (find_locked_table(thd, table_list->db, table_list->table_name))
-      {
-	my_error(ER_DELAYED_INSERT_TABLE_LOCKED, MYF(0),
-                 table_list->table_name);
-	DBUG_RETURN(TRUE);
-      }
-    }
     if ((table= delayed_get_table(thd,table_list)) && !thd->is_fatal_error)
     {
       /*
@@ -1460,6 +1506,12 @@ public:
   }
 };
 
+/**
+  delayed_insert - context of a thread responsible for delayed insert
+  into one table. When processing delayed inserts, we create an own
+  thread for every distinct table. Later on all delayed inserts directed
+  into that table are handled by a dedicated thread.
+*/
 
 class delayed_insert :public ilink {
   uint locks_in_memory;
@@ -1551,6 +1603,12 @@ public:
 I_List<delayed_insert> delayed_threads;
 
 
+/**
+  Return an instance of delayed insert thread that can handle
+  inserts into a given table, if it exists. Otherwise return NULL.
+*/
+
+static
 delayed_insert *find_handler(THD *thd, TABLE_LIST *table_list)
 {
   thd->proc_info="waiting for delay_list";
@@ -1571,6 +1629,18 @@ delayed_insert *find_handler(THD *thd, TABLE_LIST *table_list)
 }
 
 
+/**
+  Attempt to find or create a delayed insert thread to handle inserts
+  into this table.
+
+  @return Return an instance of the table in the delayed thread
+  @retval  NULL  too many delayed threads OR
+                 this thread ran out of resources OR
+                 a newly created delayed insert thread ran out of resources OR
+                 the delayed insert thread failed to open the table.
+                 In the last three cases an error is set in THD.
+*/
+
 static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
 {
   int error;
@@ -1679,11 +1749,17 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
 }
 
 
-/*
-  As we can't let many threads modify the same TABLE structure, we create
-  an own structure for each tread.  This includes a row buffer to save the
-  column values and new fields that points to the new row buffer.
-  The memory is allocated in the client thread and is freed automaticly.
+/**
+  As we can't let many client threads modify the same TABLE
+  structure of the dedicated delayed insert thread, we create an
+  own structure for each client thread. This includes a row
+  buffer to save the column values and new fields that point to
+  the new row buffer. The memory is allocated in the client
+  thread and is freed automatically.
+
+  @pre This function is called from the client thread.  Delayed
+       insert thread mutex must be acquired before invoking this
+       function.
 */
 
 TABLE *delayed_insert::get_local_table(THD* client_thd)

From 50aa9d2bb2bced9d92f4f95fc5e9870836d58305 Mon Sep 17 00:00:00 2001
From: unknown <thek@adventure.(none)>
Date: Thu, 10 May 2007 14:54:55 +0200
Subject: [PATCH 43/58] Corrected merge error; missing line in debug statement.

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

diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 96a8dc577df..33d658ce6a1 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -871,6 +871,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
 CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \
 sql mode: 0x%lx, sort len: %lu, conncat len: %lu, div_precision: %lu, \
 def_week_frmt: %lu",                          
+                          (int)flags.client_long_flag,
                           (int)flags.client_protocol_41,
                           (int)flags.more_results_exists,
                           flags.pkt_nr,

From 30184f9624b93b12844f2076ae6b113a0cf1d619 Mon Sep 17 00:00:00 2001
From: unknown <kostja@vajra.(none)>
Date: Thu, 10 May 2007 18:27:36 +0400
Subject: [PATCH 44/58] Follow the coding style with class names.

sql/sql_insert.cc:
  delayed_insert -> Delayed_insert
---
 sql/sql_class.h   |  4 ++--
 sql/sql_insert.cc | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 7f195d5a048..ad9315ae5eb 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -495,7 +495,7 @@ public:
 };
 
 
-class delayed_insert;
+class Delayed_insert;
 class select_result;
 
 #define THD_SENTRY_MAGIC 0xfeedd1ff
@@ -1248,7 +1248,7 @@ public:
   time_t     start_time,time_after_lock,user_time;
   time_t     connect_time,thr_create_time; // track down slow pthread_create
   thr_lock_type update_lock_default;
-  delayed_insert *di;
+  Delayed_insert *di;
 
   /* <> 0 if we are inside of trigger or stored function. */
   uint in_sub_stmt;
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 1154e98475d..db4c2f64d6a 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -29,7 +29,7 @@
   waited for to open and lock the table.
 
   If accessing the thread succeeded, in
-  delayed_insert::get_local_table() the table of the thread is copied
+  Delayed_insert::get_local_table() the table of the thread is copied
   for local use. A copy is required because the normal insert logic
   works on a target table, but the other threads table object must not
   be used. The insert logic uses the record buffer to create a record.
@@ -1507,13 +1507,13 @@ public:
 };
 
 /**
-  delayed_insert - context of a thread responsible for delayed insert
+  Delayed_insert - context of a thread responsible for delayed insert
   into one table. When processing delayed inserts, we create an own
   thread for every distinct table. Later on all delayed inserts directed
   into that table are handled by a dedicated thread.
 */
 
-class delayed_insert :public ilink {
+class Delayed_insert :public ilink {
   uint locks_in_memory;
 public:
   THD thd;
@@ -1527,7 +1527,7 @@ public:
   ulong group_count;
   TABLE_LIST table_list;			// Argument
 
-  delayed_insert()
+  Delayed_insert()
     :locks_in_memory(0),
      table(0),tables_in_use(0),stacked_inserts(0), status(0), dead(0),
      group_count(0)
@@ -1552,7 +1552,7 @@ public:
     delayed_insert_threads++;
     VOID(pthread_mutex_unlock(&LOCK_thread_count));
   }
-  ~delayed_insert()
+  ~Delayed_insert()
   {
     /* The following is not really needed, but just for safety */
     delayed_row *row;
@@ -1600,7 +1600,7 @@ public:
 };
 
 
-I_List<delayed_insert> delayed_threads;
+I_List<Delayed_insert> delayed_threads;
 
 
 /**
@@ -1609,12 +1609,12 @@ I_List<delayed_insert> delayed_threads;
 */
 
 static
-delayed_insert *find_handler(THD *thd, TABLE_LIST *table_list)
+Delayed_insert *find_handler(THD *thd, TABLE_LIST *table_list)
 {
   thd->proc_info="waiting for delay_list";
   pthread_mutex_lock(&LOCK_delayed_insert);	// Protect master list
-  I_List_iterator<delayed_insert> it(delayed_threads);
-  delayed_insert *tmp;
+  I_List_iterator<Delayed_insert> it(delayed_threads);
+  Delayed_insert *tmp;
   while ((tmp=it++))
   {
     if (!strcmp(tmp->thd.db,table_list->db) &&
@@ -1633,7 +1633,7 @@ delayed_insert *find_handler(THD *thd, TABLE_LIST *table_list)
   Attempt to find or create a delayed insert thread to handle inserts
   into this table.
 
-  @return Return an instance of the table in the delayed thread
+  @return Return a local copy of the table in the delayed thread
   @retval  NULL  too many delayed threads OR
                  this thread ran out of resources OR
                  a newly created delayed insert thread ran out of resources OR
@@ -1644,7 +1644,7 @@ delayed_insert *find_handler(THD *thd, TABLE_LIST *table_list)
 static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
 {
   int error;
-  delayed_insert *tmp;
+  Delayed_insert *tmp;
   TABLE *table;
   DBUG_ENTER("delayed_get_table");
 
@@ -1668,9 +1668,9 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
     */
     if (! (tmp= find_handler(thd, table_list)))
     {
-      if (!(tmp=new delayed_insert()))
+      if (!(tmp=new Delayed_insert()))
       {
-	my_error(ER_OUTOFMEMORY,MYF(0),sizeof(delayed_insert));
+	my_error(ER_OUTOFMEMORY,MYF(0),sizeof(Delayed_insert));
 	goto err1;
       }
       pthread_mutex_lock(&LOCK_thread_count);
@@ -1762,12 +1762,12 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
        function.
 */
 
-TABLE *delayed_insert::get_local_table(THD* client_thd)
+TABLE *Delayed_insert::get_local_table(THD* client_thd)
 {
   my_ptrdiff_t adjust_ptrs;
   Field **field,**org_field, *found_next_number_field;
   TABLE *copy;
-  DBUG_ENTER("delayed_insert::get_local_table");
+  DBUG_ENTER("Delayed_insert::get_local_table");
 
   /* First request insert thread to get a lock */
   status=1;
@@ -1875,7 +1875,7 @@ static int write_delayed(THD *thd,TABLE *table,enum_duplicates duplic, bool igno
 			 char *query, uint query_length, bool log_on)
 {
   delayed_row *row=0;
-  delayed_insert *di=thd->di;
+  Delayed_insert *di=thd->di;
   DBUG_ENTER("write_delayed");
 
   thd->proc_info="waiting for handler insert";
@@ -1943,7 +1943,7 @@ static int write_delayed(THD *thd,TABLE *table,enum_duplicates duplic, bool igno
 static void end_delayed_insert(THD *thd)
 {
   DBUG_ENTER("end_delayed_insert");
-  delayed_insert *di=thd->di;
+  Delayed_insert *di=thd->di;
   pthread_mutex_lock(&di->mutex);
   DBUG_PRINT("info",("tables in use: %d",di->tables_in_use));
   if (!--di->tables_in_use || di->thd.killed)
@@ -1962,8 +1962,8 @@ void kill_delayed_threads(void)
 {
   VOID(pthread_mutex_lock(&LOCK_delayed_insert)); // For unlink from list
 
-  I_List_iterator<delayed_insert> it(delayed_threads);
-  delayed_insert *tmp;
+  I_List_iterator<Delayed_insert> it(delayed_threads);
+  Delayed_insert *tmp;
   while ((tmp=it++))
   {
     tmp->thd.killed= THD::KILL_CONNECTION;
@@ -1995,7 +1995,7 @@ void kill_delayed_threads(void)
 
 pthread_handler_t handle_delayed_insert(void *arg)
 {
-  delayed_insert *di=(delayed_insert*) arg;
+  Delayed_insert *di=(Delayed_insert*) arg;
   THD *thd= &di->thd;
 
   pthread_detach_this_thread();
@@ -2231,7 +2231,7 @@ static void free_delayed_insert_blobs(register TABLE *table)
 }
 
 
-bool delayed_insert::handle_inserts(void)
+bool Delayed_insert::handle_inserts(void)
 {
   int error;
   ulong max_rows;
@@ -3152,8 +3152,8 @@ void select_create::abort()
 #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
 template class List_iterator_fast<List_item>;
 #ifndef EMBEDDED_LIBRARY
-template class I_List<delayed_insert>;
-template class I_List_iterator<delayed_insert>;
+template class I_List<Delayed_insert>;
+template class I_List_iterator<Delayed_insert>;
 template class I_List<delayed_row>;
 #endif /* EMBEDDED_LIBRARY */
 #endif /* HAVE_EXPLICIT_TEMPLATE_INSTANTIATION */

From 361905687e473a71083c5d3c69f3b939943cce7c Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Fri, 11 May 2007 03:17:05 +0500
Subject: [PATCH 45/58] Fixed bug #28000. Bug occurs in INSERT IGNORE ...
 SELECT ... ON DUPLICATE KEY UPDATE statements, when SELECT returns duplicated
 values and UPDATE clause tries to assign NULL values to NOT NULL fields.
 NOTE: By current design MySQL server treats INSERT IGNORE ... ON DUPLICATE
 statements as INSERT ... ON DUPLICATE with update of duplicated records, but
 MySQL manual lacks this information. After this fix such behaviour becomes
 legalized.

The write_record() function was returning error values even within
INSERT IGNORE, because ignore_errors parameter of
the fill_record_n_invoke_before_triggers() function call was
always set to FALSE. FALSE is replaced by info->ignore.


sql/sql_insert.cc:
  Fixed bug #28000:
  The write_record() function was returning error values even within
  INSERT IGNORE, because ignore_errors parameter of
  the fill_record_n_invoke_before_triggers() function call was
  always set to FALSE. FALSE is replaced by info->ignore.
mysql-test/t/insert_update.test:
  Added test case for bug #28000.
mysql-test/r/insert_update.result:
  Added test case for bug #28000.
---
 mysql-test/r/insert_update.result | 35 +++++++++++++++++++++++++++++++
 mysql-test/t/insert_update.test   | 26 +++++++++++++++++++++++
 sql/sql_insert.cc                 |  3 ++-
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result
index 4a3e87d9d48..375961292a3 100644
--- a/mysql-test/r/insert_update.result
+++ b/mysql-test/r/insert_update.result
@@ -358,3 +358,38 @@ id	c1	cnt
 5	Y	1
 6	Z	1
 DROP TABLE t1;
+CREATE TABLE t1 (
+id INT AUTO_INCREMENT PRIMARY KEY,
+c1 INT NOT NULL,
+cnt INT DEFAULT 1
+);
+INSERT INTO t1 (id,c1) VALUES (1,10);
+SELECT * FROM t1;
+id	c1	cnt
+1	10	1
+CREATE TABLE t2 (id INT, c1 INT);
+INSERT INTO t2 VALUES (1,NULL), (2,2);
+INSERT INTO t1 (id,c1) SELECT 1,NULL
+ON DUPLICATE KEY UPDATE c1=NULL;
+ERROR 23000: Column 'c1' cannot be null
+SELECT * FROM t1;
+id	c1	cnt
+1	10	1
+INSERT IGNORE INTO t1 (id,c1) SELECT 1,NULL
+ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;
+Warnings:
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'c1' at row 1
+Error	1048	Column 'c1' cannot be null
+SELECT * FROM t1;
+id	c1	cnt
+1	0	2
+INSERT IGNORE INTO t1 (id,c1) SELECT * FROM t2
+ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;
+Warnings:
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'c1' at row 1
+Error	1048	Column 'c1' cannot be null
+SELECT * FROM t1;
+id	c1	cnt
+1	0	3
+2	2	1
+DROP TABLE t1;
diff --git a/mysql-test/t/insert_update.test b/mysql-test/t/insert_update.test
index 0e199dab4bd..725fbdb25d7 100644
--- a/mysql-test/t/insert_update.test
+++ b/mysql-test/t/insert_update.test
@@ -264,3 +264,29 @@ INSERT  INTO t1 (c1) VALUES ('A'), ('X'), ('Y'), ('Z')
   ON DUPLICATE KEY UPDATE cnt=cnt+1;
 SELECT * FROM t1;
 DROP TABLE t1;
+
+#
+# Bug#28000: INSERT IGNORE ... SELECT ... ON DUPLICATE
+# with erroneous UPDATE: NOT NULL field with NULL value.
+#
+CREATE TABLE t1 (
+  id INT AUTO_INCREMENT PRIMARY KEY,
+  c1 INT NOT NULL,
+  cnt INT DEFAULT 1
+);
+INSERT INTO t1 (id,c1) VALUES (1,10);
+SELECT * FROM t1;
+CREATE TABLE t2 (id INT, c1 INT);
+INSERT INTO t2 VALUES (1,NULL), (2,2);
+--error 1048
+INSERT INTO t1 (id,c1) SELECT 1,NULL
+  ON DUPLICATE KEY UPDATE c1=NULL;
+SELECT * FROM t1;
+INSERT IGNORE INTO t1 (id,c1) SELECT 1,NULL
+  ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;
+SELECT * FROM t1;
+INSERT IGNORE INTO t1 (id,c1) SELECT * FROM t2
+  ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;
+SELECT * FROM t1;
+
+DROP TABLE t1;
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index f1d86224adb..5f54bc2b43b 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1258,7 +1258,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
         DBUG_ASSERT(info->update_fields->elements ==
                     info->update_values->elements);
         if (fill_record_n_invoke_before_triggers(thd, *info->update_fields,
-                                                 *info->update_values, 0,
+                                                 *info->update_values,
+                                                 info->ignore,
                                                  table->triggers,
                                                  TRG_EVENT_UPDATE))
           goto before_trg_err;

From a0567199b118f14ec346249d91aabe2ee5d99354 Mon Sep 17 00:00:00 2001
From: unknown <kostja@vajra.(none)>
Date: Fri, 11 May 2007 17:26:12 +0400
Subject: [PATCH 46/58] Cleanup: now that we have Lex_input_stream, finish the
 transition by moving yet another relevant flag to it from struct LEX.

mysql-test/r/ps.result:
  Update result.
mysql-test/r/ps_1general.result:
  Update result.
mysql-test/t/ps.test:
  New error code.
mysql-test/t/ps_1general.test:
  New error code.
sql/sql_lex.cc:
  Move stmt_prepare_mode to Lex_input_stream.
sql/sql_lex.h:
  Move stmt_prepare_mode to class Lex_input_stream
sql/sql_prepare.cc:
  Move stmt_prepare_mode to Lex_input_stream
sql/sql_yacc.yy:
  Remove dead code.
---
 mysql-test/r/ps.result          |  6 +++---
 mysql-test/r/ps_1general.result |  6 +++---
 mysql-test/t/ps.test            |  6 +++---
 mysql-test/t/ps_1general.test   |  6 +++---
 sql/sql_lex.cc                  |  8 ++++----
 sql/sql_lex.h                   | 10 +++++-----
 sql/sql_prepare.cc              |  5 ++++-
 sql/sql_yacc.yy                 | 15 ---------------
 8 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 20bff6bda1c..96abff8d7f6 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -26,11 +26,11 @@ ERROR HY000: Unknown prepared statement handler (no_such_statement) given to DEA
 execute stmt1;
 ERROR HY000: Incorrect arguments to EXECUTE
 prepare stmt2 from 'prepare nested_stmt from "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
+ERROR HY000: This command is not supported in the prepared statement protocol yet
 prepare stmt2 from 'execute stmt1';
-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 'stmt1' at line 1
+ERROR HY000: This command is not supported in the prepared statement protocol yet
 prepare stmt2 from 'deallocate prepare z';
-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 'z' at line 1
+ERROR HY000: This command is not supported in the prepared statement protocol yet
 prepare stmt3 from 'insert into t1 values (?,?)';
 set @arg1=5, @arg2='five';
 execute stmt3 using @arg1, @arg2;
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index ac8ae6def9f..df4ec793325 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -391,11 +391,11 @@ drop table t5 ;
 deallocate prepare stmt_do ;
 deallocate prepare stmt_set ;
 prepare stmt1 from ' prepare stmt2 from '' 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
+ERROR HY000: This command is not supported in the prepared statement protocol yet
 prepare stmt1 from ' execute stmt2 ' ;
-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 'stmt2' at line 1
+ERROR HY000: This command is not supported in the prepared statement protocol yet
 prepare stmt1 from ' deallocate prepare never_prepared ' ;
-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 'never_prepared' at line 1
+ERROR HY000: This command is not supported in the prepared statement protocol yet
 prepare stmt4 from ' use test ' ;
 ERROR HY000: This command is not supported in the prepared statement protocol yet
 prepare stmt3 from ' create database mysqltest ';
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 3fbcf84a1f9..6c93ae25045 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -33,13 +33,13 @@ deallocate prepare no_such_statement;
 execute stmt1;
 
 # Nesting ps commands is not allowed: 
---error 1064
+--error ER_UNSUPPORTED_PS 
 prepare stmt2 from 'prepare nested_stmt from "select 1"';
 
---error 1064
+--error ER_UNSUPPORTED_PS 
 prepare stmt2 from 'execute stmt1';
 
---error 1064
+--error ER_UNSUPPORTED_PS 
 prepare stmt2 from 'deallocate prepare z';
 
 # PS insert 
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test
index d4e6a62c09e..2e7fea2ff3d 100644
--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/t/ps_1general.test
@@ -416,11 +416,11 @@ deallocate prepare stmt_do ;
 deallocate prepare stmt_set ;
 
 ## nonsense like prepare of prepare,execute or deallocate
---error 1064
+--error ER_UNSUPPORTED_PS 
 prepare stmt1 from ' prepare stmt2 from '' select 1 ''  ' ;
---error 1064
+--error ER_UNSUPPORTED_PS 
 prepare stmt1 from ' execute stmt2 ' ;
---error 1064
+--error ER_UNSUPPORTED_PS 
 prepare stmt1 from ' deallocate prepare never_prepared ' ;
 
 ## switch the database connection
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 6a44a883b51..7bcdc499011 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -123,7 +123,8 @@ Lex_input_stream::Lex_input_stream(THD *thd,
   buf(buffer),
   next_state(MY_LEX_START),
   found_semicolon(NULL),
-  ignore_space(test(thd->variables.sql_mode & MODE_IGNORE_SPACE))
+  ignore_space(test(thd->variables.sql_mode & MODE_IGNORE_SPACE)),
+  stmt_prepare_mode(FALSE)
 {
 }
 
@@ -172,7 +173,6 @@ void lex_start(THD *thd)
   lex->describe= 0;
   lex->subqueries= FALSE;
   lex->view_prepare_mode= FALSE;
-  lex->stmt_prepare_mode= FALSE;
   lex->derived_tables= 0;
   lex->lock_option= TL_READ;
   lex->safe_to_cache_query= 1;
@@ -586,7 +586,7 @@ int MYSQLlex(void *arg, void *yythd)
         its value in a query for the binlog, the query must stay
         grammatically correct.
       */
-      else if (c == '?' && lex->stmt_prepare_mode && !ident_map[yyPeek()])
+      else if (c == '?' && lip->stmt_prepare_mode && !ident_map[yyPeek()])
         return(PARAM_MARKER);
       return((int) c);
 
@@ -989,7 +989,7 @@ int MYSQLlex(void *arg, void *yythd)
       if (yyPeek())
       {
         if ((thd->client_capabilities & CLIENT_MULTI_STATEMENTS) && 
-            !lex->stmt_prepare_mode)
+            !lip->stmt_prepare_mode)
         {
 	  lex->safe_to_cache_query= 0;
           lip->found_semicolon= lip->ptr;
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index d07de73d5b9..d34124095d3 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -954,6 +954,11 @@ public:
 
   /** SQL_MODE = IGNORE_SPACE. */
   bool ignore_space;
+  /*
+    TRUE if we're parsing a prepared statement: in this mode
+    we should allow placeholders and disallow multi-statements.
+  */
+  bool stmt_prepare_mode;
 };
 
 
@@ -1082,11 +1087,6 @@ typedef struct st_lex : public Query_tables_list
     to an .frm file. We need this definition to stay untouched.
   */
   bool view_prepare_mode;
-  /*
-    TRUE if we're parsing a prepared statement: in this mode
-    we should allow placeholders and disallow multistatements.
-  */
-  bool stmt_prepare_mode;
   bool safe_to_cache_query;
   bool subqueries, ignore;
   st_parsing_options parsing_options;
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index d3cc3613b4a..9c41ee57a21 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1762,6 +1762,9 @@ static bool check_prepared_statement(Prepared_statement *stmt,
   case SQLCOM_OPTIMIZE:
     break;
 
+  case SQLCOM_PREPARE:
+  case SQLCOM_EXECUTE:
+  case SQLCOM_DEALLOCATE_PREPARE:
   default:
     /* All other statements are not supported yet. */
     my_message(ER_UNSUPPORTED_PS, ER(ER_UNSUPPORTED_PS), MYF(0));
@@ -2801,10 +2804,10 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len)
   thd->stmt_arena= this;
 
   Lex_input_stream lip(thd, thd->query, thd->query_length);
+  lip.stmt_prepare_mode= TRUE;
   thd->m_lip= &lip;
   lex_start(thd);
   lex->safe_to_cache_query= FALSE;
-  lex->stmt_prepare_mode= TRUE;
   int err= MYSQLparse((void *)thd);
 
   error= err || thd->is_fatal_error ||
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 390a991c7b6..847d4df6935 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1276,11 +1276,6 @@ deallocate:
         {
           THD *thd=YYTHD;
           LEX *lex= thd->lex;
-          if (lex->stmt_prepare_mode)
-          {
-            my_parse_error(ER(ER_SYNTAX_ERROR));
-            MYSQL_YYABORT;
-          }
           lex->sql_command= SQLCOM_DEALLOCATE_PREPARE;
           lex->prepared_stmt_name= $3;
         };
@@ -1296,11 +1291,6 @@ prepare:
         {
           THD *thd=YYTHD;
           LEX *lex= thd->lex;
-          if (lex->stmt_prepare_mode)
-          {
-            my_parse_error(ER(ER_SYNTAX_ERROR));
-            MYSQL_YYABORT;
-          }
           lex->sql_command= SQLCOM_PREPARE;
           lex->prepared_stmt_name= $2;
         };
@@ -1326,11 +1316,6 @@ execute:
         {
           THD *thd=YYTHD;
           LEX *lex= thd->lex;
-          if (lex->stmt_prepare_mode)
-          {
-            my_parse_error(ER(ER_SYNTAX_ERROR));
-            MYSQL_YYABORT;
-          }
           lex->sql_command= SQLCOM_EXECUTE;
           lex->prepared_stmt_name= $2;
         }

From 8bbe6f23db9e4c2bc4e4240751caf62588ab4f50 Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Fri, 11 May 2007 20:56:22 +0500
Subject: [PATCH 47/58] merging fixes

mysql-test/r/type_datetime.result:
  result fixed
mysql-test/t/type_datetime.test:
  testcase fixed
sql/item_func.cc:
  my_decimal_length_to_precision used
sql/my_decimal.h:
  merging fix
---
 mysql-test/r/type_datetime.result | 4 ++--
 mysql-test/t/type_datetime.test   | 2 +-
 sql/item_func.cc                  | 9 ++++++---
 sql/my_decimal.h                  | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result
index 8e671597bca..b45ddd597c4 100644
--- a/mysql-test/r/type_datetime.result
+++ b/mysql-test/r/type_datetime.result
@@ -328,8 +328,8 @@ least(cast('01-01-01' as datetime), '01-01-02') + 0
 select cast(least(cast('01-01-01' as datetime), '01-01-02') as signed);
 cast(least(cast('01-01-01' as datetime), '01-01-02') as signed)
 20010101000000
-select cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal);
-cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal)
+select cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal(20,2));
+cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal(20,2))
 20010101000000.00
 DROP PROCEDURE IF EXISTS test27759 ;
 CREATE PROCEDURE test27759()
diff --git a/mysql-test/t/type_datetime.test b/mysql-test/t/type_datetime.test
index 5eb9d317a8c..c111f2f02cf 100644
--- a/mysql-test/t/type_datetime.test
+++ b/mysql-test/t/type_datetime.test
@@ -207,7 +207,7 @@ select least(cast('01-01-01' as date), '01-01-02') + 0;
 select greatest(cast('01-01-01' as date), '01-01-02') + 0;
 select least(cast('01-01-01' as datetime), '01-01-02') + 0;
 select cast(least(cast('01-01-01' as datetime), '01-01-02') as signed);
-select cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal);
+select cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal(20,2));
 --disable_warnings
 DROP PROCEDURE IF EXISTS test27759 ;
 --enable_warnings
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 7659494f624..c0a9647e382 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1051,6 +1051,8 @@ my_decimal *Item_decimal_typecast::val_decimal(my_decimal *dec)
 {
   my_decimal tmp_buf, *tmp= args[0]->val_decimal(&tmp_buf);
   bool sign;
+  uint precision;
+
   if ((null_value= args[0]->null_value))
     return NULL;
   my_decimal_round(E_DEC_FATAL_ERROR, tmp, decimals, FALSE, dec);
@@ -1063,9 +1065,11 @@ my_decimal *Item_decimal_typecast::val_decimal(my_decimal *dec)
       goto err;
     }
   }
-  if (max_length - 2 - decimals < (uint) my_decimal_intg(dec))
+  precision= my_decimal_length_to_precision(max_length,
+                                            decimals, unsigned_flag);
+  if (precision - decimals < (uint) my_decimal_intg(dec))
   {
-    max_my_decimal(dec, max_length - 2, decimals);
+    max_my_decimal(dec, precision, decimals);
     dec->sign(sign);
     goto err;
   }
@@ -1084,7 +1088,6 @@ void Item_decimal_typecast::print(String *str)
 {
   char len_buf[20*3 + 1];
   char *end;
-  CHARSET_INFO *cs= str->charset();
 
   uint precision= my_decimal_length_to_precision(max_length, decimals,
                                                  unsigned_flag);
diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index b19d6e40cb4..9558b00f0cf 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -395,6 +395,7 @@ int my_decimal_intg(const my_decimal *a)
 }
 
 
+inline
 void my_decimal_trim(ulong *precision, uint *scale)
 {
   if (!(*precision) && !(*scale))

From c5a82455966e729219d164941f1461bb01a26290 Mon Sep 17 00:00:00 2001
From: unknown <dlenev@mockturtle.local>
Date: Fri, 11 May 2007 20:33:13 +0400
Subject: [PATCH 48/58] Fix for:   Bug #20662 "Infinite loop in CREATE TABLE IF
 NOT EXISTS ... SELECT               with locked tables"   Bug #20903 "Crash
 when using CREATE TABLE .. SELECT and triggers"   Bug #24738 "CREATE TABLE
 ... SELECT is not isolated properly"   Bug #24508 "Inconsistent results of
 CREATE TABLE ... SELECT when               temporary table exists"

Deadlock occured when one tried to execute CREATE TABLE IF NOT
EXISTS ... SELECT statement under LOCK TABLES which held
read lock on target table.
Attempt to execute the same statement for already existing
target table with triggers caused server crashes.
Also concurrent execution of CREATE TABLE ... SELECT statement
and other statements involving target table suffered from
various races (some of which might've led to deadlocks).
Finally, attempt to execute CREATE TABLE ... SELECT in case
when a temporary table with same name was already present
led to the insertion of data into this temporary table and
creation of empty non-temporary table.

All above problems stemmed from the old implementation of CREATE
TABLE ... SELECT in which we created, opened and locked target
table without any special protection in a separate step and not
with the rest of tables used by this statement.
This underminded deadlock-avoidance approach used in server
and created window for races. It also excluded target table
from prelocking causing problems with trigger execution.

The patch solves these problems by implementing new approach to
handling of CREATE TABLE ... SELECT for base tables.
We try to open and lock table to be created at the same time as
the rest of tables used by this statement. If such table does not
exist at this moment we create and place in the table cache special
placeholder for it which prevents its creation or any other usage
by other threads.

We still use old approach for creation of temporary tables.

Also note that we decided to postpone introduction of some tests
for concurrent behaviour of CREATE TABLE ... SELECT till 5.1.
The main reason for this is absence in 5.0 ability to set @@debug
variable at runtime, which can be circumvented only by using several
test files with individual .opt files. Since the latter is likely
to slowdown test-suite unnecessary we chose not to push this tests
into 5.0, but run them manually for this version and later push
their optimized version into 5.1


mysql-test/r/create.result:
  Extended test coverage for CREATE TABLE ... SELECT. In particular added
  tests for bug #24508 "Inconsistent results of CREATE TABLE ... SELECT
  when temporary table exists" and bug #20662 "Infinite loop in CREATE
  TABLE IF NOT EXISTS ... SELECT with locked tables".
mysql-test/r/trigger.result:
  Added test case for bug #20903 "Crash when using CREATE TABLE .. SELECT
  and triggers"
mysql-test/t/create.test:
  Extended test coverage for CREATE TABLE ... SELECT. In particular added
  tests for bug #24508 "Inconsistent results of CREATE TABLE ... SELECT
  when temporary table exists" and bug #20662 "Infinite loop in CREATE
  TABLE IF NOT EXISTS ... SELECT with locked tables".
mysql-test/t/trigger.test:
  Added test case for bug #20903 "Crash when using CREATE TABLE .. SELECT
  and triggers"
sql/lock.cc:
  Now for creation of name-lock placeholder in lock_table_name() we use
  auxiliary function table_cache_insert_placeholder().
sql/mysql_priv.h:
  Made build_table_path() function available outside of sql_table.cc file.
  reopen_name_locked_table() now has 3rd argument which controls linking
  in of table being opened into THD::open_tables (this is useful in
  cases when placeholder used for name-locking is already linked into
  this list).
  Added declaration of auxiliary function table_cache_insert_placeholder()
  which is used for creation of table placeholders for name-locking.
  Added declaration of table_cache_has_open_placeholder() function which
  can be used for checking if table cache contains an open placeholder for
  the table and if this placeholder was created by another thread.
  (This function is needed only in 5.0 where we use it in various versions
   of CREATE TABLE in order to protect it from concurrent CREATE TABLE
   ... SELECT operations for the table. Starting from 5.1 we use different
   approach so it is going to be removed there).
  Made close_old_data_files() static within sql_base.cc file.
  Added auxiliary drop_open_table() routine.
  Moved declaration of refresh_version to table.h header to make it
  accessible from inline methods of TABLE class.
  MYSQL_OPEN_IGNORE_LOCKED_TABLES flag is no longer used. Instead
  MYSQL_OPEN_TEMPORARY_ONLY option was added.
sql/sql_base.cc:
  Added support for the new approach to the handling of CREATE TABLE
  ... SELECT for base tables.

  Now we try to open and lock table to be created at the same time as
  the rest of tables used by this statement. If such table does not
  exist at this moment we create and place in the table cache special
  placeholder for it which prevents its creation or any other usage
  by other threads.

  Note significant distinctions of this placeholder from the placeholder
  used for normal name-lock: 1) It is treated like open table by other
  name-locks so it does not allow name-lock taking operations like DROP
  TABLE or RENAME TABLE to proceed. 2) it is linked into THD::open_tables
  list and automatically removed during close_thread_tables() call.

  open_tables():
    Implemented logic described above. To do this added
    auxiliary check_if_table_exists() function.
    Removed support for MYSQL_OPEN_IGNORE_LOCKED_TABLES option
    which is no longer used.
    Added MYSQL_OPEN_TEMPORARY_ONLY which is used to restrict
    search for temporary tables only.
  close_cached_tables()/close_thread_table()/reopen_tables()/
  close_old_data_files()/table_is_used()/remove_table_from_cache():
    Added support for open placeholders (note that we also use them
    when we need to re-open tables during flush).
  Added auxiliary drop_open_table() routine.
  reopen_name_locked_table():
    Now has 3rd argument which controls linking in of table being
    opened into THD::open_tables (this is useful in cases when
    placeholder used for name-locking is already linked into
    this list).
  Added auxiliary table_cache_insert_placeholder() routine which
  simplifies creation of placeholders used for name-locking.
  Added table_cache_has_open_placeholder() function which can be
  used for checking if table cache contains an open placeholder for
  the table and if this placeholder was created by another thread.
  (This function is needed only in 5.0 where we use it in various versions
   of CREATE TABLE in order to protect it from concurrent CREATE TABLE
   ... SELECT operations for the table. Starting from 5.1 we use different
   approach so it is going to be removed there).
sql/sql_handler.cc:
  Adjusted mysql_ha_mark_tables_for_reopen() routine to properly
  handle placeholders which now can be linked into open tables
  list.
sql/sql_insert.cc:
  Introduced new approach to handling of base tables in CREATE TABLE
  ... SELECT statement.

  Now we try to open and lock table to be created at the same time as
  the rest of tables used by this statement. If such table does not
  exist at this moment we create and place in the table cache special
  placeholder for it which prevents its creation or any other usage
  by other threads. By doing this we avoid races which existed with
  previous approach in which we created, opened and locked target in
  separate step without any special protection.
  This also allows properly calculate prelocking set in cases when
  target table already exists and has some on insert triggers.

  Note that we don't employ the same approach for temporary tables
  (this is okay as such tables are unaffected by other threads).

  Changed create_table_from_items() and select_create methods to
  implement this approach.
sql/sql_parse.cc:
  The new approach to handling of CREATE TABLE ... SELECT for
  base tables assumes that all tables (including table to be
  created) are opened and (or) locked at the same time.
  So in cases when we create base table we have to pass to
  open_and_lock_tables() table list which includes target table.
sql/sql_prepare.cc:
  The new approach to handling of CREATE TABLE ... SELECT for
  base tables assumes that all tables (including table to be
  created) are opened and (or) locked at the same time.
  So in cases when we create base table we have to pass to
  open_and_lock_tables() table list which includes target table.
sql/sql_table.cc:
  Now mysql_create_table_internal(), mysql_create_like_table() and
  mysql_alter_table() not only check that destination table doesn't
  exist on disk but also check that there is no create placeholder
  in table cache for it (i.e. there is no CREATE TABLE ... SELECT
  operation in progress for it). Note that starting from 5.1 we
  use different approach in order to to protect CREATE TABLE ... SELECT
  from concurrent CREATE TABLE (ALTER TABLE ... RENAME) operations,
  the latter simply take name-locks on table before its creation
  (on target table name before renaming).

  Also made build_table_path() available from other files and
  asjusted calls to reopen_name_locked_table(), which now takes
  extra argument, which controls linking of open table into
  THD::open_tables list.
sql/sql_trigger.cc:
  reopen_name_locked_tables() now has one more argument which controls
  linking of opened table into the THD::open_tables list.
sql/sql_yacc.yy:
  The new approach to handling of CREATE TABLE ... SELECT statement
  for base tables assumes that all tables including table to be
  created are open and (or) locked at the same time. Therefore
  we need to set correct lock for target table.
sql/table.h:
  Moved declaration of refresh_version variable from mysql_priv.h
  to make it accessible from inline methods of TABLE class.
  Renamed TABLE::locked_by_flush member to open_placeholder since
  now it is also used for taking exclusive name-lock and not only
  by flush.
  Introduced TABLE::is_name_opened() helper method which can be used
  to distinguish TABLE instances corresponding to open tables or
  placeholders for them from closed instances (e.g. due to their old
  version). Also introduced TABLE::needs_reopen_or_name_lock() helper
  which allows to check if TABLE instance corresponds to outdated
  version of table or to name-lock placeholder.
  Introduced TABLE_LIST::create member which marks elements of
  table list corresponds to the table to be created.
  Adjusted TABLE_LIST::placeholder() method to take into account
  name-lock placeholders for tables to be created (this, for example,
  allows to properly handle such placeholders in lock_tables()).
---
 mysql-test/r/create.result  |  94 ++++++++
 mysql-test/r/trigger.result |  35 +++
 mysql-test/t/create.test    | 111 ++++++++++
 mysql-test/t/trigger.test   |  26 +++
 sql/lock.cc                 |  31 +--
 sql/mysql_priv.h            |  16 +-
 sql/sql_base.cc             | 420 +++++++++++++++++++++++++++++++++---
 sql/sql_handler.cc          |  25 ++-
 sql/sql_insert.cc           | 182 +++++++++-------
 sql/sql_parse.cc            |  12 +-
 sql/sql_prepare.cc          |  15 +-
 sql/sql_table.cc            |  88 ++++++--
 sql/sql_trigger.cc          |   2 +-
 sql/sql_yacc.yy             |   4 +-
 sql/table.h                 |  40 +++-
 15 files changed, 918 insertions(+), 183 deletions(-)

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index afa005e74c0..e1262c7d2c2 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -769,6 +769,100 @@ t1	CREATE TABLE `t1` (
   `i` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295
 drop table t1;
+create table t1 select * from t2;
+ERROR 42S02: Table 'test.t2' doesn't exist
+create table t1 select * from t1;
+ERROR HY000: You can't specify target table 't1' for update in FROM clause
+create table t1 select coalesce('a' collate latin1_swedish_ci,'b' collate latin1_bin);
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,EXPLICIT) and (latin1_bin,EXPLICIT) for operation 'coalesce'
+create table t1 (primary key(a)) select "b" as b;
+ERROR 42000: Key column 'a' doesn't exist in table
+create table t1 (a int);
+create table if not exists t1 select 1 as a, 2 as b;
+ERROR 21S01: Column count doesn't match value count at row 1
+drop table t1;
+create table t1 (primary key (a)) (select 1 as a) union all (select 1 as a);
+ERROR 23000: Duplicate entry '1' for key 1
+create table t1 (i int);
+create table t1 select 1 as i;
+ERROR 42S01: Table 't1' already exists
+create table if not exists t1 select 1 as i;
+Warnings:
+Note	1050	Table 't1' already exists
+select * from t1;
+i
+1
+create table t1 select coalesce('a' collate latin1_swedish_ci,'b' collate latin1_bin);
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,EXPLICIT) and (latin1_bin,EXPLICIT) for operation 'coalesce'
+select * from t1;
+i
+1
+alter table t1 add primary key (i);
+create table if not exists t1 (select 2 as i) union all (select 2 as i);
+ERROR 23000: Duplicate entry '2' for key 1
+select * from t1;
+i
+1
+2
+drop table t1;
+create temporary table t1 (j int);
+create table if not exists t1 select 1;
+Warnings:
+Note	1050	Table 't1' already exists
+select * from t1;
+j
+1
+drop temporary table t1;
+select * from t1;
+ERROR 42S02: Table 'test.t1' doesn't exist
+drop table t1;
+ERROR 42S02: Unknown table 't1'
+create table t1 (i int);
+insert into t1 values (1), (2);
+lock tables t1 read;
+create table t2 select * from t1;
+ERROR HY000: Table 't2' was not locked with LOCK TABLES
+create table if not exists t2 select * from t1;
+ERROR HY000: Table 't2' was not locked with LOCK TABLES
+unlock tables;
+create table t2 (j int);
+lock tables t1 read;
+create table t2 select * from t1;
+ERROR HY000: Table 't2' was not locked with LOCK TABLES
+create table if not exists t2 select * from t1;
+ERROR HY000: Table 't2' was not locked with LOCK TABLES
+unlock tables;
+lock table t1 read, t2 read;
+create table t2 select * from t1;
+ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
+create table if not exists t2 select * from t1;
+ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
+unlock tables;
+lock table t1 read, t2 write;
+create table t2 select * from t1;
+ERROR 42S01: Table 't2' already exists
+create table if not exists t2 select * from t1;
+Warnings:
+Note	1050	Table 't2' already exists
+select * from t1;
+i
+1
+2
+unlock tables;
+drop table t2;
+lock tables t1 read;
+create temporary table t2 select * from t1;
+create temporary table if not exists t2 select * from t1;
+Warnings:
+Note	1050	Table 't2' already exists
+select * from t2;
+i
+1
+2
+1
+2
+unlock tables;
+drop table t1, t2;
 create table t1 (upgrade int);
 drop table t1;
 End of 5.0 tests
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
index 0a0be41927a..3e6a901dc00 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
@@ -1414,4 +1414,39 @@ id	val
 DROP TRIGGER trg27006_a_insert;
 DROP TRIGGER trg27006_a_update;
 drop table t1,t2;
+drop table if exists t1, t2, t3;
+create table t1 (i int);
+create trigger t1_bi before insert on t1 for each row set new.i = 7;
+create trigger t1_ai after insert on t1 for each row set @a := 7;
+create table t2 (j int);
+insert into t2 values (1), (2);
+set @a:="";
+create table if not exists t1 select * from t2;
+Warnings:
+Note	1050	Table 't1' already exists
+select * from t1;
+i
+7
+7
+select @a;
+@a
+7
+drop trigger t1_bi;
+drop trigger t1_ai;
+create table t3 (isave int);
+create trigger t1_bi before insert on t1 for each row insert into t3 values (new.i);
+create table if not exists t1 select * from t2;
+Warnings:
+Note	1050	Table 't1' already exists
+select * from t1;
+i
+7
+7
+1
+2
+select * from t3;
+isave
+1
+2
+drop table t1, t2, t3;
 End of 5.0 tests
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index ba5f56e12b1..35198c793b8 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -669,6 +669,117 @@ alter table t1 max_rows=100000000000;
 show create table t1;
 drop table t1;
 
+
+#
+# Tests for errors happening at various stages of CREATE TABLES ... SELECT
+#
+# (Also checks that it behaves atomically in the sense that in case
+#  of error it is automatically dropped if it has not existed before.)
+#
+# Error during open_and_lock_tables() of tables
+--error ER_NO_SUCH_TABLE
+create table t1 select * from t2;
+# Rather special error which also caught during open tables pahse
+--error ER_UPDATE_TABLE_USED
+create table t1 select * from t1;
+# Error which happens before select_create::prepare()
+--error ER_CANT_AGGREGATE_2COLLATIONS
+create table t1 select coalesce('a' collate latin1_swedish_ci,'b' collate latin1_bin);
+# Error during table creation
+--error ER_KEY_COLUMN_DOES_NOT_EXITS
+create table t1 (primary key(a)) select "b" as b;
+# Error in select_create::prepare() which is not related to table creation
+create table t1 (a int);
+--error ER_WRONG_VALUE_COUNT_ON_ROW
+create table if not exists t1 select 1 as a, 2 as b;
+drop table t1;
+# Finally error which happens during insert
+--error ER_DUP_ENTRY
+create table t1 (primary key (a)) (select 1 as a) union all (select 1 as a);
+# What happens if table already exists ?
+create table t1 (i int);
+--error ER_TABLE_EXISTS_ERROR
+create table t1 select 1 as i;
+create table if not exists t1 select 1 as i;
+select * from t1;
+# Error before select_create::prepare()
+--error ER_CANT_AGGREGATE_2COLLATIONS
+create table t1 select coalesce('a' collate latin1_swedish_ci,'b' collate latin1_bin);
+select * from t1;
+# Error which happens during insertion of rows
+alter table t1 add primary key (i);
+--error ER_DUP_ENTRY
+create table if not exists t1 (select 2 as i) union all (select 2 as i);
+select * from t1;
+drop table t1;
+
+
+# Base vs temporary tables dillema (a.k.a. bug#24508 "Inconsistent
+# results of CREATE TABLE ... SELECT when temporary table exists").
+# In this situation we either have to create non-temporary table and
+# insert data in it or insert data in temporary table without creation
+# of permanent table. Since currently temporary tables always shadow
+# permanent tables we adopt second approach.
+create temporary table t1 (j int);
+create table if not exists t1 select 1;
+select * from t1;
+drop temporary table t1;
+--error ER_NO_SUCH_TABLE
+select * from t1;
+--error ER_BAD_TABLE_ERROR
+drop table t1;
+
+
+#
+# CREATE TABLE ... SELECT and LOCK TABLES
+#
+# There is little sense in using CREATE TABLE ... SELECT under
+# LOCK TABLES as it mostly does not work. At least we check that
+# the server doesn't crash, hang and produces sensible errors.
+# Includes test for bug #20662 "Infinite loop in CREATE TABLE
+# IF NOT EXISTS ... SELECT with locked tables".
+create table t1 (i int);
+insert into t1 values (1), (2);
+lock tables t1 read;
+--error ER_TABLE_NOT_LOCKED
+create table t2 select * from t1;
+--error ER_TABLE_NOT_LOCKED
+create table if not exists t2 select * from t1;
+unlock tables;
+create table t2 (j int);
+lock tables t1 read;
+--error ER_TABLE_NOT_LOCKED
+create table t2 select * from t1;
+# This should not be ever allowed as it will undermine
+# lock-all-at-once approach
+--error ER_TABLE_NOT_LOCKED
+create table if not exists t2 select * from t1;
+unlock tables;
+lock table t1 read, t2 read;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+create table t2 select * from t1;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+create table if not exists t2 select * from t1;
+unlock tables;
+lock table t1 read, t2 write;
+--error ER_TABLE_EXISTS_ERROR
+create table t2 select * from t1;
+# This is the only case which really works.
+create table if not exists t2 select * from t1;
+select * from t1;
+unlock tables;
+drop table t2;
+
+# OTOH CREATE TEMPORARY TABLE ... SELECT should work
+# well under LOCK TABLES.
+lock tables t1 read;
+create temporary table t2 select * from t1;
+create temporary table if not exists t2 select * from t1;
+select * from t2;
+unlock tables;
+drop table t1, t2;
+
+
 #
 # Bug#21772: can not name a column 'upgrade' when create a table
 #
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test
index a01efba11db..82de4dac111 100644
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/t/trigger.test
@@ -1737,4 +1737,30 @@ DROP TRIGGER trg27006_a_insert;
 DROP TRIGGER trg27006_a_update;
 drop table t1,t2;
 
+#
+# Bug #20903 "Crash when using CREATE TABLE .. SELECT and triggers"
+#
+
+--disable_warnings
+drop table if exists t1, t2, t3;
+--enable_warnings
+create table t1 (i int);
+create trigger t1_bi before insert on t1 for each row set new.i = 7;
+create trigger t1_ai after insert on t1 for each row set @a := 7;
+create table t2 (j int);
+insert into t2 values (1), (2);
+set @a:="";
+create table if not exists t1 select * from t2;
+select * from t1;
+select @a;
+# Let us check that trigger that involves table also works ok.
+drop trigger t1_bi;
+drop trigger t1_ai;
+create table t3 (isave int);
+create trigger t1_bi before insert on t1 for each row insert into t3 values (new.i);
+create table if not exists t1 select * from t2;
+select * from t1;
+select * from t3;
+drop table t1, t2, t3;
+
 --echo End of 5.0 tests
diff --git a/sql/lock.cc b/sql/lock.cc
index 233d12d9cc4..9298b33b4d2 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -853,7 +853,6 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list)
   TABLE *table;
   char  key[MAX_DBKEY_LENGTH];
   char *db= table_list->db;
-  int table_in_key_offset;
   uint  key_length;
   HASH_SEARCH_STATE state;
   DBUG_ENTER("lock_table_name");
@@ -861,10 +860,8 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list)
 
   safe_mutex_assert_owner(&LOCK_open);
 
-  table_in_key_offset= strmov(key, db) - key + 1;
-  key_length= (uint)(strmov(key + table_in_key_offset, table_list->table_name)
-                     - key) + 1;
-
+  key_length= (uint)(strmov(strmov(key, db) + 1, table_list->table_name) -
+                     key) + 1;
 
   /* Only insert the table if we haven't insert it already */
   for (table=(TABLE*) hash_first(&open_cache, (byte*)key, key_length, &state);
@@ -873,29 +870,11 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list)
     if (table->in_use == thd)
       DBUG_RETURN(0);
 
-  /*
-    Create a table entry with the right key and with an old refresh version
-    Note that we must use my_malloc() here as this is freed by the table
-    cache
-  */
-  if (!(table= (TABLE*) my_malloc(sizeof(*table)+key_length,
-				  MYF(MY_WME | MY_ZEROFILL))))
+  if (!(table= table_cache_insert_placeholder(thd, key, key_length)))
     DBUG_RETURN(-1);
-  table->s= &table->share_not_to_be_used;
-  memcpy((table->s->table_cache_key= (char*) (table+1)), key, key_length);
-  table->s->db= table->s->table_cache_key;
-  table->s->table_name= table->s->table_cache_key + table_in_key_offset;
-  table->s->key_length=key_length;
-  table->in_use=thd;
-  table->locked_by_name=1;
-  table_list->table=table;
 
-  if (my_hash_insert(&open_cache, (byte*) table))
-  {
-    my_free((gptr) table,MYF(0));
-    DBUG_RETURN(-1);
-  }
-  
+  table_list->table= table;
+
   /* Return 1 if table is in use */
   DBUG_RETURN(test(remove_table_from_cache(thd, db, table_list->table_name,
                                            RTFC_NO_FLAG)));
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 868f3584448..37a5fc31f1d 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -674,6 +674,8 @@ struct Query_cache_query_flags
 #define query_cache_invalidate_by_MyISAM_filename_ref NULL
 #endif /*HAVE_QUERY_CACHE*/
 
+uint build_table_path(char *buff, size_t bufflen, const char *db,
+                      const char *table, const char *ext);
 bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create, bool silent);
 bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create);
 bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent);
@@ -856,12 +858,14 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create);
 TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update);
 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);
+bool reopen_name_locked_table(THD* thd, TABLE_LIST* table_list, bool link_in);
+TABLE *table_cache_insert_placeholder(THD *thd, const char *key,
+                                      uint key_length);
+bool table_cache_has_open_placeholder(THD *thd, const char *db,
+                                      const char *table_name);
 TABLE *find_locked_table(THD *thd, const char *db,const char *table_name);
 bool reopen_table(TABLE *table,bool locked);
 bool reopen_tables(THD *thd,bool get_locks,bool in_refresh);
-void close_old_data_files(THD *thd, TABLE *table, bool abort_locks,
-			  bool send_refresh);
 bool close_data_tables(THD *thd,const char *db, const char *table_name);
 bool wait_for_tables(THD *thd);
 bool table_is_used(TABLE *table, bool wait_for_name_lock);
@@ -1017,6 +1021,8 @@ void add_join_natural(TABLE_LIST *a,TABLE_LIST *b,List<String> *using_fields,
                       SELECT_LEX *lex);
 bool add_proc_to_list(THD *thd, Item *item);
 TABLE *unlink_open_table(THD *thd,TABLE *list,TABLE *find);
+void drop_open_table(THD *thd, TABLE *table, const char *db_name,
+                     const char *table_name);
 void update_non_unique_table_error(TABLE_LIST *update,
                                    const char *operation,
                                    TABLE_LIST *duplicate);
@@ -1269,7 +1275,7 @@ extern double log_01[32];
 extern ulonglong log_10_int[20];
 extern ulonglong keybuff_size;
 extern ulonglong thd_startup_options;
-extern ulong refresh_version,flush_version, thread_id;
+extern ulong flush_version, thread_id;
 extern ulong binlog_cache_use, binlog_cache_disk_use;
 extern ulong aborted_threads,aborted_connects;
 extern ulong delayed_insert_timeout;
@@ -1443,7 +1449,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count,
 #define MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK      0x0001
 #define MYSQL_LOCK_IGNORE_FLUSH                 0x0002
 #define MYSQL_LOCK_NOTIFY_IF_NEED_REOPEN        0x0004
-#define MYSQL_OPEN_IGNORE_LOCKED_TABLES         0x0008
+#define MYSQL_OPEN_TEMPORARY_ONLY               0x0008
 
 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/sql_base.cc b/sql/sql_base.cc
index 6e6611d54d2..db4491a19ae 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -94,6 +94,8 @@ static bool open_new_frm(THD *thd, const char *path, const char *alias,
                          uint db_stat, uint prgflag,
                          uint ha_open_flags, TABLE *outparam,
                          TABLE_LIST *table_desc, MEM_ROOT *mem_root);
+static void close_old_data_files(THD *thd, TABLE *table, bool morph_locks,
+                                 bool send_refresh);
 
 extern "C" byte *table_cache_key(const byte *record,uint *length,
 				 my_bool not_used __attribute__((unused)))
@@ -374,7 +376,21 @@ bool close_cached_tables(THD *thd, bool if_wait_for_refresh,
       for (uint idx=0 ; idx < open_cache.records ; idx++)
       {
 	TABLE *table=(TABLE*) hash_element(&open_cache,idx);
-	if ((table->s->version) < refresh_version && table->db_stat)
+        /*
+          Note that we wait here only for tables which are actually open, and
+          not for placeholders with TABLE::open_placeholder set. Waiting for
+          latter will cause deadlock in the following scenario, for example:
+
+          conn1: lock table t1 write;
+          conn2: lock table t2 write;
+          conn1: flush tables;
+          conn2: flush tables;
+
+          It also does not make sense to wait for those of placeholders that
+          are employed by CREATE TABLE as in this case table simply does not
+          exist yet.
+        */
+	if (table->needs_reopen_or_name_lock() && table->db_stat)
 	{
 	  found=1;
           DBUG_PRINT("signal", ("Waiting for COND_refresh"));
@@ -616,10 +632,10 @@ bool close_thread_table(THD *thd, TABLE **table_ptr)
   TABLE *table= *table_ptr;
   DBUG_ENTER("close_thread_table");
   DBUG_ASSERT(table->key_read == 0);
-  DBUG_ASSERT(table->file->inited == handler::NONE);
+  DBUG_ASSERT(!table->file || table->file->inited == handler::NONE);
 
   *table_ptr=table->next;
-  if (table->s->version != refresh_version ||
+  if (table->needs_reopen_or_name_lock() ||
       thd->version != refresh_version || !table->db_stat)
   {
     VOID(hash_delete(&open_cache,(byte*) table));
@@ -627,6 +643,12 @@ bool close_thread_table(THD *thd, TABLE **table_ptr)
   }
   else
   {
+    /*
+      Open placeholders have TABLE::db_stat set to 0, so they should be
+      handled by the first alternative.
+    */
+    DBUG_ASSERT(!table->open_placeholder);
+
     if (table->s->flush_version != flush_version)
     {
       table->s->flush_version= flush_version;
@@ -1114,6 +1136,43 @@ TABLE *unlink_open_table(THD *thd, TABLE *list, TABLE *find)
 }
 
 
+/**
+    @brief Auxiliary routine which closes and drops open table.
+
+    @param  thd         Thread handle
+    @param  table       TABLE object for table to be dropped
+    @param  db_name     Name of database for this table
+    @param  table_name  Name of this table
+
+    @note This routine assumes that table to be closed is open only
+          by calling thread so we needn't wait until other threads
+          will close the table. Also unless called under implicit or
+          explicit LOCK TABLES mode it assumes that table to be
+          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.
+*/
+
+void drop_open_table(THD *thd, TABLE *table, const char *db_name,
+                     const char *table_name)
+{
+  if (table->s->tmp_table)
+    close_temporary_table(thd, db_name, table_name);
+  else
+  {
+    enum db_type table_type= table->s->db_type;
+    VOID(pthread_mutex_lock(&LOCK_open));
+    /*
+      unlink_open_table() also tells threads waiting for refresh or close
+      that something has happened.
+    */
+    thd->open_tables= unlink_open_table(thd, thd->open_tables, table);
+    quick_rm_table(table_type, db_name, table_name);
+    VOID(pthread_mutex_unlock(&LOCK_open));
+  }
+}
+
+
 /*
    When we call the following function we must have a lock on
    LOCK_open ; This lock will be unlocked on return.
@@ -1152,6 +1211,11 @@ void wait_for_refresh(THD *thd)
       table_list  TABLE_LIST object for table to be open, TABLE_LIST::table
                   member should point to TABLE object which was used for
                   name-locking.
+      link_in     TRUE  - if TABLE object for table to be opened should be
+                          linked into THD::open_tables list.
+                  FALSE - placeholder used for name-locking is already in
+                          this list so we only need to preserve TABLE::next
+                          pointer.
 
   NOTE
     This function assumes that its caller already acquired LOCK_open mutex.
@@ -1161,7 +1225,7 @@ void wait_for_refresh(THD *thd)
     TRUE  - Error
 */
 
-bool reopen_name_locked_table(THD* thd, TABLE_LIST* table_list)
+bool reopen_name_locked_table(THD* thd, TABLE_LIST* table_list, bool link_in)
 {
   TABLE *table= table_list->table;
   TABLE_SHARE *share;
@@ -1199,12 +1263,33 @@ bool reopen_name_locked_table(THD* thd, TABLE_LIST* table_list)
   share= table->s;
   share->db= share->table_cache_key;
   share->key_length=key_length;
+  /*
+    We want to prevent other connections from opening this table until end
+    of statement as it is likely that modifications of table's metadata are
+    not yet finished (for example CREATE TRIGGER have to change .TRG file,
+    or we might want to drop table if CREATE TABLE ... SELECT fails).
+    This also allows us to assume that no other connection will sneak in
+    before we will get table-level lock on this table.
+  */
   share->version=0;
   share->flush_version=0;
   table->in_use = thd;
   check_unused();
-  table->next = thd->open_tables;
-  thd->open_tables = table;
+
+  if (link_in)
+  {
+    table->next= thd->open_tables;
+    thd->open_tables= table;
+  }
+  else
+  {
+    /*
+      TABLE object should be already in THD::open_tables list so we just
+      need to set TABLE::next correctly.
+    */
+    table->next= orig_table.next;
+  }
+
   table->tablenr=thd->current_tablenr++;
   table->used_fields=0;
   table->const_table=0;
@@ -1216,6 +1301,167 @@ bool reopen_name_locked_table(THD* thd, TABLE_LIST* table_list)
 }
 
 
+/**
+    @brief Create and insert into table cache placeholder for table
+           which will prevent its opening (or creation) (a.k.a lock
+           table name).
+
+    @param  thd         Thread context
+    @param  key         Table cache key for name to be locked
+    @param  key_length  Table cache key length
+
+    @return Pointer to TABLE object used for name locking or 0 in
+            case of failure.
+*/
+
+TABLE *table_cache_insert_placeholder(THD *thd, const char *key,
+                                      uint key_length)
+{
+  TABLE *table;
+  char *key_buff;
+  DBUG_ENTER("table_cache_insert_placeholder");
+
+  safe_mutex_assert_owner(&LOCK_open);
+
+  /*
+    Create a table entry with the right key and with an old refresh version
+    Note that we must use my_multi_malloc() here as this is freed by the
+    table cache
+  */
+  if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
+                       &table, sizeof(*table),
+                       &key_buff, key_length,
+                       NULL))
+    DBUG_RETURN(NULL);
+
+  table->s= &table->share_not_to_be_used;
+  memcpy(key_buff, key, key_length);
+  table->s->table_cache_key= key_buff;
+  table->s->db= table->s->table_cache_key;
+  table->s->table_name= table->s->table_cache_key + strlen(table->s->db) + 1;
+  table->s->key_length= key_length;
+  table->in_use= thd;
+  table->locked_by_name= 1;
+
+  if (my_hash_insert(&open_cache, (byte*)table))
+  {
+    my_free((gptr) table, MYF(0));
+    DBUG_RETURN(NULL);
+  }
+
+  DBUG_RETURN(table);
+}
+
+
+/**
+    @brief Check if table cache contains an open placeholder for the
+           table and if this placeholder was created by another thread.
+
+    @param  thd         Thread context
+    @param  db          Name of database for table in question
+    @param  table_name  Table name
+
+    @note The presence of open placeholder indicates that either some
+          other thread is trying to create table in question and obtained
+          an exclusive name-lock on it or that this table already exists
+          and is being flushed at the moment.
+
+    @note One should acquire LOCK_open mutex before calling this function.
+
+    @note This function is a hack which was introduced in 5.0 only to
+          minimize code changes. It doesn't present in 5.1.
+
+    @retval  TRUE   Table cache contains open placeholder for the table
+                    which was created by some other thread.
+    @retval  FALSE  Otherwise.
+*/
+
+bool table_cache_has_open_placeholder(THD *thd, const char *db,
+                                      const char *table_name)
+{
+  char key[MAX_DBKEY_LENGTH];
+  uint key_length;
+  HASH_SEARCH_STATE state;
+  TABLE *search;
+  DBUG_ENTER("table_cache_has_open_placeholder");
+
+  safe_mutex_assert_owner(&LOCK_open);
+
+  key_length=(uint) (strmov(strmov(key,db)+1,table_name)-key)+1;
+  for (search= (TABLE*) hash_first(&open_cache, (byte*) key, key_length,
+                                   &state);
+      search ;
+      search= (TABLE*) hash_next(&open_cache, (byte*) key, key_length,
+                                 &state))
+  {
+    if (search->in_use == thd)
+      continue;
+    if (search->open_placeholder)
+        DBUG_RETURN(1);
+  }
+  DBUG_RETURN(0);
+}
+
+
+/**
+    @brief Check that table exists on disk or in some storage engine.
+
+    @param  thd          Thread context
+    @param  table        Table list element
+    @param  exists[out]  Out parameter which is set to TRUE if table
+                         exists and to FALSE otherwise.
+
+    @note This function assumes that caller owns LOCK_open mutex.
+          It also assumes that the fact that there are no name-locks
+          on the table was checked beforehand.
+
+    @note If there is no .FRM file for the table but it exists in one
+          of engines (e.g. it was created on another node of NDB cluster)
+          this function will fetch and create proper .FRM file for it.
+
+    @retval  TRUE   Some error occured
+    @retval  FALSE  No error. 'exists' out parameter set accordingly.
+*/
+
+bool check_if_table_exists(THD *thd, TABLE_LIST *table, bool *exists)
+{
+  char path[FN_REFLEN];
+  int rc;
+  DBUG_ENTER("check_if_table_exists");
+
+  safe_mutex_assert_owner(&LOCK_open);
+
+  *exists= TRUE;
+
+  build_table_path(path, sizeof(path), table->db, table->table_name, reg_ext);
+
+  if (!access(path, F_OK))
+    DBUG_RETURN(FALSE);
+
+  /* .FRM file doesn't exist. Check if some engine can provide it. */
+
+  rc= ha_create_table_from_engine(thd, table->db, table->table_name);
+
+  if (rc < 0)
+  {
+    /* Table does not exists in engines as well. */
+    *exists= FALSE;
+    DBUG_RETURN(FALSE);
+  }
+  else if (!rc)
+  {
+    /* Table exists in some engine and .FRM for it was created. */
+    DBUG_RETURN(FALSE);
+  }
+  else /* (rc > 0) */
+  {
+    my_printf_error(ER_UNKNOWN_ERROR, "Failed to open '%-.64s', error while "
+                    "unpacking from engine", MYF(0), table->table_name);
+    DBUG_RETURN(TRUE);
+  }
+}
+
+
 /*
   Open a table.
 
@@ -1231,12 +1477,17 @@ bool reopen_name_locked_table(THD* thd, TABLE_LIST* table_list)
                           MYSQL_LOCK_IGNORE_FLUSH - Open table even if
                           someone has done a flush or namelock on it.
                           No version number checking is done.
-                          MYSQL_OPEN_IGNORE_LOCKED_TABLES - Open table
-                          ignoring set of locked tables and prelocked mode.
+                          MYSQL_OPEN_TEMPORARY_ONLY - Open only temporary
+                          table not the base table or view.
 
   IMPLEMENTATION
     Uses a cache of open tables to find a table not in use.
 
+    If table list element for the table to be opened has "create" flag
+    set and table does not exist, this function will automatically insert
+    a placeholder for exclusive name lock into the open tables cache and
+    will return the TABLE instance that corresponds to this placeholder.
+
   RETURN
     NULL  Open failed.  If refresh is set then one should close
           all other tables and retry the open.
@@ -1305,6 +1556,12 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
     }
   }
 
+  if (flags & MYSQL_OPEN_TEMPORARY_ONLY)
+  {
+    my_error(ER_NO_SUCH_TABLE, MYF(0), table_list->db, table_list->table_name);
+    DBUG_RETURN(0);
+  }
+
   /*
     The table is not temporary - if we're in pre-locked or LOCK TABLES
     mode, let's try to find the requested table in the list of pre-opened
@@ -1312,8 +1569,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
     open not pre-opened tables in pre-locked/LOCK TABLES mode.
     TODO: move this block into a separate function.
   */
-  if (!(flags & MYSQL_OPEN_IGNORE_LOCKED_TABLES) &&
-      (thd->locked_tables || thd->prelocked_mode))
+  if (thd->locked_tables || thd->prelocked_mode)
   {						// Using table locks
     TABLE *best_table= 0;
     int best_distance= INT_MIN;
@@ -1495,7 +1751,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->s->version != refresh_version)
+    if (table->needs_reopen_or_name_lock())
     {
       DBUG_PRINT("note",
                  ("Found table '%s.%s' with different refresh version",
@@ -1507,6 +1763,14 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
         continue;
       }
 
+      /* Avoid self-deadlocks by detecting self-dependencies. */
+      if (table->open_placeholder && table->in_use == thd)
+      {
+	VOID(pthread_mutex_unlock(&LOCK_open));
+        my_error(ER_UPDATE_TABLE_USED, MYF(0), table->s->table_name);
+        DBUG_RETURN(0);
+      }
+
       /*
         Back off, part 1: mark the table as "unused" for the
         purpose of name-locking by setting table->db_stat to 0. Do
@@ -1523,6 +1787,14 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
         and wait till the operation is complete: when any
         operation that juggles with table->s->version completes,
         it broadcasts COND_refresh condition variable.
+        If 'old' table we met is in use by current thread we return
+        without waiting since in this situation it's this thread
+        which is responsible for broadcasting on COND_refresh
+        (and this was done already in close_old_data_files()).
+        Good example of such situation is when we have statement
+        that needs two instances of table and FLUSH TABLES comes
+        after we open first instance but before we open second
+        instance.
       */
       if (table->in_use != thd)
       {
@@ -1564,6 +1836,40 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
     while (open_cache.records > table_cache_size && unused_tables)
       VOID(hash_delete(&open_cache,(byte*) unused_tables)); /* purecov: tested */
 
+    if (table_list->create)
+    {
+      bool exists;
+
+      if (check_if_table_exists(thd, table_list, &exists))
+      {
+        VOID(pthread_mutex_unlock(&LOCK_open));
+        DBUG_RETURN(NULL);
+      }
+
+      if (!exists)
+      {
+        /*
+          Table to be created, so we need to create placeholder in table-cache.
+        */
+        if (!(table= table_cache_insert_placeholder(thd, key, key_length)))
+        {
+          VOID(pthread_mutex_unlock(&LOCK_open));
+          DBUG_RETURN(NULL);
+        }
+        /*
+          Link placeholder to the open tables list so it will be automatically
+          removed once tables are closed. Also mark it so it won't be ignored
+          by other trying to take name-lock.
+        */
+        table->open_placeholder= 1;
+        table->next= thd->open_tables;
+        thd->open_tables= table;
+        VOID(pthread_mutex_unlock(&LOCK_open));
+        DBUG_RETURN(table);
+      }
+      /* Table exists. Let us try to open it. */
+    }
+
     /* make a new table */
     if (!(table=(TABLE*) my_malloc(sizeof(*table),MYF(MY_WME))))
     {
@@ -1794,9 +2100,24 @@ bool close_data_tables(THD *thd,const char *db, const char *table_name)
 }
 
 
-/*
-  Reopen all tables with closed data files
-  One should have lock on LOCK_open when calling this
+/**
+    @brief Reopen all tables with closed data files.
+
+    @param thd         Thread context
+    @param get_locks   Should we get locks after reopening tables ?
+    @param in_refresh  Are we in FLUSH TABLES ? TODO: It seems that
+                       we can remove this parameter.
+
+    @note Since this function can't properly handle prelocking and
+          create placeholders it should be used in very special
+          situations like FLUSH TABLES or ALTER TABLE. In general
+          case one should just repeat open_tables()/lock_tables()
+          combination when one needs tables to be reopened (for
+          example see open_and_lock_tables()).
+
+    @note One should have lock on LOCK_open when calling this.
+
+    @return FALSE in case of success, TRUE - otherwise.
 */
 
 bool reopen_tables(THD *thd,bool get_locks,bool in_refresh)
@@ -1841,7 +2162,7 @@ bool reopen_tables(THD *thd,bool get_locks,bool in_refresh)
       if (in_refresh)
       {
 	table->s->version=0;
-	table->locked_by_flush=0;
+	table->open_placeholder= 0;
       }
     }
   }
@@ -1867,35 +2188,71 @@ bool reopen_tables(THD *thd,bool get_locks,bool in_refresh)
   DBUG_RETURN(error);
 }
 
-/*
-  Close handlers for tables in list, but leave the TABLE structure
-  intact so that we can re-open these quickly
-  abort_locks is set if called from flush_tables.
+
+/**
+    @brief Close handlers for tables in list, but leave the TABLE structure
+           intact so that we can re-open these quickly.
+
+    @param thd           Thread context
+    @param table         Head of the list of TABLE objects
+    @param morph_locks   TRUE  - remove locks which we have on tables being closed
+                                 but ensure that no DML or DDL will sneak in before
+                                 we will re-open the table (i.e. temporarily morph
+                                 our table-level locks into name-locks).
+                         FALSE - otherwise
+    @param send_refresh  Should we awake waiters even if we didn't close any tables?
 */
 
-void close_old_data_files(THD *thd, TABLE *table, bool abort_locks,
+void close_old_data_files(THD *thd, TABLE *table, bool morph_locks,
 			  bool send_refresh)
 {
   DBUG_ENTER("close_old_data_files");
   bool found=send_refresh;
   for (; table ; table=table->next)
   {
-    if (table->s->version != refresh_version)
+    if (table->needs_reopen_or_name_lock())
     {
       found=1;
-      if (!abort_locks)				// If not from flush tables
+      /*
+        Note that it is safe to update version even for open placeholders
+        as later in this function we reset TABLE::open_placeholder and thus
+        effectively remove them from the table cache.
+      */
+      if (!morph_locks)                         // If not from flush tables
 	table->s->version= refresh_version;	// Let other threads use table
       if (table->db_stat)
       {
-	if (abort_locks)
-	{
-	  mysql_lock_abort(thd,table);		// Close waiting threads
-	  mysql_lock_remove(thd, thd->locked_tables,table);
-	  table->locked_by_flush=1;		// Will be reopened with locks
-	}
+        if (morph_locks)
+        {
+          /*
+            Wake up threads waiting for table-level lock on this table
+            so they won't sneak in when we will temporarily remove our
+            lock on it. This will also give them a chance to close their
+            instances of this table.
+          */
+          mysql_lock_abort(thd, table);
+          mysql_lock_remove(thd, thd->locked_tables, table);
+          /*
+            We want to protect the table from concurrent DDL operations
+            (like RENAME TABLE) until we will re-open and re-lock it.
+          */
+          table->open_placeholder= 1;
+        }
 	table->file->close();
 	table->db_stat=0;
       }
+      else if (table->open_placeholder)
+      {
+        /*
+          We come here only in close-for-back-off scenario. So we have to
+          "close" create placeholder here to avoid deadlocks (for example,
+          in case of concurrent execution of CREATE TABLE t1 SELECT * FROM t2
+          and RENAME TABLE t2 TO t1). In close-for-re-open scenario we will
+          probably want to let it stay.
+        */
+        DBUG_ASSERT(!morph_locks);
+        table->open_placeholder= 0;
+      }
     }
   }
   if (found)
@@ -1923,9 +2280,8 @@ bool table_is_used(TABLE *table, bool wait_for_name_lock)
          search= (TABLE*) hash_next(&open_cache, (byte*) key,
                                     key_length, &state))
     {
-      if (search->locked_by_flush ||
-	  search->locked_by_name && wait_for_name_lock ||
-	  search->db_stat && search->s->version < refresh_version)
+      if (search->locked_by_name && wait_for_name_lock ||
+	  search->is_name_opened() && search->needs_reopen_or_name_lock())
 	return 1;				// Table is used
     }
   } while ((table=table->next));
@@ -5661,7 +6017,7 @@ bool remove_table_from_cache(THD *thd, const char *db, const char *table_name,
       else if (in_use != thd)
       {
         in_use->some_tables_deleted=1;
-        if (table->db_stat)
+        if (table->is_name_opened())
         {
           DBUG_PRINT("info", ("Found another active instance of the table"));
   	  result=1;
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index d1a5ab7dfa8..e1318aa2736 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -670,7 +670,7 @@ int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags,
     while (*table_ptr)
     {
       if ((mode_flags & MYSQL_HA_FLUSH_ALL) ||
-          ((*table_ptr)->s->version != refresh_version))
+          (*table_ptr)->needs_reopen_or_name_lock())
       {
         /* The first time it is required, lock for close_thread_table(). */
         if (! did_lock && ! is_locked)
@@ -771,15 +771,22 @@ void mysql_ha_mark_tables_for_reopen(THD *thd, TABLE *table)
   safe_mutex_assert_owner(&LOCK_open);
   for (; table; table= table->next)
   {
-    TABLE_LIST *hash_tables;
-    if ((hash_tables= (TABLE_LIST*) hash_search(&thd->handler_tables_hash,
-                                                (byte*) table->alias,
-                                                strlen(table->alias) + 1)))
+    /*
+      Some elements in open table list, for example placeholders used for
+      name-locking, can have alias set to 0.
+    */
+    if (table->alias)
     {
-      /* Mark table as ready for reopen. */
-      hash_tables->table= NULL;
-      /* End open index/table scans. */
-      table->file->ha_index_or_rnd_end();
+      TABLE_LIST *hash_tables;
+      if ((hash_tables= (TABLE_LIST*) hash_search(&thd->handler_tables_hash,
+                                                  (byte*) table->alias,
+                                                  strlen(table->alias) + 1)))
+      {
+        /* Mark table as ready for reopen. */
+        hash_tables->table= NULL;
+        /* End open index/table scans. */
+        table->file->ha_index_or_rnd_end();
+      }
     }
   }
   DBUG_VOID_RETURN;
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index f1d86224adb..4ba820ddefd 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -2179,7 +2179,7 @@ bool delayed_insert::handle_inserts(void)
 
   thd.proc_info="insert";
   max_rows= delayed_insert_limit;
-  if (thd.killed || table->s->version != refresh_version)
+  if (thd.killed || table->needs_reopen_or_name_lock())
   {
     thd.killed= THD::KILL_CONNECTION;
     max_rows= ~(ulong)0;                        // Do as much as possible
@@ -2791,8 +2791,8 @@ bool select_insert::send_eof()
 ***************************************************************************/
 
 /*
-  Create table from lists of fields and items (or open existing table
-  with same name).
+  Create table from lists of fields and items (or just return TABLE
+  object for pre-opened existing table).
 
   SYNOPSIS
     create_table_from_items()
@@ -2807,18 +2807,24 @@ bool select_insert::send_eof()
                           of fields for the table (corresponding fields will
                           be added to the end of alter_info->create_list)
       lock         out    Pointer to the MYSQL_LOCK object for table created
-                          (open) will be returned in this parameter. Since
-                          this table is not included in THD::lock caller is
-                          responsible for explicitly unlocking this table.
+                          (or open temporary table) will be returned in this
+                          parameter. Since this table is not included in
+                          THD::lock caller is responsible for explicitly
+                          unlocking this table.
 
   NOTES
-    If 'create_info->options' bitmask has HA_LEX_CREATE_IF_NOT_EXISTS
-    flag and table with name provided already exists then this function will
-    simply open existing table.
-    Also note that create, open and lock sequence in this function is not
-    atomic and thus contains gap for deadlock and can cause other troubles.
-    Since this function contains some logic specific to CREATE TABLE ... SELECT
-    it should be changed before it can be used in other contexts.
+    This function behaves differently for base and temporary tables:
+    - For base table we assume that either table exists and was pre-opened
+      and locked at open_and_lock_tables() stage (and in this case we just
+      emit error or warning and return pre-opened TABLE object) or special
+      placeholder was put in table cache that guarantees that this table
+      won't be created or opened until the placeholder will be removed
+      (so there is an exclusive lock on this table).
+    - We don't pre-open existing temporary table, instead we either open
+      or create and then open table in this function.
+
+    Since this function contains some logic specific to CREATE TABLE ...
+    SELECT it should be changed before it can be used in other contexts.
 
   RETURN VALUES
     non-zero  Pointer to TABLE object for table created or opened
@@ -2841,6 +2847,25 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
   bool not_used;
   DBUG_ENTER("create_table_from_items");
 
+  DBUG_EXECUTE_IF("sleep_create_select_before_check_if_exists", my_sleep(6000000););
+
+  if (!(create_info->options & HA_LEX_CREATE_TMP_TABLE) &&
+      create_table->table->db_stat)
+  {
+    /* Table already exists and was open at open_and_lock_tables() stage. */
+    if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS)
+    {
+      create_info->table_existed= 1;		// Mark that table existed
+      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
+                          ER_TABLE_EXISTS_ERROR, ER(ER_TABLE_EXISTS_ERROR),
+                          create_table->table_name);
+      DBUG_RETURN(create_table->table);
+    }
+
+    my_error(ER_TABLE_EXISTS_ERROR, MYF(0), create_table->table_name);
+    DBUG_RETURN(0);
+  }
+
   tmp_table.alias= 0;
   tmp_table.timestamp_field= 0;
   tmp_table.s= &tmp_table.share_not_to_be_used;
@@ -2869,8 +2894,15 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
       cr_field->flags &= ~NOT_NULL_FLAG;
     alter_info->create_list.push_back(cr_field);
   }
+
+  DBUG_EXECUTE_IF("sleep_create_select_before_create", my_sleep(6000000););
+
   /*
-    create and lock table
+    Create and lock table.
+
+    Note that we either creating (or opening existing) temporary table or
+    creating base table on which name we have exclusive lock. So code below
+    should not cause deadlocks or races.
 
     We don't log the statement, it will be logged later.
 
@@ -2880,59 +2912,70 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
     don't want to delete from it) 2) it would be written before the CREATE
     TABLE, which is a wrong order. So we keep binary logging disabled when we
     open_table().
-    NOTE: By locking table which we just have created (or for which we just have
-    have found that it already exists) separately from other tables used by the
-    statement we create potential window for deadlock.
-    TODO: create and open should be done atomic !
   */
   {
     tmp_disable_binlog(thd);
     if (!mysql_create_table(thd, create_table->db, create_table->table_name,
                             create_info, alter_info, 0, select_field_count))
     {
-      /*
-        If we are here in prelocked mode we either create temporary table
-        or prelocked mode is caused by the SELECT part of this statement.
-      */
-      DBUG_ASSERT(!thd->prelocked_mode ||
-                  create_info->options & HA_LEX_CREATE_TMP_TABLE ||
-                  thd->lex->requires_prelocking());
 
-      /*
-        NOTE: We don't want to ignore set of locked tables here if we are
-              under explicit LOCK TABLES since it will open gap for deadlock
-              too wide (and also is not backward compatible).
-      */
-      if (! (table= open_table(thd, create_table, thd->mem_root, (bool*) 0,
-                               (MYSQL_LOCK_IGNORE_FLUSH |
-                                ((thd->prelocked_mode == PRELOCKED) ?
-                                 MYSQL_OPEN_IGNORE_LOCKED_TABLES:0)))))
-        quick_rm_table(create_info->db_type, create_table->db,
-                       table_case_name(create_info, create_table->table_name));
+      if (create_info->table_existed &&
+          !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
+      {
+        /*
+          This means that someone created table underneath server
+          or it was created via different mysqld front-end to the
+          cluster. We don't have much options but throw an error.
+        */
+        my_error(ER_TABLE_EXISTS_ERROR, MYF(0), create_table->table_name);
+        DBUG_RETURN(0);
+      }
+
+      DBUG_EXECUTE_IF("sleep_create_select_before_open", my_sleep(6000000););
+
+      if (!(create_info->options & HA_LEX_CREATE_TMP_TABLE))
+      {
+        VOID(pthread_mutex_lock(&LOCK_open));
+        if (reopen_name_locked_table(thd, create_table, FALSE))
+        {
+          quick_rm_table(create_info->db_type, create_table->db,
+                         table_case_name(create_info,
+                                         create_table->table_name));
+        }
+        else
+          table= create_table->table;
+        VOID(pthread_mutex_unlock(&LOCK_open));
+      }
+      else
+      {
+        if (!(table= open_table(thd, create_table, thd->mem_root, (bool*) 0,
+                                MYSQL_OPEN_TEMPORARY_ONLY)) &&
+            !create_info->table_existed)
+        {
+          /*
+            This shouldn't happen as creation of temporary table should make
+            it preparable for open. But let us do close_temporary_table() here
+            just in case.
+          */
+          close_temporary_table(thd, create_table->db, create_table->table_name);
+        }
+      }
     }
     reenable_binlog(thd);
     if (!table)                                   // open failed
       DBUG_RETURN(0);
   }
 
-  /*
-    FIXME: What happens if trigger manages to be created while we are
-           obtaining this lock ? May be it is sensible just to disable
-           trigger execution in this case ? Or will MYSQL_LOCK_IGNORE_FLUSH
-           save us from that ?
-  */
+  DBUG_EXECUTE_IF("sleep_create_select_before_lock", my_sleep(6000000););
+
   table->reginfo.lock_type=TL_WRITE;
   if (! ((*lock)= mysql_lock_tables(thd, &table, 1,
                                     MYSQL_LOCK_IGNORE_FLUSH, &not_used)))
   {
-    VOID(pthread_mutex_lock(&LOCK_open));
-    hash_delete(&open_cache,(byte*) table);
-    VOID(pthread_mutex_unlock(&LOCK_open));
-    quick_rm_table(create_info->db_type, create_table->db,
-		   table_case_name(create_info, create_table->table_name));
+    if (!create_info->table_existed)
+      drop_open_table(thd, table, create_table->db, create_table->table_name);
     DBUG_RETURN(0);
   }
-  table->file->extra(HA_EXTRA_WRITE_CACHE);
   DBUG_RETURN(table);
 }
 
@@ -2983,8 +3026,10 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
                           (thd->variables.sql_mode &
                            (MODE_STRICT_TRANS_TABLES |
                             MODE_STRICT_ALL_TABLES)));
-  DBUG_RETURN(check_that_all_fields_are_given_values(thd, table,
-                                                     table_list));
+  if (check_that_all_fields_are_given_values(thd, table, table_list))
+    DBUG_RETURN(1);
+  table->file->extra(HA_EXTRA_WRITE_CACHE);
+  DBUG_RETURN(0);
 }
 
 
@@ -3016,31 +3061,18 @@ bool select_create::send_eof()
   {
     table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
     table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
-    VOID(pthread_mutex_lock(&LOCK_open));
-    mysql_unlock_tables(thd, lock);
-    /*
-      TODO:
-      Check if we can remove the following two rows.
-      We should be able to just keep the table in the table cache.
-    */
-    if (!table->s->tmp_table)
+    if (lock)
     {
-      ulong version= table->s->version;
-      hash_delete(&open_cache,(byte*) table);
-      /* Tell threads waiting for refresh that something has happened */
-      if (version != refresh_version)
-        broadcast_refresh();
+      mysql_unlock_tables(thd, lock);
+      lock= 0;
     }
-    lock=0;
-    table=0;
-    VOID(pthread_mutex_unlock(&LOCK_open));
   }
   return tmp;
 }
 
+
 void select_create::abort()
 {
-  VOID(pthread_mutex_lock(&LOCK_open));
   if (lock)
   {
     mysql_unlock_tables(thd, lock);
@@ -3050,22 +3082,10 @@ void select_create::abort()
   {
     table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
     table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
-    enum db_type table_type=table->s->db_type;
-    if (!table->s->tmp_table)
-    {
-      ulong version= table->s->version;
-      hash_delete(&open_cache,(byte*) table);
-      if (!create_info->table_existed)
-        quick_rm_table(table_type, create_table->db, create_table->table_name);
-      /* Tell threads waiting for refresh that something has happened */
-      if (version != refresh_version)
-        broadcast_refresh();
-    }
-    else if (!create_info->table_existed)
-      close_temporary_table(thd, create_table->db, create_table->table_name);
+    if (!create_info->table_existed)
+      drop_open_table(thd, table, create_table->db, create_table->table_name);
     table=0;
   }
-  VOID(pthread_mutex_unlock(&LOCK_open));
 }
 
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 30abb7c2c0a..4ce0dc43144 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3014,7 +3014,13 @@ mysql_execute_command(THD *thd)
       select_lex->options|= SELECT_NO_UNLOCK;
       unit->set_limit(select_lex);
 
-      if (!(res= open_and_lock_tables(thd, select_tables)))
+      if (!(lex->create_info.options & HA_LEX_CREATE_TMP_TABLE))
+      {
+        lex->link_first_table_back(create_table, link_to_local);
+        create_table->create= TRUE;
+      }
+
+      if (!(res= open_and_lock_tables(thd, lex->query_tables)))
       {
         /*
           Is table which we are changing used somewhere in other parts
@@ -3023,6 +3029,7 @@ mysql_execute_command(THD *thd)
         if (!(create_info.options & HA_LEX_CREATE_TMP_TABLE))
         {
           TABLE_LIST *duplicate;
+          create_table= lex->unlink_first_table(&link_to_local);
           if ((duplicate= unique_table(thd, create_table, select_tables, 0)))
           {
             update_non_unique_table_error(create_table, "CREATE", duplicate);
@@ -3066,6 +3073,9 @@ mysql_execute_command(THD *thd)
           delete sel_result;
         }
       }
+      else if (!(lex->create_info.options & HA_LEX_CREATE_TMP_TABLE))
+        create_table= lex->unlink_first_table(&link_to_local);
+
     }
     else
     {
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index d3cc3613b4a..fcd70ad92ff 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1491,8 +1491,21 @@ static bool mysql_test_create_table(Prepared_statement *stmt)
 
   if (select_lex->item_list.elements)
   {
+    if (!(lex->create_info.options & HA_LEX_CREATE_TMP_TABLE))
+    {
+      lex->link_first_table_back(create_table, link_to_local);
+      create_table->create= TRUE;
+    }
+
+    if (open_and_lock_tables(stmt->thd, lex->query_tables))
+      DBUG_RETURN(TRUE);
+
+    if (!(lex->create_info.options & HA_LEX_CREATE_TMP_TABLE))
+      create_table= lex->unlink_first_table(&link_to_local);
+
     select_lex->context.resolve_in_select_list= TRUE;
-    res= select_like_stmt_test_with_open_n_lock(stmt, tables, 0, 0);
+
+    res= select_like_stmt_test(stmt, 0, 0);
   }
 
   /* put tables back for PS rexecuting */
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 42d59a10712..079cc0d6456 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -62,8 +62,8 @@ static void set_tmp_file_path(char *buf, size_t bufsize, THD *thd);
     #                   Size of path
  */
 
-static uint build_table_path(char *buff, size_t bufflen, const char *db,
-                             const char *table, const char *ext)
+uint build_table_path(char *buff, size_t bufflen, const char *db,
+                      const char *table, const char *ext)
 {
   strxnmov(buff, bufflen-1, mysql_data_home, "/", db, "/", table, ext,
            NullS);
@@ -1722,7 +1722,14 @@ bool mysql_create_table(THD *thd,const char *db, const char *table_name,
   VOID(pthread_mutex_lock(&LOCK_open));
   if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
   {
-    if (!access(path,F_OK))
+    /*
+      Inspecting table cache for placeholders created by concurrent
+      CREATE TABLE ... SELECT statements to avoid interfering with them
+      is 5.0-only solution. Starting from 5.1 we solve this problem by
+      obtaining name-lock on the table to be created first.
+    */
+    if (table_cache_has_open_placeholder(thd, db, table_name) ||
+        !access(path, F_OK))
     {
       if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS)
         goto warn;
@@ -2051,7 +2058,7 @@ static int prepare_for_restore(THD* thd, TABLE_LIST* table,
     to finish the restore in the handler later on
   */
   pthread_mutex_lock(&LOCK_open);
-  if (reopen_name_locked_table(thd, table))
+  if (reopen_name_locked_table(thd, table, TRUE))
   {
     unlock_table_name(thd, table);
     pthread_mutex_unlock(&LOCK_open);
@@ -2158,7 +2165,7 @@ static int prepare_for_repair(THD* thd, TABLE_LIST *table_list,
     to finish the repair in the handler later on.
   */
   pthread_mutex_lock(&LOCK_open);
-  if (reopen_name_locked_table(thd, table_list))
+  if (reopen_name_locked_table(thd, table_list, TRUE))
   {
     unlock_table_name(thd, table_list);
     pthread_mutex_unlock(&LOCK_open);
@@ -2803,10 +2810,24 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table,
   }
   else
   {
+    bool exists;
     strxmov(dst_path, mysql_data_home, "/", db, "/", table_name,
 	    reg_ext, NullS);
     fn_format(dst_path, dst_path, "", "", MYF(MY_UNPACK_FILENAME));
-    if (!access(dst_path, F_OK))
+
+    /*
+      Note that this critical section should actually cover most
+      of mysql_create_like_table() function. See bugs #18950 and
+      #23667 for more information.
+      Also note that starting from 5.1 we obtain name-lock on
+      target table instead of inspecting table cache for presence
+      of open placeholders (see comment in mysql_create_table()).
+    */
+    pthread_mutex_lock(&LOCK_open);
+    exists= (table_cache_has_open_placeholder(thd, db, table_name) ||
+             !access(dst_path, F_OK));
+    pthread_mutex_unlock(&LOCK_open);
+    if (exists)
       goto table_exists;
   }
 
@@ -3160,9 +3181,14 @@ view_err:
       else
       {
 	char dir_buff[FN_REFLEN];
+        bool exists;
 	strxnmov(dir_buff, FN_REFLEN, mysql_real_data_home, new_db, NullS);
-	if (!access(fn_format(new_name_buff,new_name_buff,dir_buff,reg_ext,0),
-		    F_OK))
+        VOID(pthread_mutex_lock(&LOCK_open));
+        exists= (table_cache_has_open_placeholder(thd, new_db, new_name) ||
+                 !access(fn_format(new_name_buff, new_name_buff, dir_buff,
+                                   reg_ext, 0), F_OK));
+        VOID(pthread_mutex_unlock(&LOCK_open));
+        if (exists)
 	{
 	  /* Table will be closed in do_command() */
 	  my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_alias);
@@ -3247,8 +3273,22 @@ view_err:
     if (!error && (new_name != table_name || new_db != db))
     {
       thd->proc_info="rename";
-      /* Then do a 'simple' rename of the table */
-      if (!access(new_name_buff,F_OK))
+      /*
+        Then do a 'simple' rename of the table. First we need to close all
+        instances of 'source' table.
+      */
+      close_cached_table(thd, table);
+      /*
+        Then, we want check once again that target table does not exist.
+        Note that we can't fully rely on results of previous check since
+        no lock was taken on target table during it. We also can't do this
+        before calling close_cached_table() as the latter temporarily
+        releases LOCK_open mutex.
+        Also note that starting from 5.1 we use approach with obtaining
+        of name-lock on target table.
+      */
+      if (table_cache_has_open_placeholder(thd, new_db, new_name) ||
+          !access(new_name_buff,F_OK))
       {
 	my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_name);
 	error= -1;
@@ -3256,7 +3296,6 @@ view_err:
       else
       {
 	*fn_ext(new_name)=0;
-	close_cached_table(thd, table);
 	if (mysql_rename_table(old_db_type,db,table_name,new_db,new_alias))
 	  error= -1;
         else if (Table_triggers_list::change_table_name(thd, db, table_name,
@@ -3806,17 +3845,6 @@ view_err:
 	      current_pid, thd->thread_id);
   if (lower_case_table_names)
     my_casedn_str(files_charset_info, old_name);
-  if (new_name != table_name || new_db != db)
-  {
-    if (!access(new_name_buff,F_OK))
-    {
-      error=1;
-      my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_name_buff);
-      VOID(quick_rm_table(new_db_type,new_db,tmp_name));
-      VOID(pthread_mutex_unlock(&LOCK_open));
-      goto err;
-    }
-  }
 
 #if (!defined( __WIN__) && !defined( __EMX__) && !defined( OS2))
   if (table->file->has_transactions())
@@ -3835,6 +3863,22 @@ view_err:
     table->file->extra(HA_EXTRA_FORCE_REOPEN);	// Don't use this file anymore
 #endif
 
+  if (new_name != table_name || new_db != db)
+  {
+    /*
+      Check that there is no table with target name. See the
+      comment describing code for 'simple' ALTER TABLE ... RENAME.
+    */
+    if (table_cache_has_open_placeholder(thd, new_db, new_name) ||
+        !access(new_name_buff,F_OK))
+    {
+      error=1;
+      my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_name_buff);
+      VOID(quick_rm_table(new_db_type,new_db,tmp_name));
+      VOID(pthread_mutex_unlock(&LOCK_open));
+      goto err;
+    }
+  }
 
   error=0;
   if (!need_copy_table)
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 26b557a8247..cf6db22fbcb 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -271,7 +271,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
   /* We also don't allow creation of triggers on views. */
   tables->required_type= FRMTYPE_TABLE;
 
-  if (reopen_name_locked_table(thd, tables))
+  if (reopen_name_locked_table(thd, tables, TRUE))
   {
     unlock_table_name(thd, tables);
     goto end;
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 390a991c7b6..12d35d5edd3 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1489,9 +1489,7 @@ create:
 	  lex->sql_command= SQLCOM_CREATE_TABLE;
 	  if (!lex->select_lex.add_table_to_list(thd, $5, NULL,
 						 TL_OPTION_UPDATING,
-						 (using_update_log ?
-						  TL_READ_NO_INSERT:
-						  TL_READ)))
+						 TL_WRITE))
 	    MYSQL_YYABORT;
           lex->alter_info.reset();
 	  lex->col_list.empty();
diff --git a/sql/table.h b/sql/table.h
index 61232a39f0e..da2c90ab212 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -188,6 +188,8 @@ typedef struct st_table_share
 } TABLE_SHARE;
 
 
+extern ulong refresh_version;
+
 /* Information for one open table */
 
 struct st_table {
@@ -268,7 +270,24 @@ struct st_table {
   my_bool force_index;
   my_bool distinct,const_table,no_rows;
   my_bool key_read, no_keyread;
-  my_bool locked_by_flush;
+  /*
+    Placeholder for an open table which prevents other connections
+    from taking name-locks on this table. Typically used with
+    TABLE_SHARE::version member to take an exclusive name-lock on
+    this table name -- a name lock that not only prevents other
+    threads from opening the table, but also blocks other name
+    locks. This is achieved by:
+    - setting open_placeholder to 1 - this will block other name
+      locks, as wait_for_locked_table_name will be forced to wait,
+      see table_is_used for details.
+    - setting version to 0 - this will force other threads to close
+      the instance of this table and wait (this is the same approach
+      as used for usual name locks).
+    An exclusively name-locked table currently can have no handler
+    object associated with it (db_stat is always 0), but please do
+    not rely on that.
+  */
+  my_bool open_placeholder;
   my_bool locked_by_name;
   my_bool fulltext_searched;
   my_bool no_cache;
@@ -291,6 +310,13 @@ struct st_table {
 
   bool fill_item_list(List<Item> *item_list) const;
   void reset_item_list(List<Item> *item_list) const;
+  /* Is table open or should be treated as such by name-locking? */
+  inline bool is_name_opened() { return db_stat || open_placeholder; }
+  /*
+    Is this instance of the table should be reopen or represents a name-lock?
+  */
+  inline bool needs_reopen_or_name_lock()
+  { return s->version != refresh_version; }
 };
 
 enum enum_schema_table_state
@@ -648,6 +674,12 @@ typedef struct st_table_list
     used for implicit LOCK TABLES only and won't be used in real statement.
   */
   bool          prelocking_placeholder;
+  /*
+    This TABLE_LIST object corresponds to the table to be created
+    so it is possible that it does not exist (used in CREATE TABLE
+    ... SELECT implementation).
+  */
+  bool          create;
 
   enum enum_schema_table_state schema_table_state;
   void calc_md5(char *buffer);
@@ -655,7 +687,11 @@ typedef struct st_table_list
   int view_check_option(THD *thd, bool ignore_failure);
   bool setup_underlying(THD *thd);
   void cleanup_items();
-  bool placeholder() {return derived || view || schema_table || !table; }
+  bool placeholder()
+  {
+    return derived || view || schema_table || create && !table->db_stat ||
+           !table;
+  }
   void print(THD *thd, String *str);
   bool check_single_table(st_table_list **table, table_map map,
                           st_table_list *view);

From 04efdb1526fbe97ffe003a83da81a550dd234991 Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Fri, 11 May 2007 23:19:11 +0400
Subject: [PATCH 49/58] Bug#27878: Unchecked privileges on a view referring to
 a table from another database.

If a user has a right to update anything in the current database then the
access was granted and further checks of access rights for underlying tables
wasn't done correctly. The check is done before a view is opened and thus no
check of access rights for underlying tables can be carried out.
This allows a user to update through a view a table from another database for
which he hasn't enough rights.

Now the mysql_update() and the mysql_test_update() functions are forces
re-checking of access rights after a view is opened.


mysql-test/t/grant.test:
  Added a test case for the bug#27878: Unchecked privileges on a view referring to a table from another database.
mysql-test/r/grant.result:
  Added a test case for the bug#27878: Unchecked privileges on a view referring to a table from another database.
sql/sql_update.cc:
  Bug#27878: Unchecked privileges on a view referring to a table from another
  database.
  Now the mysql_update() function forces re-checking of access rights after
  the view is opened.
sql/sql_prepare.cc:
  Bug#27878: Unchecked privileges on a view referring to a table from another
  database.
  Now the mysql_test_update() function forces re-checking of access rights after
  the view is opened.
---
 mysql-test/r/grant.result | 19 +++++++++++++++++++
 mysql-test/t/grant.test   | 25 +++++++++++++++++++++++++
 sql/sql_prepare.cc        |  5 +++--
 sql/sql_update.cc         |  5 +++--
 4 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 6d014fbb71b..ca34b56b9cc 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -1105,4 +1105,23 @@ ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table '
 DROP DATABASE mysqltest1;
 DROP DATABASE mysqltest2;
 DROP USER mysqltest_1@localhost;
+use test;
+CREATE TABLE t1 (f1 int, f2 int);
+INSERT INTO t1 VALUES(1,1), (2,2);
+CREATE DATABASE db27878;
+GRANT UPDATE(f1) ON t1 TO 'mysqltest_1'@'localhost';
+GRANT SELECT ON `test`.* TO 'mysqltest_1'@'localhost';
+GRANT ALL ON db27878.* TO 'mysqltest_1'@'localhost';
+use db27878;
+CREATE SQL SECURITY INVOKER VIEW db27878.v1 AS SELECT * FROM test.t1;
+use db27878;
+UPDATE v1 SET f2 = 4;
+ERROR HY000: View 'db27878.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
+SELECT * FROM test.t1;
+f1	f2
+1	1
+2	2
+DROP VIEW v1;
+use test;
+DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index 197f20db76e..c1eae9b3c36 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -413,6 +413,7 @@ connect (user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK);
 connection user1;
 -- error 1142
 alter table t1 rename t2;
+disconnect user1;
 connection root;
 revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
 delete from mysql.user where user=_binary'mysqltest_1';
@@ -1122,5 +1123,29 @@ DROP DATABASE mysqltest2;
 
 DROP USER mysqltest_1@localhost;
 
+#
+# Bug#27878: Unchecked privileges on a view referring to a table from another 
+#            database.
+#
+use test;
+CREATE TABLE t1 (f1 int, f2 int);
+INSERT INTO t1 VALUES(1,1), (2,2);
+CREATE DATABASE db27878;
+GRANT UPDATE(f1) ON t1 TO 'mysqltest_1'@'localhost';
+GRANT SELECT ON `test`.* TO 'mysqltest_1'@'localhost';
+GRANT ALL ON db27878.* TO 'mysqltest_1'@'localhost';
+use db27878;
+CREATE SQL SECURITY INVOKER VIEW db27878.v1 AS SELECT * FROM test.t1;
+connect (user1,localhost,mysqltest_1,,test);
+connection user1;
+use db27878;
+--error 1356
+UPDATE v1 SET f2 = 4;
+SELECT * FROM test.t1;
+disconnect user1;
+connection default;
+DROP VIEW v1;
+use test;
+DROP TABLE t1;
 
 --echo End of 5.0 tests
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 1ec65743b0f..90361f8ff0d 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1164,8 +1164,9 @@ static int mysql_test_update(Prepared_statement *stmt,
     goto error;
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  /* TABLE_LIST contain right privilages request */
-  want_privilege= table_list->grant.want_privilege;
+  /* Force privilege re-checking for views after they have been opened. */
+  want_privilege= (table_list->view ? UPDATE_ACL :
+                   table_list->grant.want_privilege);
 #endif
 
   if (mysql_prepare_update(thd, table_list, &select->where,
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index e17c71ae541..222e33345cc 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -173,8 +173,9 @@ int mysql_update(THD *thd,
   table->quick_keys.clear_all();
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  /* TABLE_LIST contain right privilages request */
-  want_privilege= table_list->grant.want_privilege;
+  /* Force privilege re-checking for views after they have been opened. */
+  want_privilege= (table_list->view ? UPDATE_ACL :
+                   table_list->grant.want_privilege);
 #endif
   if (mysql_prepare_update(thd, table_list, &conds, order_num, order))
     DBUG_RETURN(1);

From c9af98c4a4171900f7d6b56710f406e5aa09029d Mon Sep 17 00:00:00 2001
From: unknown <dlenev@mockturtle.local>
Date: Sat, 12 May 2007 00:03:50 +0400
Subject: [PATCH 50/58] Added missing DBUG_VOID_RETURN to the
 sp_head::init_sp_name() method.

---
 sql/sp_head.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 5a1faf50296..31388e0e19c 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -512,6 +512,8 @@ sp_head::init_sp_name(THD *thd, sp_name *spname)
   m_qname.length= spname->m_qname.length;
   m_qname.str= strmake_root(thd->mem_root, spname->m_qname.str,
                             m_qname.length);
+
+  DBUG_VOID_RETURN;
 }
 
 

From f0ddabc51875755b897232659dff241c1c8eb11e Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Sat, 12 May 2007 00:46:07 +0400
Subject: [PATCH 51/58] grant.result, grant.test:   Corrected test case for the
 bug#27878.

mysql-test/t/grant.test:
  Corrected test case for the bug#27878.
mysql-test/r/grant.result:
  Corrected test case for the bug#27878.
---
 mysql-test/r/grant.result | 2 +-
 mysql-test/t/grant.test   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index ca34b56b9cc..a4c51cca277 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -1121,7 +1121,7 @@ SELECT * FROM test.t1;
 f1	f2
 1	1
 2	2
-DROP VIEW v1;
+DROP DATABASE db27878;
 use test;
 DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index c1eae9b3c36..aa43e4225c5 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -1144,7 +1144,7 @@ UPDATE v1 SET f2 = 4;
 SELECT * FROM test.t1;
 disconnect user1;
 connection default;
-DROP VIEW v1;
+DROP DATABASE db27878;
 use test;
 DROP TABLE t1;
 

From d886ea8fb66c10e58029bf7c010a1a2a085ad23d Mon Sep 17 00:00:00 2001
From: unknown <igor@olga.mysql.com>
Date: Fri, 11 May 2007 19:37:32 -0700
Subject: [PATCH 52/58] Fixed bug #28375: a query with an NOT IN subquery
 predicate may cause a crash when the left operand of the predicate is
 evaluated to NULL. It happens when the rows from the inner tables (tables
 from the subquery) are accessed by index methods with key values obtained by
 evaluation of the left operand of the subquery predicate. When this predicate
 is evaluated to NULL an alternative access with full table scan is used to
 check whether the result set returned by the subquery is empty or not. The
 crash was due to the fact the info about the access methods used for regular
 key values was not properly restored after a switch back from the full scan
 access method had occurred. The patch restores this info properly. The same
 problem existed for queries with IN subquery predicates if they were used not
 at the top level of the queries.

mysql-test/r/subselect3.result:
  Added a test case for bug #28375.
mysql-test/t/subselect3.test:
  Added a test case for bug #28375.
sql/item_subselect.cc:
  Fixed bug #28375: a query with an NOT IN subquery predicate may cause
  a crash when the left operand of the predicate is evaluated to NULL.
  It happens when the rows from the inner tables (tables from the subquery)
  are accessed by index methods with key values obtained by evaluation of
  the left operand of the subquery predicate. When this predicate is
  evaluated to NULL an alternative access with full table scan is used
  to check whether the result set returned by the subquery is empty or not.
  The crash was due to the fact the info about the access methods used for
  regular key values was not properly restored after a switch back from the
  full scan access method had occurred.
  The patch restores this info properly.
sql/sql_select.h:
  Fixed bug #28375: a query with an NOT IN subquery predicate may cause
  a crash when the left operand of the predicate is evaluated to NULL.
  In the JOIN_TAB structure two fields have been added to save info about
  index methods used to access the subquery rows. The saved info is used
  after a switch back from the alternative full scan access method has
  occurred. The full scan is used when the left operand of the subquery
  predicate is evaluated to NULL.
---
 mysql-test/r/subselect3.result | 31 +++++++++++++++++++++++++++++++
 mysql-test/t/subselect3.test   | 25 +++++++++++++++++++++++++
 sql/item_subselect.cc          |  6 ++++--
 sql/sql_select.h               |  7 +++++++
 4 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/subselect3.result b/mysql-test/r/subselect3.result
index f52249db8a1..9bbfdc6c5f9 100644
--- a/mysql-test/r/subselect3.result
+++ b/mysql-test/r/subselect3.result
@@ -711,3 +711,34 @@ a
 1
 4
 DROP TABLE t1,t2;
+CREATE TABLE t1 (id int);
+CREATE TABLE t2 (id int PRIMARY KEY);
+CREATE TABLE t3 (id int PRIMARY KEY, name varchar(10));
+INSERT INTO t1 VALUES (2), (NULL), (3), (1);
+INSERT INTO t2 VALUES (234), (345), (457);
+INSERT INTO t3 VALUES (222,'bbb'), (333,'ccc'), (111,'aaa');
+EXPLAIN
+SELECT * FROM t1
+WHERE t1.id NOT IN (SELECT t2.id FROM t2,t3 
+WHERE t3.name='xxx' AND t2.id=t3.id);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
+2	DEPENDENT SUBQUERY	t2	eq_ref	PRIMARY	PRIMARY	4	func	1	Using where; Using index; Full scan on NULL key
+2	DEPENDENT SUBQUERY	t3	eq_ref	PRIMARY	PRIMARY	4	func	1	Using where; Full scan on NULL key
+SELECT * FROM t1
+WHERE t1.id NOT IN (SELECT t2.id FROM t2,t3 
+WHERE t3.name='xxx' AND t2.id=t3.id);
+id
+2
+NULL
+3
+1
+SELECT (t1.id IN (SELECT t2.id FROM t2,t3 
+WHERE t3.name='xxx' AND t2.id=t3.id)) AS x
+FROM t1;
+x
+0
+0
+0
+0
+DROP TABLE t1,t2,t3;
diff --git a/mysql-test/t/subselect3.test b/mysql-test/t/subselect3.test
index dfe09968fa2..65556012588 100644
--- a/mysql-test/t/subselect3.test
+++ b/mysql-test/t/subselect3.test
@@ -546,3 +546,28 @@ SELECT a FROM t1, t2 WHERE a=b AND (b NOT IN (SELECT a FROM t1));
 SELECT a FROM t1, t2 WHERE a=b AND (b NOT IN (SELECT a FROM t1 WHERE a > 4));
 
 DROP TABLE t1,t2;
+
+#
+# Bug #28375: crash for NOT IN subquery predicate when left operand becomes NULL  
+#
+
+CREATE TABLE t1 (id int);
+CREATE TABLE t2 (id int PRIMARY KEY);
+CREATE TABLE t3 (id int PRIMARY KEY, name varchar(10));
+INSERT INTO t1 VALUES (2), (NULL), (3), (1);
+INSERT INTO t2 VALUES (234), (345), (457);
+INSERT INTO t3 VALUES (222,'bbb'), (333,'ccc'), (111,'aaa');
+
+EXPLAIN
+SELECT * FROM t1
+  WHERE t1.id NOT IN (SELECT t2.id FROM t2,t3 
+                        WHERE t3.name='xxx' AND t2.id=t3.id);
+SELECT * FROM t1
+  WHERE t1.id NOT IN (SELECT t2.id FROM t2,t3 
+                        WHERE t3.name='xxx' AND t2.id=t3.id);
+
+SELECT (t1.id IN (SELECT t2.id FROM t2,t3 
+                    WHERE t3.name='xxx' AND t2.id=t3.id)) AS x
+  FROM t1;
+
+DROP TABLE t1,t2,t3;   
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index ccd361dba99..48b82e3cde6 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -1829,6 +1829,8 @@ int subselect_single_select_engine::exec()
             if (cond_guard && !*cond_guard)
             {
               /* Change the access method to full table scan */
+              tab->save_read_first_record= tab->read_first_record;
+              tab->save_read_record= tab->read_record.read_record;
               tab->read_first_record= init_read_record_seq;
               tab->read_record.record= tab->table->record[0];
               tab->read_record.thd= join->thd;
@@ -1849,8 +1851,8 @@ int subselect_single_select_engine::exec()
       JOIN_TAB *tab= *ptab;
       tab->read_record.record= 0;
       tab->read_record.ref_length= 0;
-      tab->read_first_record= join_read_always_key_or_null;
-      tab->read_record.read_record= join_read_next_same_or_null;
+      tab->read_first_record= tab->save_read_first_record; 
+      tab->read_record.read_record= tab->save_read_record;
     }
     executed= 1;
     thd->where= save_where;
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 5081366c10b..3cdd265df9a 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -159,6 +159,13 @@ typedef struct st_join_table {
   Read_record_func read_first_record;
   Next_select_func next_select;
   READ_RECORD	read_record;
+  /* 
+    Currently the following two fields are used only for a [NOT] IN subquery
+    if it is executed by an alternative full table scan when the left operand of
+    the subquery predicate is evaluated to NULL.
+  */  
+  Read_record_func save_read_first_record;/* to save read_first_record */ 
+  int (*save_read_record) (READ_RECORD *);/* to save read_record.read_record */
   double	worst_seeks;
   key_map	const_keys;			/* Keys with constant part */
   key_map	checked_keys;			/* Keys checked in find_best */

From d98a2a87c9610b40cf1c7a6cbf1e7f90e971739b Mon Sep 17 00:00:00 2001
From: unknown <kostja@vajra.(none)>
Date: Mon, 14 May 2007 10:56:23 +0400
Subject: [PATCH 53/58] Fix a warning.

sql/sql_insert.cc:
  Fix a compile-time warning (log_on is not used in embedded).
---
 sql/sql_insert.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index febc7883f62..26caf059e73 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -483,11 +483,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
 		  bool ignore)
 {
   int error, res;
-  /*
-    log_on is about delayed inserts only.
-    By default, both logs are enabled (this won't cause problems if the server
-    runs without --log-update or --log-bin).
-  */
   bool transactional_table, joins_freed= FALSE;
   bool changed;
   uint value_count;
@@ -501,9 +496,14 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   Name_resolution_context_state ctx_state;
 #ifndef EMBEDDED_LIBRARY
   char *query= thd->query;
-#endif
+  /*
+    log_on is about delayed inserts only.
+    By default, both logs are enabled (this won't cause problems if the server
+    runs without --log-update or --log-bin).
+  */
   bool log_on= (thd->options & OPTION_BIN_LOG) ||
     (!(thd->security_ctx->master_access & SUPER_ACL));
+#endif
   thr_lock_type lock_type = table_list->lock_type;
   Item *unused_conds= 0;
   DBUG_ENTER("mysql_insert");

From 8ebfa0baf4682b996b300fc7dd67b55886838e42 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Mon, 14 May 2007 13:02:12 +0400
Subject: [PATCH 54/58] Disable random-failing IM tests.

---
 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 df56165950f..7311aabd2a6 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -12,3 +12,4 @@
 
 ndb_load        : Bug#17233
 user_limits     : Bug#23921 random failure of user_limits.test
+im_daemon_life_cycle : IM tests fail randomly

From 2c4c8558294a59970eac2c08dd7624db53d66894 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Mon, 14 May 2007 13:20:11 +0400
Subject: [PATCH 55/58] Update description.

---
 mysql-test/t/disabled.def | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 7311aabd2a6..aeeab6ee6d4 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -12,4 +12,4 @@
 
 ndb_load        : Bug#17233
 user_limits     : Bug#23921 random failure of user_limits.test
-im_daemon_life_cycle : IM tests fail randomly
+im_daemon_life_cycle : Bug#20294: Instance manager tests fail randomly

From d8f13c8cd004eafd08ea72219133adc76be756e2 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@ibm.>
Date: Mon, 14 May 2007 19:25:03 +0400
Subject: [PATCH 56/58] Disable im_life_cycle in 5.0.

---
 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 aeeab6ee6d4..85685234de9 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -12,4 +12,5 @@
 
 ndb_load        : Bug#17233
 user_limits     : Bug#23921 random failure of user_limits.test
+im_life_cycle        : Bug#27851: Instance manager test im_life_cycle fails randomly
 im_daemon_life_cycle : Bug#20294: Instance manager tests fail randomly

From 3395c53efcf07126fdf05ccd4ffdafb8ce319751 Mon Sep 17 00:00:00 2001
From: unknown <kostja@vajra.(none)>
Date: Wed, 16 May 2007 09:51:05 +0400
Subject: [PATCH 57/58] A fix and a test case for Bug#21483 "Server abort or
 deadlock on INSERT DELAYED with another implicit insert" Also fixes and adds
 test cases for bugs: 20497 "Trigger with INSERT DELAYED causes Error 1165"
 21714 "Wrong NEW.value and server abort on INSERT DELAYED to a table with a
 trigger". Post-review fixes.

Problem:
In MySQL INSERT DELAYED is a way to pipe all inserts into a
given table through a dedicated thread. This is necessary for
simplistic storage engines like MyISAM, which do not have internal
concurrency control or threading and thus can not
achieve efficient INSERT throughput without support from SQL layer.
DELAYED INSERT works as follows:
For every distinct table, which can accept DELAYED inserts and has
pending data to insert, a dedicated thread is created to write data
to disk. All user connection threads that attempt to
delayed-insert into this table interact with the dedicated thread in
producer/consumer fashion: all records to-be inserted are pushed
into a queue of the dedicated thread, which fetches the records and
writes them.
In this design, client connection threads never open or lock
the delayed insert table.
This functionality was introduced in version 3.23 and does not take
into account existence of triggers, views, or pre-locking.
E.g. if INSERT DELAYED is called from a stored function, which,
in turn, is called from another stored function that uses the delayed
table, a deadlock can occur, because delayed locking by-passes
pre-locking. Besides:
 * the delayed thread works directly with the subject table through
   the storage engine API and does not invoke triggers
 * even if it was patched to invoke triggers, if triggers,
   in turn, used other tables, the delayed thread would
   have to open and lock involved tables (use pre-locking).
 * even if it was patched to use pre-locking, without deadlock
   detection the delayed thread could easily lock out user
   connection threads in case when the same table is used both
   in a trigger and on the right side of the insert query:
   the delayed thread would not release locks until all inserts
   are complete, and user connection can not complete inserts
   without having locks on the tables used on the right side of the
   query.

Solution:

These considerations suggest two general alternatives for the
future of INSERT DELAYED:
 * it is considered a full-fledged alternative to normal INSERT
 * it is regarded as an optimisation that is only relevant
   for simplistic engines.
Since we missed our chance to provide complete support of new
features when 5.0 was in development, the first alternative
currently renders infeasible.
However, even the second alternative, which is to detect
new features and convert DELAYED insert into a normal insert,
is not easy to implement.
The catch-22 is that we don't know if the subject table has triggers
or is a view before we open it, and we only open it in the
delayed thread. We don't know if the query involves pre-locking
until we have opened all tables, and we always first create
the delayed thread, and only then open the remaining tables.
This patch detects the problematic scenarios and converts
DELAYED INSERT to a normal INSERT using the following approach:
 * if the statement is executed under pre-locking (e.g. from
   within a stored function or trigger) or the right
   side may require pre-locking, we detect the situation
   before creating a delayed insert thread and convert the statement
   to a conventional INSERT.
  * if the subject table is a view or has triggers, we shutdown
   the delayed thread and convert the statement to a conventional
   INSERT.


mysql-test/r/insert.result:
  Update test results.
mysql-test/t/insert.test:
  Add a test case for Bug#21483, Bug#20497, Bug#21714 (INSERT DELAYED
  and stored routines, triggers).
sql/sp_head.cc:
  Upgrade lock type to TL_WRITE when computing the pre-locking set.
sql/sql_base.cc:
  Use a new method.
sql/sql_insert.cc:
  INSERT DELAYED and pre-locking:
  - if  under pre-locking, upgrade the lock type to TL_WRITE
  and proceed as a normal write
  - if DELAYED table has triggers, also request a lock upgrade.
  - make sure errors in the delayed thread are propagated
  correctly
sql/sql_lex.h:
  Add a method to check if a parsed tree refers to stored
  routines.
---
 mysql-test/r/insert.result | 116 +++++++++++++++++
 mysql-test/t/insert.test   | 139 ++++++++++++++++++++
 sql/sp_head.cc             |   8 ++
 sql/sql_base.cc            |   4 +-
 sql/sql_insert.cc          | 252 +++++++++++++++++++++++++------------
 sql/sql_lex.h              |   6 +
 6 files changed, 442 insertions(+), 83 deletions(-)

diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result
index 7900e0b7695..fa6e23d09f9 100644
--- a/mysql-test/r/insert.result
+++ b/mysql-test/r/insert.result
@@ -346,3 +346,119 @@ f1	f2
 12	NULL
 drop view v1;
 drop table t1,t2;
+DROP TABLE IF EXISTS t1;
+DROP FUNCTION IF EXISTS f1;
+DROP FUNCTION IF EXISTS f2;
+CREATE TABLE t1 (i INT);
+CREATE FUNCTION f1() RETURNS INT
+BEGIN
+INSERT INTO t1 VALUES (1);
+RETURN 1;
+END |
+CREATE FUNCTION f2() RETURNS INT
+BEGIN
+INSERT DELAYED INTO t1 VALUES (2);
+RETURN 1;
+END |
+SELECT f1();
+f1()
+1
+SELECT f2();
+f2()
+1
+INSERT INTO t1 VALUES (3);
+INSERT DELAYED INTO t1 VALUES (4);
+INSERT INTO t1 VALUES (f1());
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+INSERT DELAYED INTO t1 VALUES (f1());
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+INSERT INTO t1 VALUES (f2());
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+INSERT DELAYED INTO t1 VALUES (f2());
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW
+INSERT INTO t1 VALUES (NEW.i);
+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.
+INSERT DELAYED 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;
+i
+1
+2
+3
+4
+DROP FUNCTION f2;
+DROP FUNCTION f1;
+DROP TABLE t1;
+DROP TABLE IF EXISTS t1, t2;
+CREATE TABLE t1 (i INT);
+CREATE TABLE t2 (i INT);
+CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW
+INSERT DELAYED INTO t2 VALUES (NEW.i);
+CREATE TRIGGER t1_bu BEFORE UPDATE ON t1 FOR EACH ROW
+INSERT DELAYED INTO t2 VALUES (NEW.i);
+CREATE TRIGGER t1_bd BEFORE DELETE ON t1 FOR EACH ROW
+INSERT DELAYED INTO t2 VALUES (OLD.i);
+INSERT INTO t1 VALUES (1);
+INSERT DELAYED INTO t1 VALUES (2);
+SELECT * FROM t1;
+i
+1
+2
+UPDATE t1 SET i = 3 WHERE i = 1;
+SELECT * FROM t1;
+i
+3
+2
+DELETE FROM t1 WHERE i = 3;
+SELECT * FROM t1;
+i
+2
+SELECT * FROM t2;
+i
+1
+2
+3
+3
+DROP TABLE t1, t2;
+DROP TABLE IF EXISTS t1, t2;
+CREATE TABLE t1 (i INT);
+CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW
+SET @a= NEW.i;
+SET @a= 0;
+INSERT DELAYED INTO t1 VALUES (1);
+SELECT @a;
+@a
+1
+INSERT DELAYED INTO t1 VALUES (2);
+SELECT @a;
+@a
+2
+DROP TABLE t1;
+CREATE TABLE t1 (i INT);
+CREATE TABLE t2 (i INT);
+CREATE TRIGGER t1_ai AFTER INSERT ON t1 FOR EACH ROW
+INSERT INTO t2 VALUES (NEW.i);
+CREATE TRIGGER t1_au AFTER UPDATE ON t1 FOR EACH ROW
+INSERT DELAYED INTO t2 VALUES (NEW.i);
+CREATE TRIGGER t1_ad AFTER DELETE ON t1 FOR EACH ROW
+INSERT DELAYED INTO t2 VALUES (OLD.i);
+INSERT DELAYED INTO t1 VALUES (1);
+SELECT * FROM t1;
+i
+1
+UPDATE t1 SET i = 2 WHERE i = 1;
+SELECT * FROM t1;
+i
+2
+DELETE FROM t1 WHERE i = 2;
+SELECT * FROM t1;
+i
+SELECT * FROM t2;
+i
+1
+2
+2
+DROP TABLE t1, t2;
+End of 5.0 tests.
diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test
index 0a8e184ea5c..76177403bd0 100644
--- a/mysql-test/t/insert.test
+++ b/mysql-test/t/insert.test
@@ -216,3 +216,142 @@ select * from t1;
 drop view v1;
 drop table t1,t2;
 
+
+#
+# BUG#21483: Server abort or deadlock on INSERT DELAYED with another
+# implicit insert 
+#
+# The solution is to downgrade INSERT DELAYED to normal INSERT if the
+# statement uses functions and access tables or triggers, or is called
+# from a function or a trigger.
+#
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP FUNCTION IF EXISTS f1;
+DROP FUNCTION IF EXISTS f2;
+--enable_warnings
+
+CREATE TABLE t1 (i INT);
+delimiter |;
+CREATE FUNCTION f1() RETURNS INT
+BEGIN
+  INSERT INTO t1 VALUES (1);
+  RETURN 1;
+END |
+CREATE FUNCTION f2() RETURNS INT
+BEGIN
+  INSERT DELAYED INTO t1 VALUES (2);
+  RETURN 1;
+END |
+delimiter ;|
+
+SELECT f1();
+SELECT f2();
+INSERT INTO t1 VALUES (3);
+INSERT DELAYED INTO t1 VALUES (4);
+
+--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
+INSERT INTO t1 VALUES (f1());
+
+--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
+INSERT DELAYED INTO t1 VALUES (f1());
+
+--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
+INSERT INTO t1 VALUES (f2());
+
+--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
+INSERT DELAYED INTO t1 VALUES (f2());
+
+CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW
+  INSERT INTO t1 VALUES (NEW.i);
+
+--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
+INSERT INTO t1 VALUES (1);
+
+--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
+INSERT DELAYED INTO t1 VALUES (1);
+
+SELECT * FROM t1;
+
+DROP FUNCTION f2;
+DROP FUNCTION f1;
+DROP TABLE t1;
+
+#
+# BUG#20497: Trigger with INSERT DELAYED causes Error 1165
+#
+# Fixed by the patch for Bug#21483
+#
+--disable_warnings
+DROP TABLE IF EXISTS t1, t2;
+--enable_warnings
+
+CREATE TABLE t1 (i INT);
+CREATE TABLE t2 (i INT);
+
+CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW
+  INSERT DELAYED INTO t2 VALUES (NEW.i);
+
+CREATE TRIGGER t1_bu BEFORE UPDATE ON t1 FOR EACH ROW
+  INSERT DELAYED INTO t2 VALUES (NEW.i);
+
+CREATE TRIGGER t1_bd BEFORE DELETE ON t1 FOR EACH ROW
+  INSERT DELAYED INTO t2 VALUES (OLD.i);
+
+INSERT INTO t1 VALUES (1);
+INSERT DELAYED INTO t1 VALUES (2);
+SELECT * FROM t1;
+UPDATE t1 SET i = 3 WHERE i = 1;
+SELECT * FROM t1;
+DELETE FROM t1 WHERE i = 3;
+SELECT * FROM t1;
+SELECT * FROM t2;
+
+DROP TABLE t1, t2;
+
+#
+# BUG#21714: Wrong NEW.value and server abort on INSERT DELAYED to a
+# table with a trigger 
+#
+# Fixed by the patch for Bug#21483
+#
+--disable_warnings
+DROP TABLE IF EXISTS t1, t2;
+--enable_warnings
+
+CREATE TABLE t1 (i INT);
+CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW
+  SET @a= NEW.i;
+
+SET @a= 0;
+INSERT DELAYED INTO t1 VALUES (1);
+SELECT @a;
+INSERT DELAYED INTO t1 VALUES (2);
+SELECT @a;
+
+DROP TABLE t1;
+
+CREATE TABLE t1 (i INT);
+CREATE TABLE t2 (i INT);
+
+CREATE TRIGGER t1_ai AFTER INSERT ON t1 FOR EACH ROW
+  INSERT INTO t2 VALUES (NEW.i);
+
+CREATE TRIGGER t1_au AFTER UPDATE ON t1 FOR EACH ROW
+  INSERT DELAYED INTO t2 VALUES (NEW.i);
+
+CREATE TRIGGER t1_ad AFTER DELETE ON t1 FOR EACH ROW
+  INSERT DELAYED INTO t2 VALUES (OLD.i);
+
+INSERT DELAYED INTO t1 VALUES (1);
+SELECT * FROM t1;
+UPDATE t1 SET i = 2 WHERE i = 1;
+SELECT * FROM t1;
+DELETE FROM t1 WHERE i = 2;
+SELECT * FROM t1;
+SELECT * FROM t2;
+
+DROP TABLE t1, t2;
+
+--echo End of 5.0 tests.
+
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 5a1faf50296..b24fb01e2ff 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -3487,6 +3487,14 @@ sp_head::merge_table_list(THD *thd, TABLE_LIST *table, LEX *lex_for_tmp_check)
       tlen+= alen;
       tname[tlen]= '\0';
 
+      /*
+        Upgrade the lock type because this table list will be used
+        only in pre-locked mode, in which DELAYED inserts are always
+        converted to normal inserts.
+      */
+      if (table->lock_type == TL_WRITE_DELAYED)
+        table->lock_type= TL_WRITE;
+
       /*
         We ignore alias when we check if table was already marked as temporary
         (and therefore should not be prelocked). Otherwise we will erroneously
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 6e6611d54d2..f044a1edb01 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2277,7 +2277,7 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags)
   */
 
   if (!thd->prelocked_mode && !thd->lex->requires_prelocking() &&
-      thd->lex->sroutines_list.elements)
+      thd->lex->uses_stored_routines())
   {
     bool first_no_prelocking, need_prelocking, tabs_changed;
     TABLE_LIST **save_query_tables_last= thd->lex->query_tables_last;
@@ -2465,7 +2465,7 @@ process_view_routines:
     */
     if (tables->view && !thd->prelocked_mode &&
         !thd->lex->requires_prelocking() &&
-        tables->view->sroutines_list.elements)
+        tables->view->uses_stored_routines())
     {
       /* We have at least one table in TL here. */
       if (!query_tables_last_own)
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index db4c2f64d6a..d62f782683d 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -61,7 +61,7 @@
 #include "slave.h"
 
 #ifndef EMBEDDED_LIBRARY
-static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list);
+static bool delayed_get_table(THD *thd, TABLE_LIST *table_list);
 static int write_delayed(THD *thd,TABLE *table, enum_duplicates dup, bool ignore,
 			 char *query, uint query_length, bool log_on);
 static void end_delayed_insert(THD *thd);
@@ -409,6 +409,7 @@ void mark_fields_used_by_triggers_for_insert_stmt(THD *thd, TABLE *table,
   downgrade the lock in handler::store_lock() method.
 */
 
+static
 void upgrade_lock_type(THD *thd, thr_lock_type *lock_type,
                        enum_duplicates duplic,
                        bool is_multi_insert)
@@ -422,29 +423,37 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type,
 
   if (*lock_type == TL_WRITE_DELAYED)
   {
-#ifdef EMBEDDED_LIBRARY
-    /* No auxiliary threads in the embedded server. */
-    *lock_type= TL_WRITE;
-    return;
-#else
     /*
       We do not use delayed threads if:
-      - we're running in the safe mode or skip-new - the feature
-         is disabled in these modes
-      - we're running this query in statement level replication,
-        on a replication slave - because we must ensure serial
-        execution of queries on the slave
+      - we're running in the safe mode or skip-new mode -- the
+        feature is disabled in these modes
+      - we're executing this statement on a replication slave --
+        we need to ensure serial execution of queries on the
+        slave
       - it is INSERT .. ON DUPLICATE KEY UPDATE - in this case the
         insert cannot be concurrent
+      - this statement is directly or indirectly invoked from
+        a stored function or trigger (under pre-locking) - to
+        avoid deadlocks, since INSERT DELAYED involves a lock
+        upgrade (TL_WRITE_DELAYED -> TL_WRITE) which we should not
+        attempt while keeping other table level locks.
+      - this statement itself may require pre-locking.
+        We should upgrade the lock even though in most cases
+        delayed functionality may work. Unfortunately, we can't
+        easily identify whether the subject table is not used in
+        the statement indirectly via a stored function or trigger:
+        if it is used, that will lead to a deadlock between the
+        client connection and the delayed thread.
     */
     if (specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE) ||
         thd->slave_thread ||
-        thd->variables.max_insert_delayed_threads == 0)
+        thd->variables.max_insert_delayed_threads == 0 ||
+        thd->prelocked_mode ||
+        thd->lex->uses_stored_routines())
     {
       *lock_type= TL_WRITE;
       return;
     }
-#endif
     bool log_on= (thd->options & OPTION_BIN_LOG ||
                   ! (thd->security_ctx->master_access & SUPER_ACL));
     if (log_on && mysql_bin_log.is_open() && is_multi_insert)
@@ -470,6 +479,72 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type,
 }
 
 
+/**
+  Find or create a delayed insert thread for the first table in
+  the table list, then open and lock the remaining tables.
+  If a table can not be used with insert delayed, upgrade the lock
+  and open and lock all tables using the standard mechanism.
+
+  @param thd         thread context
+  @param table_list  list of "descriptors" for tables referenced
+                     directly in statement SQL text.
+                     The first element in the list corresponds to
+                     the destination table for inserts, remaining
+                     tables, if any, are usually tables referenced
+                     by sub-queries in the right part of the
+                     INSERT.
+
+  @return Status of the operation. In case of success 'table'
+  member of every table_list element points to an instance of
+  class TABLE.
+
+  @sa open_and_lock_tables for more information about MySQL table
+  level locking
+*/
+
+static
+bool open_and_lock_for_insert_delayed(THD *thd, TABLE_LIST *table_list)
+{
+  DBUG_ENTER("open_and_lock_for_insert_delayed");
+
+#ifndef EMBEDDED_LIBRARY
+  if (delayed_get_table(thd, table_list))
+    DBUG_RETURN(TRUE);
+
+  if (table_list->table)
+  {
+    /*
+      Open tables used for sub-selects or in stored functions, will also
+      cache these functions.
+    */
+    if (open_and_lock_tables(thd, table_list->next_global))
+    {
+      end_delayed_insert(thd);
+      DBUG_RETURN(TRUE);
+    }
+    /*
+      First table was not processed by open_and_lock_tables(),
+      we need to set updatability flag "by hand".
+    */
+    if (!table_list->derived && !table_list->view)
+      table_list->updatable= 1;  // usual table
+    DBUG_RETURN(FALSE);
+  }
+#endif
+  /*
+    * This is embedded library and we don't have auxiliary
+    threads OR
+    * a lock upgrade was requested inside delayed_get_table
+      because
+      - there are too many delayed insert threads OR
+      - the table has triggers.
+    Use a normal insert.
+  */
+  table_list->lock_type= TL_WRITE;
+  DBUG_RETURN(open_and_lock_tables(thd, table_list));
+}
+
+
 /**
   INSERT statement implementation
 */
@@ -483,11 +558,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
 		  bool ignore)
 {
   int error, res;
-  /*
-    log_on is about delayed inserts only.
-    By default, both logs are enabled (this won't cause problems if the server
-    runs without --log-update or --log-bin).
-  */
   bool transactional_table, joins_freed= FALSE;
   bool changed;
   uint value_count;
@@ -501,9 +571,14 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   Name_resolution_context_state ctx_state;
 #ifndef EMBEDDED_LIBRARY
   char *query= thd->query;
-#endif
+  /*
+    log_on is about delayed inserts only.
+    By default, both logs are enabled (this won't cause problems if the server
+    runs without --log-update or --log-bin).
+  */
   bool log_on= (thd->options & OPTION_BIN_LOG) ||
     (!(thd->security_ctx->master_access & SUPER_ACL));
+#endif
   thr_lock_type lock_type = table_list->lock_type;
   Item *unused_conds= 0;
   DBUG_ENTER("mysql_insert");
@@ -514,7 +589,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   */
   upgrade_lock_type(thd, &table_list->lock_type, duplic,
                     values_list.elements > 1);
-  lock_type= table_list->lock_type;
 
   /*
     We can't write-delayed into a table locked with LOCK TABLES:
@@ -522,7 +596,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
     never be able to get a lock on the table. QQQ: why not
     upgrade the lock here instead?
   */
-  if (lock_type == TL_WRITE_DELAYED && thd->locked_tables &&
+  if (table_list->lock_type == TL_WRITE_DELAYED && thd->locked_tables &&
       find_locked_table(thd, table_list->db, table_list->table_name))
   {
     my_error(ER_DELAYED_INSERT_TABLE_LOCKED, MYF(0),
@@ -530,36 +604,16 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
     DBUG_RETURN(TRUE);
   }
 
-#ifndef EMBEDDED_LIBRARY
-  if (lock_type == TL_WRITE_DELAYED)
+  if (table_list->lock_type == TL_WRITE_DELAYED)
   {
-    res= 1;
-    if ((table= delayed_get_table(thd,table_list)) && !thd->is_fatal_error)
-    {
-      /*
-        Open tables used for sub-selects or in stored functions, will also
-        cache these functions.
-      */
-      res= open_and_lock_tables(thd, table_list->next_global);
-      /*
-	First is not processed by open_and_lock_tables() => we need set
-	updateability flags "by hands".
-      */
-      if (!table_list->derived && !table_list->view)
-        table_list->updatable= 1;  // usual table
-    }
-    else if (thd->net.last_errno != ER_WRONG_OBJECT)
-    {
-      /* Too many delayed insert threads;  Use a normal insert */
-      table_list->lock_type= lock_type= TL_WRITE;
-      res= open_and_lock_tables(thd, table_list);
-    }
+    if (open_and_lock_for_insert_delayed(thd, table_list))
+      DBUG_RETURN(TRUE);
   }
   else
-#endif /* EMBEDDED_LIBRARY */
-    res= open_and_lock_tables(thd, table_list);
-  if (res || thd->is_fatal_error)
-    DBUG_RETURN(TRUE);
+  {
+    if (open_and_lock_tables(thd, table_list))
+      DBUG_RETURN(TRUE);
+  }
 
   thd->proc_info="init";
   thd->used_tables=0;
@@ -577,6 +631,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
 
   /* mysql_prepare_insert set table_list->table if it was not set */
   table= table_list->table;
+  lock_type= table_list->lock_type;
 
   context= &thd->lex->select_lex.context;
   /*
@@ -1633,19 +1688,32 @@ Delayed_insert *find_handler(THD *thd, TABLE_LIST *table_list)
   Attempt to find or create a delayed insert thread to handle inserts
   into this table.
 
-  @return Return a local copy of the table in the delayed thread
-  @retval  NULL  too many delayed threads OR
-                 this thread ran out of resources OR
-                 a newly created delayed insert thread ran out of resources OR
-                 the delayed insert thread failed to open the table.
-                 In the last three cases an error is set in THD.
+  @return In case of success, table_list->table points to a local copy
+          of the delayed table or is set to NULL, which indicates a
+          request for lock upgrade. In case of failure, value of
+          table_list->table is undefined.
+  @retval TRUE  - this thread ran out of resources OR
+                - a newly created delayed insert thread ran out of
+                  resources OR
+                - the created thread failed to open and lock the table
+                  (e.g. because it does not exist) OR
+                - the table opened in the created thread turned out to
+                  be a view
+  @retval FALSE - table successfully opened OR
+                - too many delayed insert threads OR
+                - the table has triggers and we have to fall back to
+                  a normal INSERT
+                Two latter cases indicate a request for lock upgrade.
+
+  XXX: why do we regard INSERT DELAYED into a view as an error and
+  do not simply a lock upgrade?
 */
 
-static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
+static
+bool delayed_get_table(THD *thd, TABLE_LIST *table_list)
 {
   int error;
   Delayed_insert *tmp;
-  TABLE *table;
   DBUG_ENTER("delayed_get_table");
 
   /* Must be set in the parser */
@@ -1671,7 +1739,8 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
       if (!(tmp=new Delayed_insert()))
       {
 	my_error(ER_OUTOFMEMORY,MYF(0),sizeof(Delayed_insert));
-	goto err1;
+        thd->fatal_error();
+        goto end_create;
       }
       pthread_mutex_lock(&LOCK_thread_count);
       thread_count++;
@@ -1680,9 +1749,10 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
       tmp->thd.query= my_strdup(table_list->table_name,MYF(MY_WME));
       if (tmp->thd.db == NULL || tmp->thd.query == NULL)
       {
+        /* The error is reported */
 	delete tmp;
-	my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
-	goto err1;
+        thd->fatal_error();
+        goto end_create;
       }
       tmp->table_list= *table_list;			// Needed to open table
       tmp->table_list.alias= tmp->table_list.table_name= tmp->thd.query;
@@ -1698,7 +1768,8 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
 	tmp->unlock();
 	delete tmp;
 	my_error(ER_CANT_CREATE_THREAD, MYF(0), error);
-	goto err1;
+        thd->fatal_error();
+        goto end_create;
       }
 
       /* Wait until table is open */
@@ -1711,41 +1782,44 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
       thd->proc_info="got old table";
       if (tmp->thd.killed)
       {
-	if (tmp->thd.is_fatal_error)
+	if (tmp->thd.net.report_error)
 	{
-	  /* Copy error message and abort */
-	  thd->fatal_error();
-	  strmov(thd->net.last_error,tmp->thd.net.last_error);
-	  thd->net.last_errno=tmp->thd.net.last_errno;
+          /*
+            Copy the error message. Note that we don't treat fatal
+            errors in the delayed thread as fatal errors in the
+            main thread. Use of my_message will enable stored
+            procedures continue handlers.
+          */
+          my_message(tmp->thd.net.last_errno, tmp->thd.net.last_error,
+                     MYF(0));
 	}
 	tmp->unlock();
-	goto err;
+        goto end_create;
       }
       if (thd->killed)
       {
 	tmp->unlock();
-	goto err;
+        goto end_create;
       }
     }
     pthread_mutex_unlock(&LOCK_delayed_create);
   }
 
   pthread_mutex_lock(&tmp->mutex);
-  table= tmp->get_local_table(thd);
+  table_list->table= tmp->get_local_table(thd);
   pthread_mutex_unlock(&tmp->mutex);
-  if (table)
+  if (table_list->table)
+  {
+    DBUG_ASSERT(tmp->thd.net.report_error == 0 && thd->net.report_error == 0);
     thd->di=tmp;
-  else if (tmp->thd.is_fatal_error)
-    thd->fatal_error();
+  }
   /* Unlock the delayed insert object after its last access. */
   tmp->unlock();
-  DBUG_RETURN((table_list->table=table));
+  DBUG_RETURN(table_list->table == NULL);
 
- err1:
-  thd->fatal_error();
- err:
+end_create:
   pthread_mutex_unlock(&LOCK_delayed_create);
-  DBUG_RETURN(0); // Continue with normal insert
+  DBUG_RETURN(thd->net.report_error);
 }
 
 
@@ -1760,6 +1834,9 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
   @pre This function is called from the client thread.  Delayed
        insert thread mutex must be acquired before invoking this
        function.
+
+  @return Not-NULL table object on success. NULL in case of an error,
+                    which is set in client_thd.
 */
 
 TABLE *Delayed_insert::get_local_table(THD* client_thd)
@@ -1785,8 +1862,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
       goto error;
     if (dead)
     {
-      strmov(client_thd->net.last_error,thd.net.last_error);
-      client_thd->net.last_errno=thd.net.last_errno;
+      my_message(thd.net.last_errno, thd.net.last_error, MYF(0));
       goto error;
     }
   }
@@ -1831,7 +1907,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
   for (org_field= table->field; *org_field; org_field++, field++)
   {
     if (!(*field= (*org_field)->new_field(client_thd->mem_root, copy, 1)))
-      DBUG_RETURN(0);
+      goto error;
     (*field)->orig_table= copy;			// Remove connection
     (*field)->move_field(adjust_ptrs);		// Point at copy->record[0]
     if (*org_field == found_next_number_field)
@@ -1871,8 +1947,9 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
 
 /* Put a question in queue */
 
-static int write_delayed(THD *thd,TABLE *table,enum_duplicates duplic, bool ignore,
-			 char *query, uint query_length, bool log_on)
+static
+int write_delayed(THD *thd,TABLE *table,enum_duplicates duplic, bool ignore,
+                  char *query, uint query_length, bool log_on)
 {
   delayed_row *row=0;
   Delayed_insert *di=thd->di;
@@ -1939,6 +2016,10 @@ static int write_delayed(THD *thd,TABLE *table,enum_duplicates duplic, bool igno
   DBUG_RETURN(1);
 }
 
+/**
+  Signal the delayed insert thread that this user connection
+  is finished using it for this statement.
+*/
 
 static void end_delayed_insert(THD *thd)
 {
@@ -2051,6 +2132,15 @@ pthread_handler_t handle_delayed_insert(void *arg)
     my_error(ER_ILLEGAL_HA, MYF(0), di->table_list.table_name);
     goto end;
   }
+  if (di->table->triggers)
+  {
+    /*
+      Table has triggers. This is not an error, but we do
+      not support triggers with delayed insert. Terminate the delayed
+      thread without an error and thus request lock upgrade.
+    */
+    goto end;
+  }
   di->table->copy_blobs=1;
 
   /* One can now use this */
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index d07de73d5b9..aa85711b4fd 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -886,6 +886,12 @@ public:
       query_tables_own_last= 0;
     }
   }
+  /**
+    true if the parsed tree contains references to stored procedures
+    or functions, false otherwise
+  */
+  bool uses_stored_routines() const
+  { return sroutines_list.elements != 0; }
 };
 
 

From 75392f37078a8e3bf3098f40c84a24c18cd91d5b Mon Sep 17 00:00:00 2001
From: unknown <kostja@vajra.(none)>
Date: Wed, 16 May 2007 11:49:15 +0400
Subject: [PATCH 58/58] Fix a failing assert.

sql/sql_insert.cc:
  Do not access delayed thread memory without a mutex.
---
 sql/sql_insert.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 7f951867f4c..5720758128e 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1811,7 +1811,7 @@ bool delayed_get_table(THD *thd, TABLE_LIST *table_list)
   pthread_mutex_unlock(&tmp->mutex);
   if (table_list->table)
   {
-    DBUG_ASSERT(tmp->thd.net.report_error == 0 && thd->net.report_error == 0);
+    DBUG_ASSERT(thd->net.report_error == 0);
     thd->di=tmp;
   }
   /* Unlock the delayed insert object after its last access. */