Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged

mysql-test/suite/binlog/r/binlog_innodb.result

@@ -135,4 +135,37 @@ show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	1
 drop table t1;
+CREATE TABLE `t1` (
+`a` int(11) NOT NULL auto_increment,
+`b` int(11) default NULL,
+PRIMARY KEY  (`a`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+CREATE TABLE `t2` (
+`a` int(11) NOT NULL auto_increment,
+`b` int(11) default NULL,
+PRIMARY KEY  (`a`)
+) ENGINE=INNODB DEFAULT CHARSET=latin1 ;
+insert into t1 values (1,1),(2,2);
+insert into t2 values (1,1),(4,4);
+reset master;
+UPDATE t2,t1 SET t2.a=t1.a+2;
+ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
+select * from t2 /* must be (3,1), (4,4) */;
+a	b
+1	1
+4	4
+show master status /* there must no UPDATE in binlog */;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	106		
+delete from t1;
+delete from t2;
+insert into t1 values (1,2),(3,4),(4,4);
+insert into t2 values (1,2),(3,4),(4,4);
+reset master;
+UPDATE t2,t1  SET t2.a=t2.b where t2.a=t1.a;
+ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
+show master status /* there must be no UPDATE query event */;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	106		
+drop table t1, t2;
 End of tests

mysql-test/suite/binlog/t/binlog_innodb.test

@@ -130,4 +130,43 @@ show status like "binlog_cache_use";
 show status like "binlog_cache_disk_use";
 drop table t1;
 
+#
+# Bug#27716  	multi-update did partially and has not binlogged
+#
+
+CREATE TABLE `t1` (
+  `a` int(11) NOT NULL auto_increment,
+  `b` int(11) default NULL,
+  PRIMARY KEY  (`a`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+
+CREATE TABLE `t2` (
+  `a` int(11) NOT NULL auto_increment,
+  `b` int(11) default NULL,
+  PRIMARY KEY  (`a`)
+) ENGINE=INNODB DEFAULT CHARSET=latin1 ;
+
+# A. testing multi_update::send_eof() execution branch
+insert into t1 values (1,1),(2,2);
+insert into t2 values (1,1),(4,4);
+reset master;
+--error ER_DUP_ENTRY
+UPDATE t2,t1 SET t2.a=t1.a+2;
+# check
+select * from t2 /* must be (3,1), (4,4) */;
+show master status /* there must no UPDATE in binlog */;
+
+# B. testing multi_update::send_error() execution branch
+delete from t1;
+delete from t2;
+insert into t1 values (1,2),(3,4),(4,4);
+insert into t2 values (1,2),(3,4),(4,4);
+reset master;
+--error ER_DUP_ENTRY
+UPDATE t2,t1  SET t2.a=t2.b where t2.a=t1.a;
+show master status /* there must be no UPDATE query event */;
+
+# cleanup bug#27716
+drop table t1, t2;
+
 --echo End of tests

mysql-test/suite/funcs_1/datadict/datadict_priv.inc

@@ -0,0 +1,107 @@
+############## suite/funcs_1/datadict/datadict_priv.inc ################
+#                                                                      #
+# DDL and DML operations on information_schema tables                  #
+#                                                                      #
+# Creation:                                                            #
+# 2007-08    hhunger Implement this test as part of                    #
+#                    WL#3982 Test information_schema.processlist       #
+#                                                                      #
+# Last update:                                                         #
+# 2007-08-14 mleich  Some cleanup                                      #
+#                                                                      #
+########################################################################
+
+# These variables have to be set before sourcing this file.
+#
+# information_schema table to be tested
+# let $table= processlist;
+#
+# columns of the information_schema table e.g. to use in a select.
+# let $columns= ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO;
+#
+# Where clause for an update.
+# let $update_where= WHERE id=1 ;
+#
+# Column to be used in the SET of an update.
+# let $set_column= user='any_user' ;
+#
+# Where clause of a delete.
+# let $delete_where= WHERE id=1 ;
+#
+# Column to be dropped.
+# let $drop_column= user;
+#
+# Column to be indexed
+# let $index_col= user;
+
+
+# data access
+
+eval CREATE TEMPORARY TABLE test.t_$table AS SELECT * FROM $table;
+
+eval UPDATE test.t_$table SET user='horst' $update_where ;
+
+--error ER_DBACCESS_DENIED_ERROR
+eval INSERT INTO $table SELECT * FROM test.t_$table;
+
+# bug#30208: CREATE TABLE ...LIKE does not accept dbname.tablename:unknown database
+eval DROP TABLE test.t_$table;
+
+--error ER_VIEW_NONUPD_CHECK
+eval CREATE VIEW test.v_$table ($columns) AS SELECT * FROM $table WITH CHECK OPTION;
+
+eval CREATE VIEW test.v_$table ($columns) AS SELECT * FROM $table;
+
+--error ER_DBACCESS_DENIED_ERROR
+eval UPDATE test.v_$TABLE SET TIME=NOW() WHERE id = 1;
+
+eval DROP VIEW test.v_$table;
+
+--error ER_DBACCESS_DENIED_ERROR
+eval UPDATE $table SET $set_column $update_where;
+
+--error ER_DBACCESS_DENIED_ERROR
+eval DELETE FROM $table $delete_where;
+
+# change privileges
+
+--error ER_DBACCESS_DENIED_ERROR
+eval REVOKE ALL ON $table FROM current_user;
+
+--error ER_DBACCESS_DENIED_ERROR
+eval GRANT INSERT,UPDATE ON $table TO current_user;
+
+SHOW GRANTS;
+
+#----------------------------------------------------------------------
+# table access
+
+--error ER_DBACCESS_DENIED_ERROR
+eval CREATE INDEX i_$table ON $table ($index_col);
+
+--error ER_DBACCESS_DENIED_ERROR
+eval DROP TABLE $table;
+
+--error ER_DBACCESS_DENIED_ERROR
+eval ALTER TABLE $table DROP COLUMN $drop_column;
+
+--error ER_DBACCESS_DENIED_ERROR
+eval ALTER TABLE $table ADD COLUMN (my_column INT);
+
+--error ER_UNKNOWN_TABLE
+eval RENAME TABLE $table TO new_$table;
+
+--error ER_DBACCESS_DENIED_ERROR
+eval RENAME TABLE $table TO files;
+
+--error ER_UNKNOWN_TABLE
+eval CREATE TABLE new_$table AS SELECT * FROM $table;
+
+#----------------------------------------------------------------------
+# database access
+
+--error ER_DBACCESS_DENIED_ERROR
+DROP DATABASE information_schema;
+
+--error ER_DBACCESS_DENIED_ERROR
+RENAME DATABASE information_schema TO info_schema;

mysql-test/suite/funcs_1/datadict/processlist_priv.inc

@@ -0,0 +1,432 @@
+############ suite/funcs_1/datadict/processlist_priv.inc ###############
+#                                                                      #
+# Testing of privileges around                                         #
+#     SELECT ... PROCESSLIST/SHOW PROCESSLIST                          #
+#                                                                      #
+# Note(mleich):                                                        #
+#     There is a significant risk to get an unstable test because of   #
+#     timing issues.                                                   #
+#     Example1:                                                        #
+#     1. Disconnect connection X                                       #
+#     2. Switch to connection  Y                                       #
+#     3. SHOW PROCESSLIST might present a record like                  #
+#           <ID> <user> <host> <db> Quit 0 cleaning up NULL            #
+#        or even a row where connection X is without                   #
+#        "Quit" or "cleaning up".                                      #
+#        That means our SHOW PROCESSLIST can come too early.           #
+#     Solution:                                                        #
+#        Close the connections at the end of the test.                 #
+#     Example2:                                                        #
+#     1. connection X: SHOW PROCESSLIST/GRANT ... etc.                 #
+#     2. Switch to connection  Y                                       #
+#     3. SHOW PROCESSLIST might present a record like                  #
+#        <ID> <user> <host> <db> Query TIME cleaning up <command>      #
+#        <ID> <user> <host> <db> Query TIME writing to net <command>   #
+#        Problems happens more often in case of slow filesystem!       #
+#     First Solution:                                                  #
+#        Insert a dummy SQL command where the cleanup is most probably #
+#        fast before switching to another connection and running       #
+#        SHOW/SELECT PROCESSLIST.                                      #
+#        Suppress writing to protocol by assignment to $variable.      #
+#        let $my_var= `SELECT 1`;                                      #
+#        Even the 'SELECT 1' was in some cases in state                #
+#        "writing to net".                                             #
+#     Final Solution:                                                  #
+#        --real_sleep 0.3                                              #
+#        This value was at least on my box sufficient.                 #
+#        Please inform us if this test fails so that we can adjust     #
+#        the sleep time better or switch to poll routines.             #
+#                                                                      #
+#     Storage engine variants of this test do not make sense.          #
+#     -  I_S tables use the MEMORY storage engine whenever possible.   #
+#     -  There are some I_S table which need column data types which   #
+#        are not supported by MEMORY. Example: LONGTEXT/BLOB           #
+#        MyISAM will be used for such tables.                          #
+#        The column PROCESSLIST.INFO is of data type LONGTEXT          #
+#           ----> MyISAM                                               #
+#     -  There is no impact of the GLOBAL(server) or SESSION default   #
+#        storage engine setting on the engine used for I_S tables.     #
+#        That means we cannot get NDB or InnoDB instead.               #
+#                                                                      #
+# Creation:                                                            #
+# 2007-08    hhunger Implement this test as part of                    #
+#                    WL#3982 Test information_schema.processlist       #
+#                                                                      #
+# Last update:                                                         #
+# 2007-08-14 mleich  Corrections                                       #
+#                                                                      #
+########################################################################
+
+# The following variables are used in "datadict_priv.inc" and here.
+#
+# information_schema table to be tested
+let $table= processlist;
+#
+# columns of the information_schema table e.g. to use in a select.
+let $columns= ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO;
+#
+# Where clause for an update.
+let $update_where= WHERE id=1 ;
+#
+# Column to be used in the SET of an update.
+let $set_column= user='any_user' ;
+#
+# Where clause of a delete.
+let $delete_where= WHERE id=1 ;
+#
+# Column to be dropped.
+let $drop_column= user;
+#
+# Column to be indexed
+let $index_col= user;
+
+USE information_schema;
+
+--echo ####################################################################################
+--echo 1 Prepare test.
+--echo   connection default (user=root)
+--echo ####################################################################################
+
+--echo ####################################################################################
+--echo 1.1 Create two user
+--echo ####################################################################################
+# access to info tables as normal user
+--disable_abort_on_error
+DROP USER ddicttestuser1@'localhost';
+DROP USER ddicttestuser2@'localhost';
+--enable_abort_on_error
+CREATE USER ddicttestuser1@'localhost';
+CREATE USER ddicttestuser2@'localhost';
+SET PASSWORD FOR ddicttestuser1@'localhost' = PASSWORD('ddictpass');
+SET PASSWORD FOR ddicttestuser2@'localhost' = PASSWORD('ddictpass');
+
+--echo ####################################################################################
+--echo 1.2 Establish connection con100 (user=ddicttestuser1 with no PROCESS privilege):
+connect (con100,localhost,ddicttestuser1,ddictpass,information_schema);
+--echo ####################################################################################
+
+
+--echo ####################################################################################
+--echo 2 connection default(user=root with default privileges):
+--echo   SHOW/SELECT shows all processes/threads.
+--echo ####################################################################################
+connection default;
+eval SHOW CREATE TABLE $table;
+--replace_column 6 TIME
+eval SHOW $table;
+--replace_column 6 TIME
+eval SELECT * FROM $table $select_where ORDER BY id;
+--replace_column 6 TIME
+eval SELECT $columns FROM $table $select_where ORDER BY id;
+--source suite/funcs_1/datadict/datadict_priv.inc
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo 3 Switch to connection con100 (user=ddicttestuser1 with no PROCESS privilege):
+connection con100;
+--echo   SHOW/SELECT shows only the processes (1) of the user.
+--echo ####################################################################################
+eval SHOW CREATE TABLE $table;
+--replace_column 6 TIME
+eval SHOW $table;
+--replace_column 6 TIME
+eval SELECT * FROM $table $select_where ORDER BY id;
+--replace_column 6 TIME
+eval SELECT $columns FROM $table $select_where ORDER BY id;
+--source suite/funcs_1/datadict/datadict_priv.inc
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo 4 Grant PROCESS privilege to ddicttestuser1
+--echo   connection default (user=root)
+--echo ####################################################################################
+connection default;
+GRANT PROCESS ON *.* TO ddicttestuser1@'localhost' IDENTIFIED BY 'ddictpass';
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 4.1 Existing connection con100 (ddicttestuser1)
+--echo     The user ddicttestuser1 has the PROCESS privilege, but the connection was
+--echo     established before PROCESS was granted.
+--echo     SHOW/SELECT shows only the processes (1) of the user.
+--echo ####################################################################################
+connection con100;
+SHOW GRANTS;
+--replace_column 6 TIME
+SHOW processlist;
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
+--echo     SHOW/SELECT shows all processes/threads.
+--echo ####################################################################################
+connect (con101,localhost,ddicttestuser1,ddictpass,information_schema);
+SHOW GRANTS;
+--replace_column 6 TIME
+SHOW processlist;
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo 5 Grant PROCESS privilege to anonymous user.
+--echo   connection default (user=root)
+--echo ####################################################################################
+connection default;
+GRANT PROCESS ON *.* TO ''@'localhost';
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 5.1 Establish connection (anonymous1,localhost,'',,information_schema)
+--echo     anonymous user with PROCESS privilege
+--echo     SHOW/SELECT shows all processes/threads.
+--echo ####################################################################################
+connect (anonymous1,localhost,'',,information_schema);
+SHOW GRANTS;
+--replace_column 6 TIME
+SHOW processlist;
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo 6 Revoke PROCESS privilege from ddicttestuser1
+--echo   connection default (user=root)
+--echo ####################################################################################
+connection default;
+REVOKE PROCESS ON *.* FROM ddicttestuser1@'localhost' IDENTIFIED BY 'ddictpass';
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 6.1 New connection con102 (ddicttestuser1 has no more PROCESS privilege)
+connect (con102,localhost,ddicttestuser1,ddictpass,information_schema);
+--echo     Again (compared to state before GRANT PROCESS) only the processes of
+--echo     ddicttestuser1 are visible.
+--echo ####################################################################################
+SHOW GRANTS;
+--replace_column 6 TIME
+SHOW processlist;
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo 7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
+--echo   connection default (user=root)
+--echo ####################################################################################
+connection default;
+REVOKE PROCESS ON *.* FROM ''@'localhost';
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 7.1 New connection (anonymous2,localhost,'',,information_schema)
+connect (anonymous2,localhost,'',,information_schema);
+--echo     The anonymous user has no more the PROCESS privilege
+--echo     Again only the processes of the anonymous user are visible.
+--echo ####################################################################################
+SHOW GRANTS FOR ''@'localhost';
+if ($fixed_bug_30395)
+{
+# Bug#30395 strange results after REVOKE PROCESS ON *.* FROM ...
+--replace_column 6 TIME
+SHOW processlist;
+}
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
+--echo   connection default (user=root)
+--echo ####################################################################################
+connection default;
+GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost';
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 8.1 New connection con103 (ddicttestuser1 with SUPER privilege)
+connect (con103,localhost,ddicttestuser1,ddictpass,information_schema);
+--echo     Only the processes of ddicttestuser1 user are visible.
+--echo ####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+--replace_column 6 TIME
+SHOW processlist;
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo 9 Revoke SUPER privilege from user ddicttestuser1
+--echo   connection default (user=root)
+--echo ####################################################################################
+connection default;
+REVOKE SUPER ON *.* FROM 'ddicttestuser1'@'localhost';
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 9.1 New connection con104 (ddicttestuser1 without SUPER privilege)
+connect (con104,localhost,ddicttestuser1,ddictpass,information_schema);
+--echo     ddicttestuser1 has no more the SUPER privilege.
+--echo     Only the processes of ddicttestuser1 are visible.
+--echo ####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+--replace_column 6 TIME
+SHOW processlist;
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo 10 Grant SUPER privilege with grant option to user ddicttestuser1.
+--echo   connection default (user=root)
+--echo ####################################################################################
+connection default;
+GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' WITH GRANT OPTION;
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 10.1 New connection con105 (ddicttestuser1 with SUPER privilege and GRANT OPTION)
+connect (con105,localhost,ddicttestuser1,ddictpass,information_schema);
+--echo      Try to grant PROCESS privilege to user ddicttestuser2 without having it.
+--echo ####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+--error ER_ACCESS_DENIED_ERROR
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
+
+--echo ####################################################################################
+--echo 10.2 Grant SUPER and PROCESS privilege with grant option to user ddicttestuser1
+--echo   connection default (user=root)
+--echo ####################################################################################
+connection default;
+GRANT SUPER,PROCESS ON *.* TO 'ddicttestuser1'@'localhost' WITH GRANT OPTION;
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 10.3 New connection con106 (ddicttestuser1 with SUPER,PROCESS WITH GRANT OPTION)
+connect (con106,localhost,ddicttestuser1,ddictpass,information_schema);
+--echo      Grant PROCESS privilege to user ddicttestuser2
+--echo ####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 10.4 New connection con200 (ddicttestuser2 with PROCESS privilege)
+connect (con200,localhost,ddicttestuser2,ddictpass,information_schema);
+--echo      ddicttestuser2 has now the PROCESS privilege and sees all connections
+--echo ####################################################################################
+SHOW GRANTS FOR 'ddicttestuser2'@'localhost';
+--replace_column 6 TIME
+SHOW processlist;
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo 11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2
+--echo    connection ddicttestuser1;
+--echo ####################################################################################
+connection con106;
+REVOKE PROCESS ON *.* FROM 'ddicttestuser2'@'localhost';
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 11.1 New connection con201 (ddicttestuser2)
+connect (con201,localhost,ddicttestuser2,ddictpass,information_schema);
+--echo      ddicttestuser2 has no more the PROCESS privilege and can only see own connects
+--echo ####################################################################################
+SHOW GRANTS;
+--replace_column 6 TIME
+SHOW processlist;
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
+--echo      connection default (user=root)
+--echo ####################################################################################
+connection default;
+REVOKE SUPER,PROCESS,GRANT OPTION ON *.* FROM 'ddicttestuser1'@'localhost';
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 11.3 New connection con107 (ddicttestuser1)
+connect (con107,localhost,ddicttestuser1,ddictpass,information_schema);
+--echo      ddicttestuser1 has no more the PROCESS privilege and can only see own connects
+--echo      He is also unable to GRANT the PROCESS privilege to ddicttestuser2
+--echo ####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+--error ER_ACCESS_DENIED_ERROR
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
+--replace_column 6 TIME
+SHOW processlist;
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo 12 Revoke the SELECT privilege from user ddicttestuser1
+--echo    connection default (user=root)
+--echo ####################################################################################
+connection default;
+REVOKE SELECT ON *.* FROM 'ddicttestuser1'@'localhost';
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 12.1 New connection con108 (ddicttestuser1)
+connect (con108,localhost,ddicttestuser1,ddictpass,information_schema);
+--echo      ddicttestuser1 has neither PROCESS nor SELECT privilege
+--echo      Manual says: Each MySQL user has the right to access these tables, but can see
+--echo                   only the rows ...
+--echo      Therefore the missing SELECT privilege does not affect SELECTs on PROCESSLIST.
+--echo ####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+--replace_column 6 TIME
+SHOW processlist;
+--replace_column 6 TIME
+SELECT * FROM information_schema.processlist;
+--real_sleep 0.3
+
+--echo ####################################################################################
+--echo 12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
+--echo      connection default (user=root)
+--echo ####################################################################################
+connection default;
+--error ER_DBACCESS_DENIED_ERROR
+REVOKE SELECT ON information_schema.* FROM 'ddicttestuser3'@'localhost';
+--real_sleep 0.3
+
+
+--echo ####################################################################################
+--echo    connection default (user=root)
+--echo    Cleanup: close connections, DROP USER etc.
+--echo ####################################################################################
+connection default;
+disconnect con100;
+disconnect con101;
+disconnect con102;
+disconnect con103;
+disconnect con104;
+disconnect con105;
+disconnect con106;
+disconnect con107;
+disconnect con108;
+disconnect con200;
+disconnect con201;
+disconnect anonymous1;
+disconnect anonymous2;
+DROP USER ddicttestuser1@'localhost';
+DROP USER ddicttestuser2@'localhost';

mysql-test/suite/funcs_1/include/ndb_tb2.inc

@@ -55,7 +55,7 @@ f106 year(3) not null default 2000,
 f107 year(4) not null default 2000, 
 f108 enum("1enum","2enum") not null default "1enum", 
 f109 set("1set","2set") not null default "1set"
-) engine = innodb;
+) engine = ndb;
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb2.txt' into table tb2 ;

mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result

@@ -0,0 +1,469 @@
+USE information_schema;
+####################################################################################
+1 Prepare test.
+connection default (user=root)
+####################################################################################
+####################################################################################
+1.1 Create two user
+####################################################################################
+DROP USER ddicttestuser1@'localhost';
+ERROR HY000: Operation DROP USER failed for 'ddicttestuser1'@'localhost'
+DROP USER ddicttestuser2@'localhost';
+ERROR HY000: Operation DROP USER failed for 'ddicttestuser2'@'localhost'
+CREATE USER ddicttestuser1@'localhost';
+CREATE USER ddicttestuser2@'localhost';
+SET PASSWORD FOR ddicttestuser1@'localhost' = PASSWORD('ddictpass');
+SET PASSWORD FOR ddicttestuser2@'localhost' = PASSWORD('ddictpass');
+####################################################################################
+1.2 Establish connection con100 (user=ddicttestuser1 with no PROCESS privilege):
+####################################################################################
+####################################################################################
+2 connection default(user=root with default privileges):
+SHOW/SELECT shows all processes/threads.
+####################################################################################
+SHOW CREATE TABLE processlist;
+Table	Create Table
+PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
+  `ID` bigint(4) NOT NULL DEFAULT '0',
+  `USER` varchar(16) NOT NULL DEFAULT '',
+  `HOST` varchar(64) NOT NULL DEFAULT '',
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) NOT NULL DEFAULT '',
+  `TIME` bigint(7) NOT NULL DEFAULT '0',
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+1	root	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+SELECT * FROM processlist  ORDER BY id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+1	root	localhost	information_schema	Query	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+1	root	localhost	information_schema	Query	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
+UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
+INSERT INTO processlist SELECT * FROM test.t_processlist;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DROP TABLE test.t_processlist;
+CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO) AS SELECT * FROM processlist WITH CHECK OPTION;
+ERROR HY000: CHECK OPTION on non-updatable view 'test.v_processlist'
+CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO) AS SELECT * FROM processlist;
+UPDATE test.v_processlist SET TIME=NOW() WHERE id = 1;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DROP VIEW test.v_processlist;
+UPDATE processlist SET user='any_user'  WHERE id=1 ;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DELETE FROM processlist WHERE id=1 ;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+REVOKE ALL ON processlist FROM current_user;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+GRANT INSERT,UPDATE ON processlist TO current_user;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+SHOW GRANTS;
+Grants for root@localhost
+GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
+CREATE INDEX i_processlist ON processlist (user);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DROP TABLE processlist;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE processlist DROP COLUMN user;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE processlist ADD COLUMN (my_column INT);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+RENAME TABLE processlist TO new_processlist;
+ERROR 42S02: Unknown table 'new_processlist' in information_schema
+RENAME TABLE processlist TO files;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+CREATE TABLE new_processlist AS SELECT * FROM processlist;
+ERROR 42S02: Unknown table 'new_processlist' in information_schema
+DROP DATABASE information_schema;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+RENAME DATABASE information_schema TO info_schema;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+####################################################################################
+3 Switch to connection con100 (user=ddicttestuser1 with no PROCESS privilege):
+SHOW/SELECT shows only the processes (1) of the user.
+####################################################################################
+SHOW CREATE TABLE processlist;
+Table	Create Table
+PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
+  `ID` bigint(4) NOT NULL DEFAULT '0',
+  `USER` varchar(16) NOT NULL DEFAULT '',
+  `HOST` varchar(64) NOT NULL DEFAULT '',
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) NOT NULL DEFAULT '',
+  `TIME` bigint(7) NOT NULL DEFAULT '0',
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+2	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM processlist  ORDER BY id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
+UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
+INSERT INTO processlist SELECT * FROM test.t_processlist;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+DROP TABLE test.t_processlist;
+CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO) AS SELECT * FROM processlist WITH CHECK OPTION;
+ERROR HY000: CHECK OPTION on non-updatable view 'test.v_processlist'
+CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO) AS SELECT * FROM processlist;
+UPDATE test.v_processlist SET TIME=NOW() WHERE id = 1;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+DROP VIEW test.v_processlist;
+UPDATE processlist SET user='any_user'  WHERE id=1 ;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+DELETE FROM processlist WHERE id=1 ;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+REVOKE ALL ON processlist FROM current_user;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+GRANT INSERT,UPDATE ON processlist TO current_user;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+SHOW GRANTS;
+Grants for ddicttestuser1@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+CREATE INDEX i_processlist ON processlist (user);
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+DROP TABLE processlist;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+ALTER TABLE processlist DROP COLUMN user;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+ALTER TABLE processlist ADD COLUMN (my_column INT);
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+RENAME TABLE processlist TO new_processlist;
+ERROR 42S02: Unknown table 'new_processlist' in information_schema
+RENAME TABLE processlist TO files;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+CREATE TABLE new_processlist AS SELECT * FROM processlist;
+ERROR 42S02: Unknown table 'new_processlist' in information_schema
+DROP DATABASE information_schema;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+RENAME DATABASE information_schema TO info_schema;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+####################################################################################
+4 Grant PROCESS privilege to ddicttestuser1
+connection default (user=root)
+####################################################################################
+GRANT PROCESS ON *.* TO ddicttestuser1@'localhost' IDENTIFIED BY 'ddictpass';
+####################################################################################
+4.1 Existing connection con100 (ddicttestuser1)
+The user ddicttestuser1 has the PROCESS privilege, but the connection was
+established before PROCESS was granted.
+SHOW/SELECT shows only the processes (1) of the user.
+####################################################################################
+SHOW GRANTS;
+Grants for ddicttestuser1@localhost
+GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+2	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+####################################################################################
+4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
+SHOW/SELECT shows all processes/threads.
+####################################################################################
+SHOW GRANTS;
+Grants for ddicttestuser1@localhost
+GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+1	root	localhost	information_schema	Sleep	TIME		NULL
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+3	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+1	root	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+5 Grant PROCESS privilege to anonymous user.
+connection default (user=root)
+####################################################################################
+GRANT PROCESS ON *.* TO ''@'localhost';
+####################################################################################
+5.1 Establish connection (anonymous1,localhost,'',,information_schema)
+anonymous user with PROCESS privilege
+SHOW/SELECT shows all processes/threads.
+####################################################################################
+SHOW GRANTS;
+Grants for @localhost
+GRANT PROCESS ON *.* TO ''@'localhost'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+1	root	localhost	information_schema	Sleep	TIME		NULL
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+4		localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+4		localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+1	root	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+6 Revoke PROCESS privilege from ddicttestuser1
+connection default (user=root)
+####################################################################################
+REVOKE PROCESS ON *.* FROM ddicttestuser1@'localhost' IDENTIFIED BY 'ddictpass';
+####################################################################################
+6.1 New connection con102 (ddicttestuser1 has no more PROCESS privilege)
+Again (compared to state before GRANT PROCESS) only the processes of
+ddicttestuser1 are visible.
+####################################################################################
+SHOW GRANTS;
+Grants for ddicttestuser1@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+5	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
+connection default (user=root)
+####################################################################################
+REVOKE PROCESS ON *.* FROM ''@'localhost';
+####################################################################################
+7.1 New connection (anonymous2,localhost,'',,information_schema)
+The anonymous user has no more the PROCESS privilege
+Again only the processes of the anonymous user are visible.
+####################################################################################
+SHOW GRANTS FOR ''@'localhost';
+Grants for @localhost
+GRANT USAGE ON *.* TO ''@'localhost'
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+6		localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+4		localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
+connection default (user=root)
+####################################################################################
+GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost';
+####################################################################################
+8.1 New connection con103 (ddicttestuser1 with SUPER privilege)
+Only the processes of ddicttestuser1 user are visible.
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+7	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+9 Revoke SUPER privilege from user ddicttestuser1
+connection default (user=root)
+####################################################################################
+REVOKE SUPER ON *.* FROM 'ddicttestuser1'@'localhost';
+####################################################################################
+9.1 New connection con104 (ddicttestuser1 without SUPER privilege)
+ddicttestuser1 has no more the SUPER privilege.
+Only the processes of ddicttestuser1 are visible.
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+8	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+8	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+10 Grant SUPER privilege with grant option to user ddicttestuser1.
+connection default (user=root)
+####################################################################################
+GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' WITH GRANT OPTION;
+####################################################################################
+10.1 New connection con105 (ddicttestuser1 with SUPER privilege and GRANT OPTION)
+Try to grant PROCESS privilege to user ddicttestuser2 without having it.
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1' WITH GRANT OPTION
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
+ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
+####################################################################################
+10.2 Grant SUPER and PROCESS privilege with grant option to user ddicttestuser1
+connection default (user=root)
+####################################################################################
+GRANT SUPER,PROCESS ON *.* TO 'ddicttestuser1'@'localhost' WITH GRANT OPTION;
+####################################################################################
+10.3 New connection con106 (ddicttestuser1 with SUPER,PROCESS WITH GRANT OPTION)
+Grant PROCESS privilege to user ddicttestuser2
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT PROCESS, SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1' WITH GRANT OPTION
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
+####################################################################################
+10.4 New connection con200 (ddicttestuser2 with PROCESS privilege)
+ddicttestuser2 has now the PROCESS privilege and sees all connections
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser2'@'localhost';
+Grants for ddicttestuser2@localhost
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+1	root	localhost	information_schema	Sleep	TIME		NULL
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+4		localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+6		localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+11	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+11	ddicttestuser2	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+6		localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+4		localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+1	root	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2
+connection ddicttestuser1;
+####################################################################################
+REVOKE PROCESS ON *.* FROM 'ddicttestuser2'@'localhost';
+####################################################################################
+11.1 New connection con201 (ddicttestuser2)
+ddicttestuser2 has no more the PROCESS privilege and can only see own connects
+####################################################################################
+SHOW GRANTS;
+Grants for ddicttestuser2@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+11	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
+12	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+12	ddicttestuser2	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+11	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
+connection default (user=root)
+####################################################################################
+REVOKE SUPER,PROCESS,GRANT OPTION ON *.* FROM 'ddicttestuser1'@'localhost';
+####################################################################################
+11.3 New connection con107 (ddicttestuser1)
+ddicttestuser1 has no more the PROCESS privilege and can only see own connects
+He is also unable to GRANT the PROCESS privilege to ddicttestuser2
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
+ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+13	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+13	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+12 Revoke the SELECT privilege from user ddicttestuser1
+connection default (user=root)
+####################################################################################
+REVOKE SELECT ON *.* FROM 'ddicttestuser1'@'localhost';
+####################################################################################
+12.1 New connection con108 (ddicttestuser1)
+ddicttestuser1 has neither PROCESS nor SELECT privilege
+Manual says: Each MySQL user has the right to access these tables, but can see
+only the rows ...
+Therefore the missing SELECT privilege does not affect SELECTs on PROCESSLIST.
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+13	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+14	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+14	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+13	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
+connection default (user=root)
+####################################################################################
+REVOKE SELECT ON information_schema.* FROM 'ddicttestuser3'@'localhost';
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+####################################################################################
+connection default (user=root)
+Cleanup: close connections, DROP USER etc.
+####################################################################################
+DROP USER ddicttestuser1@'localhost';
+DROP USER ddicttestuser2@'localhost';

mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result

@@ -0,0 +1,469 @@
+USE information_schema;
+####################################################################################
+1 Prepare test.
+connection default (user=root)
+####################################################################################
+####################################################################################
+1.1 Create two user
+####################################################################################
+DROP USER ddicttestuser1@'localhost';
+ERROR HY000: Operation DROP USER failed for 'ddicttestuser1'@'localhost'
+DROP USER ddicttestuser2@'localhost';
+ERROR HY000: Operation DROP USER failed for 'ddicttestuser2'@'localhost'
+CREATE USER ddicttestuser1@'localhost';
+CREATE USER ddicttestuser2@'localhost';
+SET PASSWORD FOR ddicttestuser1@'localhost' = PASSWORD('ddictpass');
+SET PASSWORD FOR ddicttestuser2@'localhost' = PASSWORD('ddictpass');
+####################################################################################
+1.2 Establish connection con100 (user=ddicttestuser1 with no PROCESS privilege):
+####################################################################################
+####################################################################################
+2 connection default(user=root with default privileges):
+SHOW/SELECT shows all processes/threads.
+####################################################################################
+SHOW CREATE TABLE processlist;
+Table	Create Table
+PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
+  `ID` bigint(4) NOT NULL DEFAULT '0',
+  `USER` varchar(16) NOT NULL DEFAULT '',
+  `HOST` varchar(64) NOT NULL DEFAULT '',
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) NOT NULL DEFAULT '',
+  `TIME` bigint(7) NOT NULL DEFAULT '0',
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+3	root	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+SELECT * FROM processlist  ORDER BY id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+3	root	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+3	root	localhost	information_schema	Execute	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
+UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
+INSERT INTO processlist SELECT * FROM test.t_processlist;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DROP TABLE test.t_processlist;
+CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO) AS SELECT * FROM processlist WITH CHECK OPTION;
+ERROR HY000: CHECK OPTION on non-updatable view 'test.v_processlist'
+CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO) AS SELECT * FROM processlist;
+UPDATE test.v_processlist SET TIME=NOW() WHERE id = 1;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DROP VIEW test.v_processlist;
+UPDATE processlist SET user='any_user'  WHERE id=1 ;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DELETE FROM processlist WHERE id=1 ;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+REVOKE ALL ON processlist FROM current_user;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+GRANT INSERT,UPDATE ON processlist TO current_user;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+SHOW GRANTS;
+Grants for root@localhost
+GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
+CREATE INDEX i_processlist ON processlist (user);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DROP TABLE processlist;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE processlist DROP COLUMN user;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE processlist ADD COLUMN (my_column INT);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+RENAME TABLE processlist TO new_processlist;
+ERROR 42S02: Unknown table 'new_processlist' in information_schema
+RENAME TABLE processlist TO files;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+CREATE TABLE new_processlist AS SELECT * FROM processlist;
+ERROR 42S02: Unknown table 'new_processlist' in information_schema
+DROP DATABASE information_schema;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+RENAME DATABASE information_schema TO info_schema;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+####################################################################################
+3 Switch to connection con100 (user=ddicttestuser1 with no PROCESS privilege):
+SHOW/SELECT shows only the processes (1) of the user.
+####################################################################################
+SHOW CREATE TABLE processlist;
+Table	Create Table
+PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
+  `ID` bigint(4) NOT NULL DEFAULT '0',
+  `USER` varchar(16) NOT NULL DEFAULT '',
+  `HOST` varchar(64) NOT NULL DEFAULT '',
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) NOT NULL DEFAULT '',
+  `TIME` bigint(7) NOT NULL DEFAULT '0',
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+4	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM processlist  ORDER BY id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+4	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+4	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
+UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
+INSERT INTO processlist SELECT * FROM test.t_processlist;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+DROP TABLE test.t_processlist;
+CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO) AS SELECT * FROM processlist WITH CHECK OPTION;
+ERROR HY000: CHECK OPTION on non-updatable view 'test.v_processlist'
+CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO) AS SELECT * FROM processlist;
+UPDATE test.v_processlist SET TIME=NOW() WHERE id = 1;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+DROP VIEW test.v_processlist;
+UPDATE processlist SET user='any_user'  WHERE id=1 ;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+DELETE FROM processlist WHERE id=1 ;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+REVOKE ALL ON processlist FROM current_user;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+GRANT INSERT,UPDATE ON processlist TO current_user;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+SHOW GRANTS;
+Grants for ddicttestuser1@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+CREATE INDEX i_processlist ON processlist (user);
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+DROP TABLE processlist;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+ALTER TABLE processlist DROP COLUMN user;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+ALTER TABLE processlist ADD COLUMN (my_column INT);
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+RENAME TABLE processlist TO new_processlist;
+ERROR 42S02: Unknown table 'new_processlist' in information_schema
+RENAME TABLE processlist TO files;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+CREATE TABLE new_processlist AS SELECT * FROM processlist;
+ERROR 42S02: Unknown table 'new_processlist' in information_schema
+DROP DATABASE information_schema;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+RENAME DATABASE information_schema TO info_schema;
+ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
+####################################################################################
+4 Grant PROCESS privilege to ddicttestuser1
+connection default (user=root)
+####################################################################################
+GRANT PROCESS ON *.* TO ddicttestuser1@'localhost' IDENTIFIED BY 'ddictpass';
+####################################################################################
+4.1 Existing connection con100 (ddicttestuser1)
+The user ddicttestuser1 has the PROCESS privilege, but the connection was
+established before PROCESS was granted.
+SHOW/SELECT shows only the processes (1) of the user.
+####################################################################################
+SHOW GRANTS;
+Grants for ddicttestuser1@localhost
+GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+4	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+4	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+####################################################################################
+4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
+SHOW/SELECT shows all processes/threads.
+####################################################################################
+SHOW GRANTS;
+Grants for ddicttestuser1@localhost
+GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+3	root	localhost	information_schema	Sleep	TIME		NULL
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+5	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	root	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+5 Grant PROCESS privilege to anonymous user.
+connection default (user=root)
+####################################################################################
+GRANT PROCESS ON *.* TO ''@'localhost';
+####################################################################################
+5.1 Establish connection (anonymous1,localhost,'',,information_schema)
+anonymous user with PROCESS privilege
+SHOW/SELECT shows all processes/threads.
+####################################################################################
+SHOW GRANTS;
+Grants for @localhost
+GRANT PROCESS ON *.* TO ''@'localhost'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+3	root	localhost	information_schema	Sleep	TIME		NULL
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+6		localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+6		localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	root	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+6 Revoke PROCESS privilege from ddicttestuser1
+connection default (user=root)
+####################################################################################
+REVOKE PROCESS ON *.* FROM ddicttestuser1@'localhost' IDENTIFIED BY 'ddictpass';
+####################################################################################
+6.1 New connection con102 (ddicttestuser1 has no more PROCESS privilege)
+Again (compared to state before GRANT PROCESS) only the processes of
+ddicttestuser1 are visible.
+####################################################################################
+SHOW GRANTS;
+Grants for ddicttestuser1@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+7	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
+connection default (user=root)
+####################################################################################
+REVOKE PROCESS ON *.* FROM ''@'localhost';
+####################################################################################
+7.1 New connection (anonymous2,localhost,'',,information_schema)
+The anonymous user has no more the PROCESS privilege
+Again only the processes of the anonymous user are visible.
+####################################################################################
+SHOW GRANTS FOR ''@'localhost';
+Grants for @localhost
+GRANT USAGE ON *.* TO ''@'localhost'
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+8		localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+6		localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
+connection default (user=root)
+####################################################################################
+GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost';
+####################################################################################
+8.1 New connection con103 (ddicttestuser1 with SUPER privilege)
+Only the processes of ddicttestuser1 user are visible.
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+9	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+9 Revoke SUPER privilege from user ddicttestuser1
+connection default (user=root)
+####################################################################################
+REVOKE SUPER ON *.* FROM 'ddicttestuser1'@'localhost';
+####################################################################################
+9.1 New connection con104 (ddicttestuser1 without SUPER privilege)
+ddicttestuser1 has no more the SUPER privilege.
+Only the processes of ddicttestuser1 are visible.
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+10	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+10 Grant SUPER privilege with grant option to user ddicttestuser1.
+connection default (user=root)
+####################################################################################
+GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' WITH GRANT OPTION;
+####################################################################################
+10.1 New connection con105 (ddicttestuser1 with SUPER privilege and GRANT OPTION)
+Try to grant PROCESS privilege to user ddicttestuser2 without having it.
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1' WITH GRANT OPTION
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
+ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
+####################################################################################
+10.2 Grant SUPER and PROCESS privilege with grant option to user ddicttestuser1
+connection default (user=root)
+####################################################################################
+GRANT SUPER,PROCESS ON *.* TO 'ddicttestuser1'@'localhost' WITH GRANT OPTION;
+####################################################################################
+10.3 New connection con106 (ddicttestuser1 with SUPER,PROCESS WITH GRANT OPTION)
+Grant PROCESS privilege to user ddicttestuser2
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT PROCESS, SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1' WITH GRANT OPTION
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
+####################################################################################
+10.4 New connection con200 (ddicttestuser2 with PROCESS privilege)
+ddicttestuser2 has now the PROCESS privilege and sees all connections
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser2'@'localhost';
+Grants for ddicttestuser2@localhost
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+3	root	localhost	information_schema	Sleep	TIME		NULL
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+6		localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+8		localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+13	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+13	ddicttestuser2	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+8		localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+6		localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+3	root	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2
+connection ddicttestuser1;
+####################################################################################
+REVOKE PROCESS ON *.* FROM 'ddicttestuser2'@'localhost';
+####################################################################################
+11.1 New connection con201 (ddicttestuser2)
+ddicttestuser2 has no more the PROCESS privilege and can only see own connects
+####################################################################################
+SHOW GRANTS;
+Grants for ddicttestuser2@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+13	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
+14	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+14	ddicttestuser2	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+13	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
+connection default (user=root)
+####################################################################################
+REVOKE SUPER,PROCESS,GRANT OPTION ON *.* FROM 'ddicttestuser1'@'localhost';
+####################################################################################
+11.3 New connection con107 (ddicttestuser1)
+ddicttestuser1 has no more the PROCESS privilege and can only see own connects
+He is also unable to GRANT the PROCESS privilege to ddicttestuser2
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
+ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+15	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+15	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+12 Revoke the SELECT privilege from user ddicttestuser1
+connection default (user=root)
+####################################################################################
+REVOKE SELECT ON *.* FROM 'ddicttestuser1'@'localhost';
+####################################################################################
+12.1 New connection con108 (ddicttestuser1)
+ddicttestuser1 has neither PROCESS nor SELECT privilege
+Manual says: Each MySQL user has the right to access these tables, but can see
+only the rows ...
+Therefore the missing SELECT privilege does not affect SELECTs on PROCESSLIST.
+####################################################################################
+SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
+Grants for ddicttestuser1@localhost
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+SHOW processlist;
+Id	User	Host	db	Command	Time	State	Info
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+15	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+16	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+16	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+15	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+####################################################################################
+12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
+connection default (user=root)
+####################################################################################
+REVOKE SELECT ON information_schema.* FROM 'ddicttestuser3'@'localhost';
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+####################################################################################
+connection default (user=root)
+Cleanup: close connections, DROP USER etc.
+####################################################################################
+DROP USER ddicttestuser1@'localhost';
+DROP USER ddicttestuser2@'localhost';

mysql-test/suite/funcs_1/r/ndb_cursors.result

@@ -75,7 +75,7 @@ Note	1265	Data truncated for column 'f45' at row 1
 Note	1265	Data truncated for column 'f47' at row 1
 Note	1265	Data truncated for column 'f49' at row 1
 Note	1265	Data truncated for column 'f51' at row 1
-Error	1466	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb1.txt' into table tb1 ;
 
 NOT YET IMPLEMENTED: cursor tests

mysql-test/suite/funcs_1/r/ndb_storedproc_07.result

@@ -90,7 +90,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored');
 END if;
 END//
 SHOW CREATE PROCEDURE sp1;
-Procedure	sql_mode	Create Procedure
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
 sp1	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
 BEGIN
 declare a tinyint;
@@ -104,7 +104,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value restored');
 ELSE
 INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored');
 END if;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode='';
 SHOW VARIABLES LIKE 'sql_mode';
 Variable_name	Value
@@ -143,12 +143,12 @@ SET @@sql_mode='MAXDB';
 SHOW VARIABLES LIKE 'sql_mode';
 END//
 SHOW CREATE PROCEDURE sp2;
-Procedure	sql_mode	Create Procedure
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
 sp2	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
 BEGIN
 SET @@sql_mode='MAXDB';
 SHOW VARIABLES LIKE 'sql_mode';
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 ... show value prior calling procedure
 SHOW VARIABLES LIKE 'sql_mode';
 Variable_name	Value

mysql-test/suite/funcs_1/r/ndb_storedproc_08.result

@@ -122,6 +122,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	fn_2
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -146,6 +149,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	created with INVOKER
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	sp_1
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -168,6 +174,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	sp_2
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -190,6 +199,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	created with INVOKER
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SHOW CREATE FUNCTION  fn_1;
 Function	fn_1
 sql_mode	
@@ -199,6 +211,9 @@ set @x=i1;
 set @y=@x;
 return i4;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW CREATE FUNCTION  fn_2;
 Function	fn_2
 sql_mode	
@@ -210,6 +225,9 @@ set @x=i1;
 set @y=@x;
 return i4;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW CREATE PROCEDURE sp_1;
 Procedure	sp_1
 sql_mode	
@@ -217,6 +235,9 @@ Create Procedure	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
 BEGIN
 set @x=i1;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW CREATE PROCEDURE sp_2;
 Procedure	sp_2
 sql_mode	
@@ -226,6 +247,9 @@ Create Procedure	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
 BEGIN
 set @x=i1;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW FUNCTION STATUS LIKE 'fn_%';
 Db	db_storedproc
 Name	fn_1
@@ -235,6 +259,9 @@ Modified	<modified>
 Created	<created>
 Security_type	DEFINER
 Comment	
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 Db	db_storedproc
 Name	fn_2
 Type	FUNCTION
@@ -243,6 +270,9 @@ Modified	<modified>
 Created	<created>
 Security_type	INVOKER
 Comment	created with INVOKER
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW PROCEDURE STATUS LIKE 'sp_%';
 Db	db_storedproc
 Name	sp_1
@@ -252,6 +282,9 @@ Modified	<modified>
 Created	<created>
 Security_type	DEFINER
 Comment	
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 Db	db_storedproc
 Name	sp_2
 Type	PROCEDURE
@@ -260,6 +293,9 @@ Modified	<modified>
 Created	<created>
 Security_type	INVOKER
 Comment	created with INVOKER
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 
 ... now change some stuff:
 --------------------------
@@ -304,6 +340,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	new comment, FN changed to INVOKER
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	fn_2
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -328,6 +367,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	FN changed to DEFINER
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	sp_1
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -350,6 +392,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	new comment, SP changed to INVOKER
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	sp_2
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -372,6 +417,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	SP changed to DEFINER
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SHOW CREATE FUNCTION  fn_1;
 Function	fn_1
 sql_mode	
@@ -384,6 +432,9 @@ set @x=i1;
 set @y=@x;
 return i4;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW CREATE FUNCTION  fn_2;
 Function	fn_2
 sql_mode	
@@ -395,6 +446,9 @@ set @x=i1;
 set @y=@x;
 return i4;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW CREATE PROCEDURE sp_1;
 Procedure	sp_1
 sql_mode	
@@ -404,6 +458,9 @@ Create Procedure	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
 BEGIN
 set @x=i1;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW CREATE PROCEDURE sp_2;
 Procedure	sp_2
 sql_mode	
@@ -413,6 +470,9 @@ Create Procedure	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
 BEGIN
 set @x=i1;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW FUNCTION STATUS LIKE 'fn_%';
 Db	db_storedproc
 Name	fn_1
@@ -422,6 +482,9 @@ Modified	<modified>
 Created	<created>
 Security_type	INVOKER
 Comment	new comment, FN changed to INVOKER
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 Db	db_storedproc
 Name	fn_2
 Type	FUNCTION
@@ -430,6 +493,9 @@ Modified	<modified>
 Created	<created>
 Security_type	DEFINER
 Comment	FN changed to DEFINER
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW PROCEDURE STATUS LIKE 'sp_%';
 Db	db_storedproc
 Name	sp_1
@@ -439,6 +505,9 @@ Modified	<modified>
 Created	<created>
 Security_type	INVOKER
 Comment	new comment, SP changed to INVOKER
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 Db	db_storedproc
 Name	sp_2
 Type	PROCEDURE
@@ -447,6 +516,9 @@ Modified	<modified>
 Created	<created>
 Security_type	DEFINER
 Comment	SP changed to DEFINER
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 
 ... change back to default and check result:
 --------------------------------------------
@@ -479,6 +551,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	new comment, FN changed to INVOKER
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	fn_2
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -503,6 +578,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	FN changed to DEFINER
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	sp_1
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -525,6 +603,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	new comment, SP changed to INVOKER
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	sp_2
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -547,6 +628,9 @@ LAST_ALTERED	<created>
 SQL_MODE	
 ROUTINE_COMMENT	SP changed to DEFINER
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SHOW CREATE FUNCTION  fn_1;
 Function	fn_1
 sql_mode	
@@ -559,6 +643,9 @@ set @x=i1;
 set @y=@x;
 return i4;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW CREATE FUNCTION  fn_2;
 Function	fn_2
 sql_mode	
@@ -569,6 +656,9 @@ set @x=i1;
 set @y=@x;
 return i4;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW CREATE PROCEDURE sp_1;
 Procedure	sp_1
 sql_mode	
@@ -578,6 +668,9 @@ Create Procedure	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
 BEGIN
 set @x=i1;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW CREATE PROCEDURE sp_2;
 Procedure	sp_2
 sql_mode	
@@ -587,6 +680,9 @@ Create Procedure	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
 BEGIN
 set @x=i1;
 END
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW FUNCTION STATUS LIKE 'fn_%';
 Db	db_storedproc
 Name	fn_1
@@ -596,6 +692,9 @@ Modified	<modified>
 Created	<created>
 Security_type	INVOKER
 Comment	new comment, FN changed to INVOKER
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 Db	db_storedproc
 Name	fn_2
 Type	FUNCTION
@@ -604,6 +703,9 @@ Modified	<modified>
 Created	<created>
 Security_type	DEFINER
 Comment	FN changed to DEFINER
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 SHOW PROCEDURE STATUS LIKE 'sp_%';
 Db	db_storedproc
 Name	sp_1
@@ -613,6 +715,9 @@ Modified	<modified>
 Created	<created>
 Security_type	INVOKER
 Comment	new comment, SP changed to INVOKER
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 Db	db_storedproc
 Name	sp_2
 Type	PROCEDURE
@@ -621,6 +726,9 @@ Modified	<modified>
 Created	<created>
 Security_type	DEFINER
 Comment	SP changed to DEFINER
+character_set_client	latin1
+collation_connection	latin1_swedish_ci
+Database Collation	latin1_swedish_ci
 
 ... cleanup
 -----------

mysql-test/suite/funcs_1/r/ndb_trig_0102.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1466	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase: 3.5.1.1:
@@ -243,7 +243,7 @@ create table t1 (f1 integer) engine = ndb;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 
 for each row set @ret_trg6_2 = 5;
-ERROR HY000: Trigger in wrong schema
+ERROR 42S02: Table 'trig_db.tb3' doesn't exist
 use trig_db;
 CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 
 for each row set @ret_trg6_3 = 18;

mysql-test/suite/funcs_1/r/ndb_trig_03.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1466	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase 3.5.3:

mysql-test/suite/funcs_1/r/ndb_trig_03e.result

@@ -263,7 +263,7 @@ select current_user;
 current_user
 root@localhost
 show triggers;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 grant  select, insert, update on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
@@ -296,7 +296,7 @@ select current_user;
 current_user
 root@localhost
 show triggers;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 show tables;
 Tables_in_priv_db
 t1
@@ -317,7 +317,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 show triggers;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-yes';
 select current_user;
@@ -453,9 +453,9 @@ ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for tabl
 create trigger trg1_4 before UPDATE  on t1 for each row
 set new.f1 = 'trig 1_4-yes';
 show triggers;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
-trg1_3	INSERT	t1	set new.f1 = 'trig 1_3-yes'	BEFORE	NULL		test_yesprivs@localhost
-trg1_4	UPDATE	t1	set new.f1 = 'trig 1_4-yes'	BEFORE	NULL		test_yesprivs@localhost
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
+trg1_3	INSERT	t1	set new.f1 = 'trig 1_3-yes'	BEFORE	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+trg1_4	UPDATE	t1	set new.f1 = 'trig 1_4-yes'	BEFORE	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 select current_user;
 current_user
 test_noprivs@localhost
@@ -570,11 +570,11 @@ current_user
 test_yesprivs@localhost
 use priv_db;
 show triggers;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
-trg1_1	INSERT	t1	set new.f1 = 'trig 1_1-yes'	BEFORE	NULL		test_yesprivs@localhost
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
+trg1_1	INSERT	t1	set new.f1 = 'trig 1_1-yes'	BEFORE	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 select * from information_schema.triggers;
-TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER
-NULL	priv_db	trg1_1	INSERT	NULL	priv_db	t1	0	NULL	set new.f1 = 'trig 1_1-yes'	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		test_yesprivs@localhost
+TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
+NULL	priv_db	trg1_1	INSERT	NULL	priv_db	t1	0	NULL	set new.f1 = 'trig 1_1-yes'	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 drop trigger trg1_1;
 ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
 select current_user;
@@ -863,7 +863,7 @@ select current_user;
 current_user
 root@localhost
 show triggers;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 grant TRIGGER on priv1_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
@@ -878,7 +878,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 show triggers;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-yes';
 create trigger trg2_1 before INSERT  on t2 for each row
@@ -990,7 +990,7 @@ select current_user;
 current_user
 root@localhost
 show triggers;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 grant  select, insert, update ,trigger
 on priv_db.t1 to test_yesprivs@localhost 
 with grant option;

mysql-test/suite/funcs_1/r/ndb_trig_0407.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1466	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase: 3.5:

mysql-test/suite/funcs_1/r/ndb_trig_08.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1466	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase: 3.5:
@@ -493,9 +493,8 @@ BEGIN
 WHILE @counter1 < new.f136 
 SET @counter1 = @counter1 + 1; 
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136 
-SET @counter1 = @counter1 + 1; 
-END' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; 
+END' at line 4
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;
 

mysql-test/suite/funcs_1/r/ndb_trig_09.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1466	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase 3.5.9.1/2:

mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1466	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase 3.5.10.1/2/3:

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

@@ -0,0 +1,36 @@
+########## suite/funcs_1/t/a_processlist_priv_no_prot.test #############
+#                                                                      #
+# Testing of privileges around                                         #
+#     SELECT ... PROCESSLIST/SHOW PROCESSLIST                          #
+#                                                                      #
+# The prepared statement variant of this test is                       #
+# suite/funcs_1/t/b_processlist_priv_ps.test.                          #
+#                                                                      #
+# There is important documentation within                              #
+#       suite/funcs_1/datadict/processlist_priv.inc                    #
+#                                                                      #
+# Note(mleich):                                                        #
+#    The name "a_process..." with the unusual prefix "a_" is           #
+#    caused by the fact that this test should run as first test, that  #
+#    means direct after server startup. Otherwise the connection IDs   #
+#    within the processlist would differ.                              #
+#                                                                      #
+# Creation:                                                            #
+# 2007-08-14 mleich  Create this test as part of                       #
+#                    WL#3982 Test information_schema.processlist       #
+#                                                                      #
+########################################################################
+
+# One subtest is skipped because of
+#    Bug#30395 strange results after REVOKE PROCESS ON *.* FROM ...
+let $fixed_bug_30395= 0;
+
+# The file with expected results fits only to a run without
+# ps-protocol/sp-protocol/cursor-protocol/view-protocol.
+if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL
+            + $VIEW_PROTOCOL > 0`)
+{
+   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
+}
+
+--source suite/funcs_1/datadict/processlist_priv.inc

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

@@ -0,0 +1,31 @@
+########### suite/funcs_1/t/a_processlist_val_no_prot.test #############
+#                                                                      #
+# Testing of values within INFORMATION_SCHEMA.PROCESSLIST              #
+#                                                                      #
+# The prepared statement variant of this test is                       #
+# suite/funcs_1/t/b_processlist_val_ps.test.                           #
+#                                                                      #
+# There is important documentation within                              #
+#       suite/funcs_1/datadict/processlist_val.inc                     #
+#                                                                      #
+# Note(mleich):                                                        #
+#    The name "a_process..." with the unusual prefix "a_" is           #
+#    caused by the fact that this test should run as second test, that #
+#    means direct after server startup and a_processlist_priv_no_prot. #
+#    Otherwise the connection IDs within the processlist would differ. #
+#                                                                      #
+# Creation:                                                            #
+# 2007-08-09 mleich Implement this test as part of                     #
+#                   WL#3982 Test information_schema.processlist        #
+#                                                                      #
+########################################################################
+
+# The file with expected results fits only to a run without
+# ps-protocol/sp-protocol/cursor-protocol/view-protocol.
+if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL
+            + $VIEW_PROTOCOL > 0`)
+{
+   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
+}
+
+--source suite/funcs_1/datadict/processlist_val.inc

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

@@ -0,0 +1,35 @@
+########### suite/funcs_1/t/b_processlist_priv_ps.test #################
+#                                                                      #
+# Testing of privileges around                                         #
+#     SELECT ... PROCESSLIST/SHOW PROCESSLIST                          #
+#                                                                      #
+# The no (ps/sp/view/cursor) protocol variant of this test is          #
+# suite/funcs_1/t/a_processlist_priv_no_prot.test.                     #
+#                                                                      #
+# There is important documentation within                              #
+#       suite/funcs_1/datadict/processlist_priv.inc                    #
+#                                                                      #
+# Note(mleich):                                                        #
+#    The name "b_process..." with the unusual prefix "b_" is           #
+#    caused by the fact that this test should run as first test, that  #
+#    means direct after server startup. Otherwise the connection IDs   #
+#    within the processlist would differ.                              #
+#                                                                      #
+# Creation:                                                            #
+# 2007-08-14 mleich  Create this test as part of                       #
+#                    WL#3982 Test information_schema.processlist       #
+#                                                                      #
+########################################################################
+
+# One subtest is skipped because of
+#    Bug#30395 strange results after REVOKE PROCESS ON *.* FROM ...
+let $fixed_bug_30395= 0;
+
+# The file with expected results fits only to a run with "--ps-protocol".
+if (`SELECT $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0
+        OR $PS_PROTOCOL = 0`)
+{
+   --skip Test requires: ps-protocol enabled, other protocols disabled
+}
+
+--source suite/funcs_1/datadict/processlist_priv.inc

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

@@ -0,0 +1,30 @@
+############## suite/funcs_1/t/b_processlist_val_ps.test ###############
+#                                                                      #
+# Testing of values within INFORMATION_SCHEMA.PROCESSLIST              #
+#                                                                      #
+# The no (ps/sp/view/cursor) protocol variant of this test is          #
+# suite/funcs_1/t/a_processlist_val_no_prot.test.                      #
+#                                                                      #
+# There is important documentation within                              #
+#       suite/funcs_1/datadict/processlist_val.inc                     #
+#                                                                      #
+# Note(mleich):                                                        #
+#    The name "b_process..." with the unusual prefix "b_" is           #
+#    caused by the fact that this test should run as second test, that #
+#    means direct after server startup and b_processlist_priv_ps.      #
+#    Otherwise the connection IDs within the processlist would differ. #
+#                                                                      #
+# Creation:                                                            #
+# 2007-08-09 mleich Implement this test as part of                     #
+#                   WL#3982 Test information_schema.processlist        #
+#                                                                      #
+########################################################################
+
+# The file with expected results fits only to a run with "--ps-protocol".
+if (`SELECT $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0
+        OR $PS_PROTOCOL = 0`)
+{
+   --skip Test requires: ps-protocol enabled, other protocols disabled
+}
+
+--source suite/funcs_1/datadict/processlist_val.inc

mysql-test/suite/funcs_1/views/views_master.inc

@@ -145,33 +145,33 @@ Insert into t1  values (500,9866);
     --enable_warnings
     CREATE VIEW v1 AS select f59,f60,f61
     FROM test.tb2 where f59=250;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f60,f61 limit 0,10;
 
 #(02)
     Drop view if exists v1 ;
     CREATE VIEW v1 AS select f59,f60,f61
     FROM test.tb2 limit 100;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59,f60,f61 limit 0,10;
 
 #(03)
     CREATE or REPLACE VIEW v1 AS select f59,f60,f61
     FROM test.tb2 limit 4,3;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59,f60,f61 limit 0,10;
 
 #(04)
     CREATE or REPLACE VIEW v1 AS select distinct f59
     FROM test.tb2 limit 4,3;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59 limit 0,10;
 
 #(05)
     ALTER VIEW v1 AS select f59
     FROM test.tb2 limit 6,2;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59 limit 0,10;
 
 #(06)
     CREATE or REPLACE VIEW v1 AS select f59
     from tb2 order by f59 limit 100;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59 limit 0,10;
 
 #(07)
     CREATE or REPLACE VIEW v1 AS select f59
@@ -186,32 +186,32 @@ Insert into t1  values (500,9866);
 #(09)
     CREATE or REPLACE VIEW v1 AS select f59
     from tb2 group by f59 limit 100;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59 limit 0,10;
 
 #(10)
     CREATE or REPLACE VIEW v1 AS select f59
     from tb2 group by f59 asc limit 100;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59 limit 0,10;
 
 #(11)
     CREATE or REPLACE VIEW v1 AS select f59
     from tb2 group by f59 desc limit 100;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59 limit 0,10;
 
 #(12)
     CREATE or REPLACE VIEW v1 AS (select f59 from tb2)
     union (select f59 from t1) limit 100;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59 limit 0,10;
 
 #(13)
     CREATE or REPLACE VIEW v1 AS (select f59 FROM tb2)
     UNION DISTINCT(select f59 FROM t1) ;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59 limit 0,10;
 
 #(14)
     CREATE or REPLACE VIEW v1 AS (select f59 FROM tb2)
     UNION ALL(select f59 FROM t1) ;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59 limit 0,10;
 
 #(15)
 if ($have_bug_11589)
@@ -220,24 +220,24 @@ if ($have_bug_11589)
 }
     CREATE or REPLACE VIEW v1 AS select *
     FROM test.tb2 WITH LOCAL CHECK OPTION ;
-    select * FROM v1 limit 0,50;
+    select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,50;
 
     #(16)
 CREATE or REPLACE VIEW v1 AS select *
     FROM test.tb2 WITH CASCADED CHECK OPTION ;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,10;
 --enable_ps_protocol
 
 #(17)
     CREATE OR REPLACE VIEW v1 AS SELECT F59, F60
     FROM test.tb2 WITH CASCADED CHECK OPTION;
-    SELECT * FROM v1 limit 0,10;
+    SELECT * FROM v1 order by f59,f60 limit 0,10;
 
 
 #(18)
     CREATE or REPLACE VIEW v1 AS select f59, f60
     from test.tb2 where f59=3330 ;
-    select * FROM v1 limit 0,10;
+    select * FROM v1 order by f60 limit 0,10;
 
     DROP VIEW  v1 ;
     DROP TABLE t1 ;
@@ -816,18 +816,18 @@ AS SELECT * FROM t1 limit 2;
 SHOW CREATE VIEW test.v1;
 SELECT * FROM test.v1;
 # Switch the base table
-CREATE OR REPLACE VIEW test.v1 AS SELECT * FROM tb2 limit 2;
+CREATE OR REPLACE VIEW test.v1 AS SELECT * FROM tb2 order by f59 limit 2;
 SHOW CREATE VIEW test.v1;
 if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM test.v1 ;
+SELECT * FROM test.v1 order by f59,f60,f61,f62,f63,f64,f65;
 --enable_ps_protocol
 # Switch the SELECT but not the base table
 CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2 limit 10,100;
 SHOW CREATE VIEW test.v1;
-SELECT * FROM test.v1;
+SELECT * FROM test.v1 order by F59;
 Drop table test.t1 ;
 Drop view  test.v1 ;
 
@@ -1020,7 +1020,7 @@ let $message= Testcase 3.3.1.21 ;
 DROP VIEW  IF EXISTS v1;
 --enable_warnings
 CREATE VIEW test.v1( F59, F60 ) AS SELECT F59, F60 From tb2 LIMIT 2;
-SELECT * FROM test.v1;
+SELECT * FROM test.v1 order by F59, F60 desc;
 Drop view if exists test.v1 ;
 
 
@@ -1175,7 +1175,7 @@ Drop VIEW  IF EXISTS test.v1_1 ;
 --enable_warnings
 Create view test.v1 AS Select * from test.tb2 limit 2 ;
 Create view test.v1_1 AS Select F59 from test.v1 ;
-Select * from test.v1_1 limit 20 ;
+Select * from test.v1_1 order by F59 limit 20 ;
 Drop view test.v1 ;
 Drop view test.v1_1 ;
 
@@ -1197,7 +1197,7 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-Select * from v1 ;
+Select * from v1 order by f59,f60,f61,f62,f63,f64,f65;
 --enable_ps_protocol
 Select * from test2.v2 ;
 Drop view if exists test2.v1 ;
@@ -1287,7 +1287,7 @@ CREATE VIEW test.v1
 AS SELECT test.v1_firstview.f59, test.v1_firstview.f60
 FROM test.v1_firstview INNER JOIN test.v1_secondview
 ON test.v1_firstview.f59 = test.v1_secondview.f59 ;
-SELECT * FROM test.v1 limit 0,10;
+SELECT * FROM test.v1 order by f59,f60 limit 0,10;
 Drop view if exists test.v1_firstview  ;
 Drop view if exists test.v1_secondview ;
 Drop view if exists test.v1 ;
@@ -1314,7 +1314,7 @@ CREATE VIEW v1
 AS SELECT test.v1_firstview.F59, test.v1_firstview.F60
 FROM test.v1_firstview INNER JOIN test.v1_secondview
 ON test.v1_firstview.f59 = test.v1_secondview.f59 ;
-SELECT * FROM v1 limit 0,10;
+SELECT * FROM v1 order by f59,f60 limit 0,10;
 Drop view v1 ;
 Drop view test.v1_firstview ;
 Drop view test.v1_secondview ;
@@ -1339,7 +1339,7 @@ CREATE VIEW test.v1
 AS SELECT test.v1_firstview.f59, test.v1_firstview.f60
 FROM test.v1_firstview INNER JOIN test.tb2
 ON test.v1_firstview.f59 = test.tb2.f59;
-SELECT * FROM test.v1 limit 0,10;
+SELECT * FROM test.v1 order by f59,f60 limit 0,10;
 Drop view test.v1 ;
 Drop view test.v1_firstview;
 
@@ -1360,7 +1360,7 @@ CREATE VIEW v1_firstview AS SELECT * FROM test.tb2 ;
 CREATE VIEW v1
 AS SELECT v1_firstview.f59, v1_firstview.f60
 FROM v1_firstview INNER JOIN test.tb2 ON v1_firstview.f59 = test.tb2.f59 ;
-SELECT * FROM v1 limit 0,10;
+SELECT * FROM v1 order by f59,f60 limit 0,10;
 
 Drop database test2 ;
 
@@ -1385,7 +1385,7 @@ Drop view  if exists test.v1_1 ;
 Drop view  if exists test.v1_main ;
 --enable_warnings
 Create view test.v1 as Select f59, f60 FROM test.tb2;
-Select * from test.v1 limit 0,10;
+Select * from test.v1 order by f59,f60 limit 0,10;
 
 Create table t1(f59 int, f60 int);
 Insert into t1 values (90,507) ;
@@ -1396,7 +1396,7 @@ Select * from v1_1 ;
 Create view v1_main
 as SELECT test.tb2.f59 FROM test.tb2 JOIN test.v1
 ON test.tb2.f59 = test.v1.f59;
-Select * from v1_main limit 0,10;
+Select * from v1_main order by f59 limit 0,10;
 
 Drop table t1;
 Drop view  test.v1 ;
@@ -1505,7 +1505,7 @@ Drop view  if exists test1.v1_1 ;
 Drop database if exists test3 ;
 --enable_warnings
 Create view test.v1 as Select f59, f60 FROM test.tb2 limit 20 ;
-Select * from test.v1 ;
+Select * from test.v1 order by f59,f60;
 
 Create table test1.t1 (f59 int,f60 int)  ;
 Insert into test1.t1 values (199,507) ;
@@ -1550,7 +1550,7 @@ Drop view if exists test.v1 ;
 CREATE VIEW test.v1
 AS Select f59 from (Select * FROM tb2 limit 20) tx ;
 --error 1146
-SELECT * FROM test.v1      ;
+SELECT * FROM test.v1 order by f59 ;
 --disable_warnings
 Drop view if exists test.v1 ;
 --enable_warnings
@@ -1709,7 +1709,7 @@ CREATE VIEW test.v1 AS SELECT * FROM test.tb2 where f59 = 04;
 --enable_info
 UPDATE test.v1 SET f59 = 30 where F59 = 04 ;
 --disable_info
-SELECT * FROM test.v1   where f59 = 30 ;
+SELECT * FROM test.v1   where f59 = 30 order by f59;
 if ($have_bug_11589)
 {
 --disable_ps_protocol
@@ -1726,7 +1726,7 @@ if ($have_bug_11589)
 }
 SELECT * FROM tb2 where f59 = 100 ;
 --enable_ps_protocol
-SELECT * FROM test.v1 ;
+SELECT * FROM test.v1 order by f59 ;
 
 drop view if exists test.v1 ;
 
@@ -1821,7 +1821,7 @@ FROM test.tb2 where f59 = 195 WITH CHECK OPTION ;
 
 --error 1369
 UPDATE test.v1 SET f59 = 198 where f59=195 ;
-SELECT * FROM test.v1 ;
+SELECT * FROM test.v1 order by f59 ;
 
 drop view if exists test.v1 ;
 
@@ -1846,7 +1846,7 @@ CREATE VIEW test.v2 as SELECT * FROM test.v1 ;
 # This UPDATE violates the definition of VIEW test.v1.
 --error 1369
 UPDATE test.v1 SET F59 = 919 where f59 = 0987 ;
-SELECT * FROM test.v1 ;
+SELECT * FROM test.v1 order by f59 ;
 
 # ML: This UPDATE violates the definition of VIEW test.v1, but this
 #     does not count, because the UPDATE runs on test.v2, which
@@ -2299,7 +2299,7 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM test.v1 ;
+SELECT * FROM test.v1 order by f59 ;
 --enable_ps_protocol
 drop view test.v1 ;
 ###############################################################################
@@ -2310,7 +2310,7 @@ drop view test.v1 ;
 #                    AS SELECT col1, col3 FROM <table name>.
 ###############################################################################
 CREATE VIEW test.v1 AS SELECT F59,F61 FROM test.tb2 limit 50 ;
-SELECT * FROM test.v1 ;
+SELECT * FROM test.v1 order by F59, F61 ;
 drop view test.v1 ;
 ###############################################################################
 # Testcase 3.3.1.52: Ensure that a view that is a subset of every column and
@@ -2319,12 +2319,12 @@ drop view test.v1 ;
 #                    that is semantically equivalent to CREATE VIEW <view name>
 #                    AS SELECT * FROM <table name> WHERE ....
 ###############################################################################
-CREATE VIEW test.v1 AS SELECT * FROM test.tb2 limit 20 ;
+CREATE VIEW test.v1 AS SELECT * FROM test.tb2 order by f59, f60, f61 limit 20 ;
 if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM test.v1;
+SELECT * FROM test.v1 order by f59,f60,f61 ;
 --enable_ps_protocol
 drop view test.v1 ;
 ###############################################################################
@@ -2335,7 +2335,7 @@ drop view test.v1 ;
 #                    <view name> AS SELECT col1, col3 FROM <table name> WHERE ..
 ###############################################################################
 CREATE VIEW test.v1 AS SELECT F59,f61 FROM test.tb2 limit 20 ;
-SELECT * FROM test.v1 limit 50;
+SELECT * FROM test.v1 order by f59,f61 desc limit 50;
 drop view test.v1 ;
 
 
@@ -2363,7 +2363,7 @@ Insert into t2 values (2,2000) ;
 Insert into t2 values (31,97)  ;
 Create view test.v1 as select t1.f59, t1.f60
 from t1,t2 where t1.f59=t2.f59 ;
-Select * from test.v1 limit 50 ;
+Select * from test.v1 order by f59 limit 50 ;
 
 drop table test.t1 ;
 drop table test.t2 ;
@@ -2457,7 +2457,7 @@ create or replace view test.v1 as
 Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60,
        t1.f61 t1_f61, t2.f61 t2_f61
 from t1 inner join t2 where t1.f59 = t2.f59 ;
-select * from test.v1;
+select * from test.v1 order by t1_f59 ;
 Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60,
        t1.f61 t1_f61, t2.f61 t2_f61
 from t1 inner join t2 where t1.f59 = t2.f59;
@@ -2466,7 +2466,7 @@ from t1 inner join t2 where t1.f59 = t2.f59;
 Create or replace view test.v1 as
 Select t1.f59 AS t1_f59, t2.f59 AS t2_f59
 FROM t2 cross join t1;
-Select * from v1;
+Select * from v1 order by t1_f59,t2_f59;
 Select t1.f59 AS t1_f59, t2.f59 AS t2_f59
 FROM t2 cross join t1;
 
@@ -2474,7 +2474,7 @@ FROM t2 cross join t1;
 Create or replace view test.v1 as
 Select straight_join t1.f59 AS t1_f59, t2.f59 AS t2_f59
 FROM t2,t1;
-Select * from v1;
+Select * from v1 order by t1_f59,t2_f59;
 Select straight_join t1.f59 AS t1_f59, t2.f59 AS t2_f59
 FROM t2,t1;
 
@@ -2482,7 +2482,7 @@ FROM t2,t1;
 Create or replace view test.v1 as
 Select f59, f60, f61, a, b
 FROM t2 natural join t1;
-Select * from v1;
+Select * from v1 order by f59;
 Select f59, f60, f61, a, b
 FROM t2 natural join t1;
 
@@ -2491,7 +2491,7 @@ Create or replace view test.v1 as
 Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60,
        t1.f61 t1_f61, t2.f61 t2_f61
 FROM t2 left outer join t1 on t2.f59=t1.f59;
-Select * from v1;
+Select * from v1 order by t1_f59;
 Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60,
        t1.f61 t1_f61, t2.f61 t2_f61
 FROM t2 left outer join t1 on t2.f59=t1.f59;
@@ -2500,7 +2500,7 @@ FROM t2 left outer join t1 on t2.f59=t1.f59;
 Create or replace view test.v1 as
 Select f59, f60, f61, t1.a, t2.b
 FROM t2 natural left outer join t1;
-Select * from v1;
+Select * from v1 order by f59;
 Select f59, f60, f61, t1.a, t2.b
 FROM t2 natural left outer join t1;
 
@@ -2509,7 +2509,7 @@ Create or replace view test.v1 as
 Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60,
        t1.f61 t1_f61, t2.f61 t2_f61
 FROM t2 right outer join t1 on t2.f59=t1.f59;
-Select * from v1;
+Select * from v1 order by t1_f59;
 Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60,
        t1.f61 t1_f61, t2.f61 t2_f61
 FROM t2 right outer join t1 on t2.f59=t1.f59;
@@ -2518,7 +2518,7 @@ FROM t2 right outer join t1 on t2.f59=t1.f59;
 Create or replace view test.v1 as
 Select f59, f60, a, b
 FROM t2 natural right outer join t1;
-Select * from v1;
+Select * from v1 order by f59 desc;
 Select f59, f60, a, b
 FROM t2 natural right outer join t1;
 
@@ -2551,7 +2551,7 @@ Insert into t1 values (901,801,401)  ;
 
 Create or replace view test.v1 as
 Select tb2.f59 FROM tb2 LEFT JOIN t1 on tb2.f59 = t1.f59 ;
-Select * from test.v1 limit 0,10;
+Select * from test.v1 order by f59 limit 0,10;
 Drop view if exists test.v1 ;
 
 # Testcase 3.3.1.A2 ;
@@ -2566,7 +2566,7 @@ Insert into t1 values (201,201,201)  ;
 
 Create or replace view test.v1
 as Select tb2.f59 FROM tb2 INNER JOIN t1 on tb2.f59 = t1.f59 ;
-Select * from test.v1 limit 0,10;
+Select * from test.v1 order by f59 limit 0,10;
 Drop view if exists test.v1 ;
 
 # Testcase 3.3.1.A3 ;
@@ -2581,7 +2581,7 @@ Insert into t1 values (21,21,21)  ;
 
 Create or replace view test.v1
 as Select tb2.f59 FROM tb2 CROSS JOIN t1 on tb2.f59 = t1.f59 ;
-Select * from test.v1 limit 0,10;
+Select * from test.v1 order by f59 limit 0,10;
 
 Drop view test.v1 ;
 
@@ -2607,15 +2607,15 @@ Insert into t1 values (91,81,41)  ;
 
 Create or replace view test.v1 as  (Select f59 FROM tb2 where f59=17 )
 Union  ALL (Select f59 from t1 where f59=17 );
-Select * from test.v1 limit 0,10;
+Select * from test.v1 order by f59 limit 0,10;
 
 Create or replace view test.v1 as  (Select f59 FROM tb2 where f59=17 )
 Union  (Select f59 from t1 where f59=17 );
-Select * from test.v1 limit 0,10;
+Select * from test.v1 order by f59 limit 0,10;
 
 Create or replace view test.v1 as  (Select f59 FROM tb2 where f59=17 )
 Union Distinct (Select f59 from t1 where f60=17 );
-Select * from test.v1 limit 0,10;
+Select * from test.v1 order by f59 limit 0,10;
 
 Drop view test.v1 ;
 
@@ -2631,25 +2631,25 @@ insert into t1 values (901,801,401);
 
 create or replace view test.v1 as
 select tb2.f59 from tb2  join t1 on tb2.f59 = t1.f59;
-select * from test.v1 limit 0,10;
+select * from test.v1 order by f59 limit 0,10;
 
 create or replace view test.v1 as
 (select f59 from tb2 where f59=107 )
 union all
 (select f59 from t1 where f59=107 );
-select * from test.v1 limit 0,10;
+select * from test.v1 order by f59 limit 0,10;
 
 create or replace view test.v1 as
 (select f59 from tb2 where f59=107 )
 union
 (select f59 from t1 where f59=107 );
-select * from test.v1 limit 0,10;
+select * from test.v1 order by f59 limit 0,10;
 
 create or replace view test.v1 as
 (select f59 from tb2 where f59=107 )
 union distinct
 (select f59 from t1 where f59=107 );
-select * from test.v1 limit 0,10;
+select * from test.v1 order by f59 limit 0,10;
 
 drop view if exists test.v1 ;
 drop table t1;
@@ -2668,7 +2668,7 @@ Drop view if exists test.v1 ;
 CREATE VIEW test.v1 AS SELECT F59
 FROM test.tb2 where test.tb2.F59 = 109;
 
-SELECT * FROM test.v1 limit 0,10;
+SELECT * FROM test.v1 order by f59 limit 0,10;
 
 ALTER VIEW test.v1 AS  SELECT *
 FROM test.tb2 WHERE test.tb2.f59 = 242 ;
@@ -2676,7 +2676,7 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM test.v1 limit 0,10;
+SELECT * FROM test.v1 order by f59 limit 0,10;
 --enable_ps_protocol
 
 Drop view test.v1 ;
@@ -2899,10 +2899,14 @@ eval EXPLAIN SELECT * FROM test3.v$toplevel;
 #                   and OBN's box performs excessive paging.
 #                   (RAM: OBN ~384MB RAM, ML 1 GB)
 #++++++++++++++++++++++++++++++++++++++++++++++
-let $message= FIXME - Setting join_limit to 30 - hangs for higher values;
+let $message= FIXME - Setting join_limit to 28 - hangs for higher values;
 --source include/show_msg.inc
+# OBN - Reduced from 30 in 5.1.21 to avoid hitting the ndbcluster limit
+#       of "ERROR HY000:RROR HY000: Got temporary error 4006 'Connect failure 
+#           - out of connection objects (increase MaxNoOfConcurrentTransactions)' 
+#           from NDBCLUSTER " to early;
 #SET @join_limit = 61;
-SET @join_limit = 30;
+SET @join_limit = 28; # OBN - see above 
 SET @max_level = @join_limit - 1;
 --enable_query_log
 
@@ -3184,7 +3188,7 @@ if ($have_bug_11589)
 }
 SELECT * FROM tb2 where f59 = 8 and f60 = 105;
 --enable_ps_protocol
-SELECT f59,f60 FROM test.v1 where f59 = 8 and f60 = 105;
+SELECT f59,f60 FROM test.v1 where f59 = 8 and f60 = 105 ;
 
 Drop view test.v1 ;
 
@@ -3212,7 +3216,7 @@ if ($have_bug_11589)
 }
 SELECT * FROM tb2 where f59 = 891 and f60 = 105;
 --enable_ps_protocol
-SELECT f59,f60 FROM test.v1 where f59 = 891 and f60 = 105;
+SELECT f59,f60 FROM test.v1 where f59 = 891 and f60 = 105 ;
 
 Drop view test.v1 ;
 
@@ -3233,7 +3237,7 @@ CREATE VIEW test.v1 AS SELECT f59,f60,f61 FROM tb2 where f59 = 789 ;
 DELETE FROM test.v1 where f59 = 789 ;
 --disable_info
 SELECT * FROM tb2 where f59 = 789 ;
-SELECT f59,f60 FROM test.v1 where f59 = 789;
+SELECT f59,f60 FROM test.v1 where f59 = 789 order by f60 ;
 
 Drop view test.v1 ;
 
@@ -3256,7 +3260,7 @@ DELETE FROM test.v1 where f59 = 711 ;
 --disable_info
 
 SELECT * FROM tb2 where f59 = 711 ;
-SELECT f59,f60 FROM test.v1 where f59 = 711;
+SELECT f59,f60 FROM test.v1 where f59 = 711 order by f60 ;
 
 Drop view test.v1 ;
 

mysql-test/suite/funcs_2/r/ndb_charset.result

@@ -3,7 +3,7 @@ SET NAMES armscii8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET armscii8 COLLATE armscii8_bin) ENGINE=NDB CHARACTER SET armscii8 COLLATE armscii8_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	armscii8_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	armscii8_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -233,7 +233,7 @@ SET NAMES armscii8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET armscii8 COLLATE armscii8_general_ci) ENGINE=NDB CHARACTER SET armscii8 COLLATE armscii8_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	armscii8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	armscii8_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -463,7 +463,7 @@ SET NAMES ascii;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET ascii COLLATE ascii_bin) ENGINE=NDB CHARACTER SET ascii COLLATE ascii_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	ascii_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	ascii_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -693,7 +693,7 @@ SET NAMES ascii;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET ascii COLLATE ascii_general_ci) ENGINE=NDB CHARACTER SET ascii COLLATE ascii_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	ascii_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	ascii_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -923,7 +923,7 @@ SET NAMES big5;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET big5 COLLATE big5_bin) ENGINE=NDB CHARACTER SET big5 COLLATE big5_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	big5_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	big5_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -1027,7 +1027,7 @@ SET NAMES big5;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET big5 COLLATE big5_chinese_ci) ENGINE=NDB CHARACTER SET big5 COLLATE big5_chinese_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	big5_chinese_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	big5_chinese_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -1131,7 +1131,7 @@ SET NAMES binary;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET binary) ENGINE=NDB CHARACTER SET binary;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	binary	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	binary	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -1361,7 +1361,7 @@ SET NAMES cp1250;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1250 COLLATE cp1250_bin) ENGINE=NDB CHARACTER SET cp1250 COLLATE cp1250_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1250_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1250_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -1591,7 +1591,7 @@ SET NAMES cp1250;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1250 COLLATE cp1250_croatian_ci) ENGINE=NDB CHARACTER SET cp1250 COLLATE cp1250_croatian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1250_croatian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1250_croatian_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -1821,7 +1821,7 @@ SET NAMES cp1250;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1250 COLLATE cp1250_czech_cs) ENGINE=NDB CHARACTER SET cp1250 COLLATE cp1250_czech_cs;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1250_czech_cs	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1250_czech_cs	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 7F	1
@@ -2051,7 +2051,7 @@ SET NAMES cp1250;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1250 COLLATE cp1250_general_ci) ENGINE=NDB CHARACTER SET cp1250 COLLATE cp1250_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1250_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1250_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 A0	1
@@ -2281,7 +2281,7 @@ SET NAMES cp1251;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1251 COLLATE cp1251_bin) ENGINE=NDB CHARACTER SET cp1251 COLLATE cp1251_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1251_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1251_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -2511,7 +2511,7 @@ SET NAMES cp1251;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1251 COLLATE cp1251_bulgarian_ci) ENGINE=NDB CHARACTER SET cp1251 COLLATE cp1251_bulgarian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1251_bulgarian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1251_bulgarian_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -2741,7 +2741,7 @@ SET NAMES cp1251;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1251 COLLATE cp1251_general_ci) ENGINE=NDB CHARACTER SET cp1251 COLLATE cp1251_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1251_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1251_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -2971,7 +2971,7 @@ SET NAMES cp1251;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1251 COLLATE cp1251_general_cs) ENGINE=NDB CHARACTER SET cp1251 COLLATE cp1251_general_cs;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1251_general_cs	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1251_general_cs	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -3201,7 +3201,7 @@ SET NAMES cp1251;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1251 COLLATE cp1251_ukrainian_ci) ENGINE=NDB CHARACTER SET cp1251 COLLATE cp1251_ukrainian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1251_ukrainian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1251_ukrainian_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 60	1
@@ -3431,7 +3431,7 @@ SET NAMES cp1256;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1256 COLLATE cp1256_bin) ENGINE=NDB CHARACTER SET cp1256 COLLATE cp1256_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1256_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1256_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -3661,7 +3661,7 @@ SET NAMES cp1256;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1256 COLLATE cp1256_general_ci) ENGINE=NDB CHARACTER SET cp1256 COLLATE cp1256_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1256_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1256_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -3891,7 +3891,7 @@ SET NAMES cp1257;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1257 COLLATE cp1257_bin) ENGINE=NDB CHARACTER SET cp1257 COLLATE cp1257_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1257_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1257_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -4121,7 +4121,7 @@ SET NAMES cp1257;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1257 COLLATE cp1257_general_ci) ENGINE=NDB CHARACTER SET cp1257 COLLATE cp1257_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1257_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1257_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -4351,7 +4351,7 @@ SET NAMES cp1257;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp1257 COLLATE cp1257_lithuanian_ci) ENGINE=NDB CHARACTER SET cp1257 COLLATE cp1257_lithuanian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp1257_lithuanian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp1257_lithuanian_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -4581,7 +4581,7 @@ SET NAMES cp850;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp850 COLLATE cp850_bin) ENGINE=NDB CHARACTER SET cp850 COLLATE cp850_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp850_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp850_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -4811,7 +4811,7 @@ SET NAMES cp850;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp850 COLLATE cp850_general_ci) ENGINE=NDB CHARACTER SET cp850 COLLATE cp850_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp850_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp850_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -5041,7 +5041,7 @@ SET NAMES cp852;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp852 COLLATE cp852_bin) ENGINE=NDB CHARACTER SET cp852 COLLATE cp852_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp852_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp852_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -5271,7 +5271,7 @@ SET NAMES cp852;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp852 COLLATE cp852_general_ci) ENGINE=NDB CHARACTER SET cp852 COLLATE cp852_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp852_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp852_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -5501,7 +5501,7 @@ SET NAMES cp866;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp866 COLLATE cp866_bin) ENGINE=NDB CHARACTER SET cp866 COLLATE cp866_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp866_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp866_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -5731,7 +5731,7 @@ SET NAMES cp866;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp866 COLLATE cp866_general_ci) ENGINE=NDB CHARACTER SET cp866 COLLATE cp866_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp866_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp866_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -5961,7 +5961,7 @@ SET NAMES cp932;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp932 COLLATE cp932_bin) ENGINE=NDB CHARACTER SET cp932 COLLATE cp932_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp932_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp932_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -6128,7 +6128,7 @@ SET NAMES cp932;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET cp932 COLLATE cp932_japanese_ci) ENGINE=NDB CHARACTER SET cp932 COLLATE cp932_japanese_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	cp932_japanese_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	cp932_japanese_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -6295,7 +6295,7 @@ SET NAMES dec8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET dec8 COLLATE dec8_bin) ENGINE=NDB CHARACTER SET dec8 COLLATE dec8_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	dec8_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	dec8_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -6525,7 +6525,7 @@ SET NAMES dec8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET dec8 COLLATE dec8_swedish_ci) ENGINE=NDB CHARACTER SET dec8 COLLATE dec8_swedish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	dec8_swedish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	dec8_swedish_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -6755,7 +6755,7 @@ SET NAMES eucjpms;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET eucjpms COLLATE eucjpms_bin) ENGINE=NDB CHARACTER SET eucjpms COLLATE eucjpms_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	eucjpms_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	eucjpms_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -6859,7 +6859,7 @@ SET NAMES eucjpms;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET eucjpms COLLATE eucjpms_japanese_ci) ENGINE=NDB CHARACTER SET eucjpms COLLATE eucjpms_japanese_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	eucjpms_japanese_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	eucjpms_japanese_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -6963,7 +6963,7 @@ SET NAMES euckr;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET euckr COLLATE euckr_bin) ENGINE=NDB CHARACTER SET euckr COLLATE euckr_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	euckr_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	euckr_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -7067,7 +7067,7 @@ SET NAMES euckr;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET euckr COLLATE euckr_korean_ci) ENGINE=NDB CHARACTER SET euckr COLLATE euckr_korean_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	euckr_korean_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	euckr_korean_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -7171,7 +7171,7 @@ SET NAMES gb2312;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET gb2312 COLLATE gb2312_bin) ENGINE=NDB CHARACTER SET gb2312 COLLATE gb2312_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	gb2312_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	gb2312_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -7275,7 +7275,7 @@ SET NAMES gb2312;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET gb2312 COLLATE gb2312_chinese_ci) ENGINE=NDB CHARACTER SET gb2312 COLLATE gb2312_chinese_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	gb2312_chinese_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	gb2312_chinese_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -7379,7 +7379,7 @@ SET NAMES gbk;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET gbk COLLATE gbk_bin) ENGINE=NDB CHARACTER SET gbk COLLATE gbk_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	gbk_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	gbk_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -7483,7 +7483,7 @@ SET NAMES gbk;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET gbk COLLATE gbk_chinese_ci) ENGINE=NDB CHARACTER SET gbk COLLATE gbk_chinese_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	gbk_chinese_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	gbk_chinese_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -7587,7 +7587,7 @@ SET NAMES geostd8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET geostd8 COLLATE geostd8_bin) ENGINE=NDB CHARACTER SET geostd8 COLLATE geostd8_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	geostd8_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	geostd8_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -7817,7 +7817,7 @@ SET NAMES geostd8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET geostd8 COLLATE geostd8_general_ci) ENGINE=NDB CHARACTER SET geostd8 COLLATE geostd8_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	geostd8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	geostd8_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -8047,7 +8047,7 @@ SET NAMES greek;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET greek COLLATE greek_bin) ENGINE=NDB CHARACTER SET greek COLLATE greek_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	greek_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	greek_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -8277,7 +8277,7 @@ SET NAMES greek;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET greek COLLATE greek_general_ci) ENGINE=NDB CHARACTER SET greek COLLATE greek_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	greek_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	greek_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -8507,7 +8507,7 @@ SET NAMES hebrew;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET hebrew COLLATE hebrew_bin) ENGINE=NDB CHARACTER SET hebrew COLLATE hebrew_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	hebrew_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	hebrew_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -8737,7 +8737,7 @@ SET NAMES hebrew;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET hebrew COLLATE hebrew_general_ci) ENGINE=NDB CHARACTER SET hebrew COLLATE hebrew_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	hebrew_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	hebrew_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -8967,7 +8967,7 @@ SET NAMES hp8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET hp8 COLLATE hp8_bin) ENGINE=NDB CHARACTER SET hp8 COLLATE hp8_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	hp8_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	hp8_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -9197,7 +9197,7 @@ SET NAMES hp8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET hp8 COLLATE hp8_english_ci) ENGINE=NDB CHARACTER SET hp8 COLLATE hp8_english_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	hp8_english_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	hp8_english_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -9427,7 +9427,7 @@ SET NAMES keybcs2;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET keybcs2 COLLATE keybcs2_bin) ENGINE=NDB CHARACTER SET keybcs2 COLLATE keybcs2_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	keybcs2_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	keybcs2_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -9657,7 +9657,7 @@ SET NAMES keybcs2;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET keybcs2 COLLATE keybcs2_general_ci) ENGINE=NDB CHARACTER SET keybcs2 COLLATE keybcs2_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	keybcs2_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	keybcs2_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -9887,7 +9887,7 @@ SET NAMES koi8r;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET koi8r COLLATE koi8r_bin) ENGINE=NDB CHARACTER SET koi8r COLLATE koi8r_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	koi8r_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	koi8r_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -10117,7 +10117,7 @@ SET NAMES koi8r;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET koi8r COLLATE koi8r_general_ci) ENGINE=NDB CHARACTER SET koi8r COLLATE koi8r_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	koi8r_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	koi8r_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -10347,7 +10347,7 @@ SET NAMES koi8u;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET koi8u COLLATE koi8u_bin) ENGINE=NDB CHARACTER SET koi8u COLLATE koi8u_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	koi8u_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	koi8u_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -10577,7 +10577,7 @@ SET NAMES koi8u;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET koi8u COLLATE koi8u_general_ci) ENGINE=NDB CHARACTER SET koi8u COLLATE koi8u_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	koi8u_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	koi8u_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 60	1
@@ -10807,7 +10807,7 @@ SET NAMES latin1;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin1 COLLATE latin1_bin) ENGINE=NDB CHARACTER SET latin1 COLLATE latin1_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin1_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin1_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -11037,7 +11037,7 @@ SET NAMES latin1;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin1 COLLATE latin1_danish_ci) ENGINE=NDB CHARACTER SET latin1 COLLATE latin1_danish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin1_danish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin1_danish_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -11267,7 +11267,7 @@ SET NAMES latin1;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin1 COLLATE latin1_general_ci) ENGINE=NDB CHARACTER SET latin1 COLLATE latin1_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin1_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin1_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -11497,7 +11497,7 @@ SET NAMES latin1;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin1 COLLATE latin1_general_cs) ENGINE=NDB CHARACTER SET latin1 COLLATE latin1_general_cs;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin1_general_cs	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin1_general_cs	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -11727,7 +11727,7 @@ SET NAMES latin1;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin1 COLLATE latin1_german1_ci) ENGINE=NDB CHARACTER SET latin1 COLLATE latin1_german1_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin1_german1_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin1_german1_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -11957,7 +11957,7 @@ SET NAMES latin1;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin1 COLLATE latin1_german2_ci) ENGINE=NDB CHARACTER SET latin1 COLLATE latin1_german2_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin1_german2_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin1_german2_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -12187,7 +12187,7 @@ SET NAMES latin1;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin1 COLLATE latin1_spanish_ci) ENGINE=NDB CHARACTER SET latin1 COLLATE latin1_spanish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin1_spanish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin1_spanish_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -12417,7 +12417,7 @@ SET NAMES latin1;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin1 COLLATE latin1_swedish_ci) ENGINE=NDB CHARACTER SET latin1 COLLATE latin1_swedish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin1_swedish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin1_swedish_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -12647,7 +12647,7 @@ SET NAMES latin2;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin2 COLLATE latin2_bin) ENGINE=NDB CHARACTER SET latin2 COLLATE latin2_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin2_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin2_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -12877,7 +12877,7 @@ SET NAMES latin2;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin2 COLLATE latin2_croatian_ci) ENGINE=NDB CHARACTER SET latin2 COLLATE latin2_croatian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin2_croatian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin2_croatian_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -13107,7 +13107,7 @@ SET NAMES latin2;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin2 COLLATE latin2_czech_cs) ENGINE=NDB CHARACTER SET latin2 COLLATE latin2_czech_cs;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin2_czech_cs	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin2_czech_cs	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 2E	1
@@ -13337,7 +13337,7 @@ SET NAMES latin2;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin2 COLLATE latin2_general_ci) ENGINE=NDB CHARACTER SET latin2 COLLATE latin2_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin2_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin2_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -13567,7 +13567,7 @@ SET NAMES latin2;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin2 COLLATE latin2_hungarian_ci) ENGINE=NDB CHARACTER SET latin2 COLLATE latin2_hungarian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin2_hungarian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin2_hungarian_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 7F	1
@@ -13797,7 +13797,7 @@ SET NAMES latin5;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin5 COLLATE latin5_bin) ENGINE=NDB CHARACTER SET latin5 COLLATE latin5_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin5_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin5_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -14027,7 +14027,7 @@ SET NAMES latin5;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin5 COLLATE latin5_turkish_ci) ENGINE=NDB CHARACTER SET latin5 COLLATE latin5_turkish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin5_turkish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin5_turkish_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -14257,7 +14257,7 @@ SET NAMES latin7;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin7 COLLATE latin7_bin) ENGINE=NDB CHARACTER SET latin7 COLLATE latin7_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin7_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin7_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -14487,7 +14487,7 @@ SET NAMES latin7;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin7 COLLATE latin7_estonian_cs) ENGINE=NDB CHARACTER SET latin7 COLLATE latin7_estonian_cs;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin7_estonian_cs	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin7_estonian_cs	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 80	1
@@ -14717,7 +14717,7 @@ SET NAMES latin7;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin7 COLLATE latin7_general_ci) ENGINE=NDB CHARACTER SET latin7 COLLATE latin7_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin7_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin7_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 7F	1
@@ -14947,7 +14947,7 @@ SET NAMES latin7;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET latin7 COLLATE latin7_general_cs) ENGINE=NDB CHARACTER SET latin7 COLLATE latin7_general_cs;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	latin7_general_cs	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	latin7_general_cs	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 7F	1
@@ -15177,7 +15177,7 @@ SET NAMES macce;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET macce COLLATE macce_bin) ENGINE=NDB CHARACTER SET macce COLLATE macce_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	macce_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	macce_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -15407,7 +15407,7 @@ SET NAMES macce;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET macce COLLATE macce_general_ci) ENGINE=NDB CHARACTER SET macce COLLATE macce_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	macce_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	macce_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -15637,7 +15637,7 @@ SET NAMES macroman;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET macroman COLLATE macroman_bin) ENGINE=NDB CHARACTER SET macroman COLLATE macroman_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	macroman_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	macroman_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -15867,7 +15867,7 @@ SET NAMES macroman;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET macroman COLLATE macroman_general_ci) ENGINE=NDB CHARACTER SET macroman COLLATE macroman_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	macroman_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	macroman_general_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -16097,7 +16097,7 @@ SET NAMES sjis;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET sjis COLLATE sjis_bin) ENGINE=NDB CHARACTER SET sjis COLLATE sjis_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	sjis_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	sjis_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -16264,7 +16264,7 @@ SET NAMES sjis;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET sjis COLLATE sjis_japanese_ci) ENGINE=NDB CHARACTER SET sjis COLLATE sjis_japanese_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	sjis_japanese_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	sjis_japanese_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -16431,7 +16431,7 @@ SET NAMES swe7;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET swe7 COLLATE swe7_bin) ENGINE=NDB CHARACTER SET swe7 COLLATE swe7_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	swe7_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	swe7_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -16661,7 +16661,7 @@ SET NAMES swe7;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET swe7 COLLATE swe7_swedish_ci) ENGINE=NDB CHARACTER SET swe7 COLLATE swe7_swedish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	swe7_swedish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	swe7_swedish_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -16891,7 +16891,7 @@ SET NAMES tis620;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET tis620 COLLATE tis620_bin) ENGINE=NDB CHARACTER SET tis620 COLLATE tis620_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	tis620_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	tis620_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -17121,7 +17121,7 @@ SET NAMES tis620;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET tis620 COLLATE tis620_thai_ci) ENGINE=NDB CHARACTER SET tis620 COLLATE tis620_thai_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	tis620_thai_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	tis620_thai_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -17351,7 +17351,7 @@ SET NAMES ujis;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET ujis COLLATE ujis_bin) ENGINE=NDB CHARACTER SET ujis COLLATE ujis_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	ujis_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	ujis_bin	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -17455,7 +17455,7 @@ SET NAMES ujis;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET ujis COLLATE ujis_japanese_ci) ENGINE=NDB CHARACTER SET ujis COLLATE ujis_japanese_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	ujis_japanese_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	ujis_japanese_ci	#	#	#
 SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
 a_ascii	a_len
 21	1
@@ -17562,7 +17562,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_bin;
@@ -20103,7 +20103,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_czech_ci;
@@ -22644,7 +22644,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_danish_ci;
@@ -25185,7 +25185,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_estonian_ci;
@@ -27726,7 +27726,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_general_ci;
@@ -30267,7 +30267,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_hungarian_ci;
@@ -32808,7 +32808,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_icelandic_ci;
@@ -35349,7 +35349,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_latvian_ci;
@@ -37890,7 +37890,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_lithuanian_ci;
@@ -40431,7 +40431,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_persian_ci;
@@ -42972,7 +42972,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_polish_ci;
@@ -45513,7 +45513,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_roman_ci;
@@ -48054,7 +48054,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_romanian_ci;
@@ -50595,7 +50595,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_slovak_ci;
@@ -53136,7 +53136,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_slovenian_ci;
@@ -55677,7 +55677,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_spanish2_ci;
@@ -58218,7 +58218,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_spanish_ci;
@@ -60759,7 +60759,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_swedish_ci;
@@ -63300,7 +63300,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_turkish_ci;
@@ -65841,7 +65841,7 @@ SET NAMES utf8;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=NDB CHARACTER SET utf8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci;
@@ -68381,7 +68381,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_bin) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_bin;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_bin	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_bin	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -70920,7 +70920,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_czech_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_czech_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_czech_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_czech_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -73459,7 +73459,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_danish_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_danish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_danish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_danish_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -75998,7 +75998,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_estonian_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_estonian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_estonian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_estonian_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -78537,7 +78537,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_general_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_general_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -81076,7 +81076,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_hungarian_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_hungarian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_hungarian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_hungarian_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -83615,7 +83615,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_icelandic_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_icelandic_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_icelandic_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_icelandic_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -86154,7 +86154,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_latvian_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_latvian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_latvian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_latvian_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -88693,7 +88693,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_lithuanian_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_lithuanian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_lithuanian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_lithuanian_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -91232,7 +91232,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_persian_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_persian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_persian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_persian_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -93771,7 +93771,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_polish_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_polish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_polish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_polish_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -96310,7 +96310,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_roman_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_roman_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_roman_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_roman_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -98849,7 +98849,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_romanian_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_romanian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_romanian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_romanian_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -101388,7 +101388,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_slovak_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_slovak_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_slovak_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_slovak_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -103927,7 +103927,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_slovenian_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_slovenian_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_slovenian_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_slovenian_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -106466,7 +106466,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_spanish2_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_spanish2_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_spanish2_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_spanish2_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -109005,7 +109005,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_spanish_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_spanish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_spanish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_spanish_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -111544,7 +111544,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_swedish_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_swedish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_swedish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_swedish_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -114083,7 +114083,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_turkish_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_turkish_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_turkish_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_turkish_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
@@ -116622,7 +116622,7 @@ USE test;
 CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8 COLLATE utf8_unicode_ci) ENGINE=NDB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	NDBCLUSTER	#	#	#	#	#	#	#	#	#	#	#	#	utf8_unicode_ci	#	#	#
+t1	ndbcluster	#	#	#	#	#	#	#	#	#	#	#	#	utf8_unicode_ci	#	#	#
 LOAD DATA INFILE 
 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;

mysql-test/suite/im/r/im_cmd_line.result

@@ -0,0 +1,47 @@
+SHOW VARIABLES LIKE 'server_id';
+Variable_name	Value
+server_id	1
+SHOW INSTANCES;
+instance_name	state
+mysqld1	XXXXX
+mysqld2	offline
+--> Listing users...
+im_admin
+
+==> Adding user 'testuser'...
+
+--> IM password file:
+testuser:*0D3CED9BEC10A777AEC23CCC353A8C08A633045E
+im_admin:*598D51AD2DFF7792045D6DF3DDF9AA1AF737B295
+--> EOF
+
+--> Printing out line for 'testuser'...
+testuser:*0D3CED9BEC10A777AEC23CCC353A8C08A633045E
+
+--> Listing users...
+im_admin
+testuser
+
+==> Changing the password of 'testuser'...
+
+--> IM password file:
+im_admin:*598D51AD2DFF7792045D6DF3DDF9AA1AF737B295
+testuser:*39C549BDECFBA8AFC3CE6B948C9359A0ECE08DE2
+--> EOF
+
+--> Printing out line for 'testuser'...
+testuser:*39C549BDECFBA8AFC3CE6B948C9359A0ECE08DE2
+
+--> Listing users...
+testuser
+im_admin
+
+==> Dropping user 'testuser'...
+
+--> IM password file:
+im_admin:*598D51AD2DFF7792045D6DF3DDF9AA1AF737B295
+--> EOF
+
+--> Listing users...
+im_admin
+

mysql-test/suite/im/r/im_daemon_life_cycle.result

@@ -0,0 +1,26 @@
+SHOW VARIABLES LIKE 'server_id';
+Variable_name	Value
+server_id	1
+SHOW INSTANCES;
+instance_name	state
+mysqld1	XXXXX
+mysqld2	offline
+Killing the process...
+Waiting...
+Success: the process was restarted.
+Success: server is ready to accept connection on socket.
+
+--------------------------------------------------------------------
+-- Test for BUG#12751
+--------------------------------------------------------------------
+START INSTANCE mysqld2;
+Success: the process has been started.
+Killing the process...
+Waiting...
+Success: the process was restarted.
+Success: server is ready to accept connection on socket.
+SHOW INSTANCE STATUS mysqld1;
+instance_name	state	version_number	version	mysqld_compatible
+mysqld1	STATE	VERSION_NUMBER	VERSION	no
+STOP INSTANCE mysqld2;
+Success: the process has been stopped.

mysql-test/suite/im/r/im_instance_conf.result

@@ -0,0 +1,225 @@
+SHOW VARIABLES LIKE 'server_id';
+Variable_name	Value
+server_id	1
+SHOW INSTANCES;
+instance_name	state
+mysqld1	XXXXX
+mysqld2	offline
+--------------------------------------------------------------------
+server_id           = 1
+server_id           = 2
+--------------------------------------------------------------------
+CREATE INSTANCE mysqld3
+server_id = 3,
+socket = "$MYSQL_TMP_DIR/mysqld_3.sock";
+SHOW INSTANCES;
+instance_name	state
+mysqld3	offline
+mysqld2	offline
+mysqld1	online
+--------------------------------------------------------------------
+server_id           = 1
+server_id           = 2
+server_id=3
+--------------------------------------------------------------------
+CREATE INSTANCE mysqld1;
+ERROR HY000: Instance already exists
+CREATE INSTANCE mysqld2;
+ERROR HY000: Instance already exists
+CREATE INSTANCE mysqld3;
+ERROR HY000: Instance already exists
+--------------------------------------------------------------------
+nonguarded
+--------------------------------------------------------------------
+CREATE INSTANCE mysqld4
+nonguarded,
+server_id = 4,
+socket = "$MYSQL_TMP_DIR/mysqld_4.sock";
+SHOW INSTANCES;
+instance_name	state
+mysqld3	offline
+mysqld4	offline
+mysqld1	online
+mysqld2	offline
+--------------------------------------------------------------------
+nonguarded
+nonguarded
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+CREATE INSTANCE mysqld5
+test-A = 000,
+test-B = test,
+server_id = 5,
+socket = "$MYSQL_TMP_DIR/mysqld_5.sock";
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld4	offline
+mysqld5	offline
+mysqld2	offline
+mysqld3	offline
+--------------------------------------------------------------------
+test-A=000
+--------------------------------------------------------------------
+test-B=test
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+CREATE INSTANCE mysqld6
+test-C1  =  10  ,
+test-C2  =  02  ,
+server_id = 6,
+socket = "$MYSQL_TMP_DIR/mysqld_6.sock";
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld2	offline
+mysqld5	offline
+mysqld6	offline
+mysqld3	offline
+mysqld4	offline
+--------------------------------------------------------------------
+test-C1=10
+--------------------------------------------------------------------
+test-C2=02
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+CREATE INSTANCE mysqld7  test-D  =  test-D-value  ;
+ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld2	offline
+mysqld5	offline
+mysqld6	offline
+mysqld3	offline
+mysqld4	offline
+CREATE INSTANCE mysqld8  test-E  0  ;
+ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld2	offline
+mysqld5	offline
+mysqld6	offline
+mysqld3	offline
+mysqld4	offline
+CREATE INSTANCE mysqld8  test-F  =  ;
+ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld2	offline
+mysqld5	offline
+mysqld6	offline
+mysqld3	offline
+mysqld4	offline
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+CREATE INSTANCE mysqld9
+test-1=" hello world ",
+test-2='  ',
+server_id = 9,
+socket = "$MYSQL_TMP_DIR/mysqld_9.sock";
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld2	offline
+mysqld5	offline
+mysqld6	offline
+mysqld3	offline
+mysqld4	offline
+mysqld9	offline
+CREATE INSTANCE mysqld10
+test-3='\b\babc\sdef',
+server_id = 10,
+socket = "$MYSQL_TMP_DIR/mysqld_10.sock";
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld9	offline
+mysqld5	offline
+mysqld6	offline
+mysqld3	offline
+mysqld4	offline
+mysqld10	offline
+mysqld2	offline
+CREATE INSTANCE mysqld11
+test-4='abc\tdef',
+test-5='abc\ndef',
+server_id = 11,
+socket = "$MYSQL_TMP_DIR/mysqld_11.sock";
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld11	offline
+mysqld5	offline
+mysqld6	offline
+mysqld3	offline
+mysqld4	offline
+mysqld10	offline
+mysqld2	offline
+mysqld9	offline
+CREATE INSTANCE mysqld12
+test-6="abc\rdef",
+test-7="abc\\def",
+server_id = 12,
+socket = "$MYSQL_TMP_DIR/mysqld_12.sock";
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld9	offline
+mysqld5	offline
+mysqld6	offline
+mysqld3	offline
+mysqld4	offline
+mysqld10	offline
+mysqld2	offline
+mysqld12	offline
+mysqld11	offline
+CREATE INSTANCE mysqld13 test-bad=' \ ';
+ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld9	offline
+mysqld5	offline
+mysqld6	offline
+mysqld3	offline
+mysqld4	offline
+mysqld10	offline
+mysqld2	offline
+mysqld12	offline
+mysqld11	offline
+--------------------------------------------------------------------
+test-1= hello world 
+--------------------------------------------------------------------
+test-2=  
+--------------------------------------------------------------------
+test-3=abc def
+--------------------------------------------------------------------
+test-4=abc	def
+--------------------------------------------------------------------
+test-5=abc
+--------------------------------------------------------------------
+test-6=abc
+def
+--------------------------------------------------------------------
+test-7=abc\def
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+CREATE INSTANCE qqq1;

mysql-test/suite/im/r/im_life_cycle.result

@@ -0,0 +1,73 @@
+SHOW VARIABLES LIKE 'server_id';
+Variable_name	Value
+server_id	1
+SHOW INSTANCES;
+instance_name	state
+mysqld1	XXXXX
+mysqld2	offline
+
+--------------------------------------------------------------------
+-- 1.1.2.
+--------------------------------------------------------------------
+START INSTANCE mysqld2;
+Success: the process has been started.
+SHOW VARIABLES LIKE 'port';
+Variable_name	Value
+port	IM_MYSQLD2_PORT
+
+--------------------------------------------------------------------
+-- 1.1.3.
+--------------------------------------------------------------------
+STOP INSTANCE mysqld2;
+Success: the process has been stopped.
+
+--------------------------------------------------------------------
+-- 1.1.4.
+--------------------------------------------------------------------
+START INSTANCE mysqld3;
+ERROR HY000: Unknown instance name
+START INSTANCE mysqld1;
+ERROR HY000: The instance is already started
+
+--------------------------------------------------------------------
+-- 1.1.5.
+--------------------------------------------------------------------
+STOP INSTANCE mysqld3;
+ERROR HY000: Unknown instance name
+
+--------------------------------------------------------------------
+-- 1.1.6.
+--------------------------------------------------------------------
+Killing the process...
+Waiting...
+Success: the process was restarted.
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld2	offline
+
+--------------------------------------------------------------------
+-- 1.1.7.
+--------------------------------------------------------------------
+START INSTANCE mysqld2;
+Success: the process has been started.
+Killing the process...
+Waiting...
+Success: the process was killed.
+
+--------------------------------------------------------------------
+-- 1.1.8.
+--------------------------------------------------------------------
+SHOW INSTANCE STATUS;
+ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
+
+--------------------------------------------------------------------
+-- BUG#12813
+--------------------------------------------------------------------
+START INSTANCE mysqld1,mysqld2,mysqld3;
+ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
+STOP INSTANCE mysqld1,mysqld2,mysqld3;
+ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
+STOP INSTANCE mysqld2;
+ERROR HY000: Cannot stop instance. Perhaps the instance is not started, or was started manually, so IM cannot find the pidfile.
+End of 5.0 tests

mysql-test/suite/im/r/im_options.result

@@ -0,0 +1,151 @@
+SHOW VARIABLES LIKE 'server_id';
+Variable_name	Value
+server_id	1
+SHOW INSTANCES;
+instance_name	state
+mysqld1	XXXXX
+mysqld2	offline
+UNSET mysqld1.server_id;
+ERROR HY000: The instance is active. Stop the instance first
+SET mysqld1.server_id = 11;
+ERROR HY000: The instance is active. Stop the instance first
+CREATE INSTANCE mysqld3
+datadir = '/',
+server_id = 3,
+socket = "$MYSQL_TMP_DIR/mysqld_3.sock";
+START INSTANCE mysqld3;
+UNSET mysqld3.server_id;
+ERROR HY000: The instance is active. Stop the instance first
+SET mysqld3.server_id = 11;
+ERROR HY000: The instance is active. Stop the instance first
+STOP INSTANCE mysqld3;
+SHOW INSTANCE STATUS mysqld3;
+instance_name	state	version_number	version	mysqld_compatible
+mysqld3	offline	VERSION_NUMBER	VERSION	no
+UNSET mysqld2.server_id;
+UNSET mysqld2.server_id;
+SHOW INSTANCE OPTIONS mysqld2;
+option_name	value
+instance_name	option_value
+socket	option_value
+pid-file	option_value
+port	option_value
+datadir	option_value
+log	option_value
+log-error	option_value
+log-slow-queries	option_value
+language	option_value
+character-sets-dir	option_value
+basedir	option_value
+shutdown-delay	option_value
+skip-stack-trace	option_value
+loose-skip-innodb	option_value
+loose-skip-ndbcluster	option_value
+nonguarded	option_value
+log-output	option_value
+SET mysqld2.server_id = 2;
+SET mysqld2.server_id = 2;
+SHOW INSTANCE OPTIONS mysqld2;
+option_name	value
+instance_name	option_value
+socket	option_value
+pid-file	option_value
+port	option_value
+datadir	option_value
+log	option_value
+log-error	option_value
+log-slow-queries	option_value
+language	option_value
+character-sets-dir	option_value
+basedir	option_value
+shutdown-delay	option_value
+skip-stack-trace	option_value
+loose-skip-innodb	option_value
+loose-skip-ndbcluster	option_value
+nonguarded	option_value
+log-output	option_value
+server_id	option_value
+UNSET mysqld2.server_id = 11;
+ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
+SET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc = 0010, mysqld3.ddd = 0020;
+--------------------------------------------------------------------
+aaa
+--------------------------------------------------------------------
+bbb
+--------------------------------------------------------------------
+ccc=0010
+--------------------------------------------------------------------
+ddd=0020
+--------------------------------------------------------------------
+UNSET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc, mysqld3.ddd;
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+SET mysqld2.aaa, mysqld3.bbb, mysqld.ccc = 0010;
+ERROR HY000: Unknown instance name
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+SET mysqld2.aaa, mysqld3.bbb, mysqld1.ccc = 0010;
+ERROR HY000: The instance is active. Stop the instance first
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+UNSET mysqld2.server_id, mysqld3.server_id, mysqld.ccc;
+ERROR HY000: Unknown instance name
+--------------------------------------------------------------------
+server_id           = 1
+server_id=2
+server_id=3
+--------------------------------------------------------------------
+UNSET mysqld2.server_id, mysqld3.server_id, mysqld1.ccc;
+ERROR HY000: The instance is active. Stop the instance first
+--------------------------------------------------------------------
+server_id           = 1
+server_id=2
+server_id=3
+--------------------------------------------------------------------
+DROP INSTANCE mysqld3;
+SET mysqld2.server_id=222;
+SET mysqld2.server_id = 222;
+SET   mysqld2.server_id   =  222  ;
+SET   mysqld2  .  server_id  =  222  ;
+SET   mysqld2  .  server_id  =  222  , mysqld2  .  aaa  , mysqld2  .  bbb  ;
+--------------------------------------------------------------------
+server_id           = 1
+server_id=222
+--------------------------------------------------------------------
+aaa
+--------------------------------------------------------------------
+bbb
+--------------------------------------------------------------------
+UNSET mysqld2  . aaa  ,  mysqld2  .  bbb ;
+--------------------------------------------------------------------
+server_id           = 1
+server_id=222
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+--------------------------------------------------------------------
+server_id           = 1
+server_id=222
+--------------------------------------------------------------------
+SHOW VARIABLES LIKE 'server_id';
+Variable_name	Value
+server_id	1
+SHOW INSTANCES;
+instance_name	state
+mysqld1	online
+mysqld2	offline
+FLUSH INSTANCES;
+ERROR HY000: At least one instance is active. Stop all instances first
+STOP INSTANCE mysqld1;
+SHOW INSTANCES;
+instance_name	state
+mysqld1	offline
+mysqld2	offline
+FLUSH INSTANCES;

mysql-test/suite/im/r/im_utils.result

@@ -0,0 +1,96 @@
+SHOW VARIABLES LIKE 'server_id';
+Variable_name	Value
+server_id	1
+SHOW INSTANCES;
+instance_name	state
+mysqld1	XXXXX
+mysqld2	offline
+SHOW INSTANCE OPTIONS mysqld1;
+option_name	value
+instance_name	VALUE
+socket	VALUE
+pid-file	VALUE
+port	VALUE
+datadir	VALUE
+log	VALUE
+log-error	VALUE
+log-slow-queries	VALUE
+language	VALUE
+character-sets-dir	VALUE
+basedir	VALUE
+server_id	VALUE
+shutdown-delay	VALUE
+skip-stack-trace	VALUE
+loose-skip-innodb	VALUE
+loose-skip-ndbcluster	VALUE
+log-output	VALUE
+SHOW INSTANCE OPTIONS mysqld2;
+option_name	value
+instance_name	VALUE
+socket	VALUE
+pid-file	VALUE
+port	VALUE
+datadir	VALUE
+log	VALUE
+log-error	VALUE
+log-slow-queries	VALUE
+language	VALUE
+character-sets-dir	VALUE
+basedir	VALUE
+server_id	VALUE
+shutdown-delay	VALUE
+skip-stack-trace	VALUE
+loose-skip-innodb	VALUE
+loose-skip-ndbcluster	VALUE
+nonguarded	VALUE
+log-output	VALUE
+START INSTANCE mysqld2;
+Success: the process has been started.
+STOP INSTANCE mysqld2;
+Success: the process has been stopped.
+SHOW mysqld1 LOG FILES;
+Logfile	Path	File size
+ERROR LOG	PATH	FILE_SIZE
+GENERAL LOG	PATH	FILE_SIZE
+SLOW LOG	PATH	FILE_SIZE
+SHOW mysqld2 LOG FILES;
+Logfile	Path	File size
+ERROR LOG	PATH	FILE_SIZE
+GENERAL LOG	PATH	FILE_SIZE
+SLOW LOG	PATH	FILE_SIZE
+SHOW mysqld1 LOG ERROR 10;
+Log
+LOG_DATA
+SHOW mysqld1 LOG SLOW 10;
+Log
+LOG_DATA
+SHOW mysqld1 LOG GENERAL 10;
+Log
+LOG_DATA
+SHOW mysqld1 LOG ERROR 10, 2;
+Log
+LOG_DATA
+SHOW mysqld1 LOG SLOW 10, 2;
+Log
+LOG_DATA
+SHOW mysqld1 LOG GENERAL 10, 2;
+Log
+LOG_DATA
+SHOW mysqld2 LOG ERROR 10;
+Log
+LOG_DATA
+SHOW mysqld2 LOG SLOW 10;
+Log
+LOG_DATA
+SHOW mysqld2 LOG GENERAL 10;
+Log
+LOG_DATA
+SHOW mysqld2 LOG ERROR 10, 2;
+Log
+LOG_DATA
+SHOW mysqld2 LOG SLOW 10, 2;
+Log
+LOG_DATA
+SHOW mysqld2 LOG GENERAL 10, 2;
+Log
+LOG_DATA

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

@@ -0,0 +1,20 @@
+##############################################################################
+#
+#  List the test cases that are to be disabled temporarily.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+#  Do not use any TAB characters for whitespace.
+#
+##############################################################################
+im_options               : Bug#20294 2006-07-24 stewart   Instance manager test im_options fails randomly
+im_daemon_life_cycle     : Bug#20294 2007-05-14 alik      Instance manager tests fail randomly
+im_cmd_line              : Bug#20294 2007-05-14 alik      Instance manager tests fail randomly
+im_utils                 : Bug#20294 2007-05-30 alik      Instance manager tests fail randomly
+im_instance_conf         : Bug#20294 2007-05-30 alik      Instance manager tests fail randomly
+im_life_cycle            : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance.
+im_instance_conf         : BUG#28743 Instance manager generates warnings in test suite
+im_utils                 : BUG#28743 Instance manager generates warnings in test suite
+

mysql-test/suite/im/t/im_check_env.inc

@@ -0,0 +1,26 @@
+# This file is intended to be used in each IM-test. It contains stamements,
+# that ensure that starting conditions (environment) for the IM-test are as
+# expected.
+
+# Check the running instances.
+
+--connect (mysql1_con,localhost,root,,mysql,$IM_MYSQLD1_PORT,$IM_MYSQLD1_SOCK)
+
+--connection mysql1_con
+
+SHOW VARIABLES LIKE 'server_id';
+
+--source include/not_windows.inc
+
+--connection default
+
+# Let IM detect that mysqld1 is online. This delay should be longer than
+# monitoring interval.
+
+--sleep 2
+
+# Check that IM understands that mysqld1 is online, while mysqld2 is
+# offline.
+
+--replace_result starting XXXXX online XXXXX
+SHOW INSTANCES;

mysql-test/suite/im/t/im_cmd_line.imtest

@@ -0,0 +1,68 @@
+###########################################################################
+#
+# Tests for user-management command-line options.
+#
+###########################################################################
+
+--source suite/im/t/im_check_env.inc
+
+###########################################################################
+
+# List users so we are sure about starting conditions.
+
+--echo --> Listing users...
+--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --list-users 2>&1 >/dev/null
+--echo
+
+# Add a new user.
+
+--echo ==> Adding user 'testuser'...
+--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --add-user --username=testuser --password=abc 2>&1 >/dev/null
+--echo
+
+--echo --> IM password file:
+--exec cat $IM_PASSWORD_PATH
+--echo --> EOF
+--echo
+
+--echo --> Printing out line for 'testuser'...
+--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --print-password-line --username=testuser --password=abc | tail -2 | head -1
+--echo
+
+--echo --> Listing users...
+--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --list-users 2>&1 >/dev/null
+--echo
+
+# Edit user's attributes.
+
+--echo ==> Changing the password of 'testuser'...
+--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --edit-user --username=testuser --password=xyz 2>&1 >/dev/null
+--echo
+
+--echo --> IM password file:
+--exec cat $IM_PASSWORD_PATH
+--echo --> EOF
+--echo
+
+--echo --> Printing out line for 'testuser'...
+--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --print-password-line --username=testuser --password=xyz | tail -2 | head -1
+--echo
+
+--echo --> Listing users...
+--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --list-users 2>&1 >/dev/null
+--echo
+
+# Drop user.
+
+--echo ==> Dropping user 'testuser'...
+--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --drop-user --username=testuser 2>&1 >/dev/null
+--echo
+
+--echo --> IM password file:
+--exec cat $IM_PASSWORD_PATH
+--echo --> EOF
+--echo
+
+--echo --> Listing users...
+--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --list-users 2>&1 >/dev/null
+--echo

mysql-test/suite/im/t/im_daemon_life_cycle-im.opt

@@ -0,0 +1,3 @@
+--run-as-service
+--log=$MYSQLTEST_VARDIR/log/im.log
+--monitoring-interval=1

mysql-test/suite/im/t/im_daemon_life_cycle.imtest

@@ -0,0 +1,100 @@
+let $UTIL=$MYSQL_TEST_DIR/suite/im/t;
+
+###########################################################################
+#
+# This file contains test for (1.2) test suite.
+#
+# Consult WL#2789 for more information.
+#
+###########################################################################
+
+--exec $UTIL/log.sh im_daemon_life_cycle im_daemon_life_cycle.imtest started.
+
+###########################################################################
+
+--source suite/im/t/im_check_env.inc
+
+# Turn on reconnect, not on by default anymore.
+--enable_reconnect
+
+###########################################################################
+#
+# The main daemon-life-cycle test case -- check that IM-angel will restart
+# IM-main if it got killed:
+#   - kill IM-main and check that IM-angel will restart it;
+#   - wait for IM-main to start accepting connections before continue test
+#     case;
+#
+# NOTE: timeout is 55 seconds. Timeout should be more than shutdown-delay
+# specified for managed MySQL instance. Now shutdown-delay is 10 seconds
+# (set in mysql-test-run.pl). So, 55 seconds should be enough to make 5
+# attempts.
+#
+###########################################################################
+
+--exec $UTIL/log.sh im_daemon_life_cycle Main-test: starting...
+
+--exec $UTIL/log.sh im_daemon_life_cycle Killing IM-main...
+--exec $UTIL/kill_n_check.sh $IM_PATH_PID restarted 55 im_daemon_life_cycle
+
+--exec $UTIL/log.sh im_daemon_life_cycle Waiting for IM-main to start accepting connections...
+--exec $UTIL/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 55 im_daemon_life_cycle
+
+--exec $UTIL/log.sh im_daemon_life_cycle Main-test: done.
+
+###########################################################################
+#
+# BUG#12751: Instance Manager: client hangs
+#   - start nonguarded instance (mysqld2);
+#   - kill IM-main and get it restarted by IM-angel;
+#   - check that guarded instance (mysqld1) is accepting connections.
+#   - check that non-guarded instance (mysqld2) were not stopped.
+#
+###########################################################################
+
+--echo
+--echo --------------------------------------------------------------------
+--echo -- Test for BUG#12751
+--echo --------------------------------------------------------------------
+
+--exec $UTIL/log.sh im_daemon_life_cycle BUG12751: starting...
+
+# 1. Start mysqld;
+
+--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: starting...
+START INSTANCE mysqld2;
+
+--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: waiting to start...
+--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 55 started im_daemon_life_cycle
+
+--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: started.
+
+# 2. Restart IM-main;
+
+--exec $UTIL/log.sh im_daemon_life_cycle Killing IM-main...
+--exec $UTIL/kill_n_check.sh $IM_PATH_PID restarted 55 im_daemon_life_cycle
+
+--exec $UTIL/log.sh im_daemon_life_cycle Waiting for IM-main to start accepting connections...
+--exec $UTIL/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 55 im_daemon_life_cycle
+
+# 3. Issue some statement -- connection should be re-established.
+
+--exec $UTIL/log.sh im_daemon_life_cycle Checking that IM-main processing commands...
+
+--replace_column 2 STATE 3 VERSION_NUMBER 4 VERSION
+SHOW INSTANCE STATUS mysqld1;
+
+# 4. Stop mysqld2, because it will not be stopped by IM, as it is nonguarded.
+# So, if it we do not stop it, it will be stopped by mysql-test-run.pl with
+# warning.
+
+--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: stopping...
+STOP INSTANCE mysqld2;
+
+--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: waiting to stop...
+--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 55 stopped im_daemon_life_cycle
+--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: stopped.
+
+###########################################################################
+
+--exec $UTIL/log.sh im_daemon_life_cycle BUG12751: done.

mysql-test/suite/im/t/im_instance_conf-im.opt

@@ -0,0 +1 @@
+--monitoring-interval=1

mysql-test/suite/im/t/im_instance_conf.imtest

@@ -0,0 +1,244 @@
+###########################################################################
+#
+# This test suite checks the following statements:
+#   - CREATE INSTANCE <instance_name> [option1[=option1_value], ...];
+#   - DROP INSTANCE <instance_name>;
+#
+# For CREATE INSTANCE we check that:
+#   - CREATE INSTANCE succeeds for non-existing instance;
+#   - CREATE INSTANCE fails for existing instance;
+#   - CREATE INSTANCE can get additional options with and w/o values;
+#   - CREATE INSTANCE parses options and handles grammar errors correctly.
+#     Check that strings with spaces are handled correctly, unknown (for
+#     mysqld) options should also be handled;
+#   - CREATE INSTANCE updates both config file and internal configuration cache;
+#   - CREATE INSTANCE allows to create instances only with properly formed
+#     names (mysqld*);
+#
+# For DROP INSTANCE we check that:
+#   - DROP INSTANCE succeeds for existing instance;
+#   - DROP INSTANCE fails for non-existing instance;
+#   - DROP INSTANCE fails for active instance.
+#   - DROP INSTANCE updates both config file and internal configuration cache;
+#
+# NOTE: each CREATE INSTANCE statement must specify socket-file-name, otherwise
+# this results of the test can be affected by another running test suite.
+#
+###########################################################################
+
+--source suite/im/t/im_check_env.inc
+
+###########################################################################
+#
+# Check starting conditions.
+#
+###########################################################################
+
+# Check that the configuration file contains only instances that we expect.
+
+--echo --------------------------------------------------------------------
+--exec grep '^server_id[^a-zA-Z0-9_\-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+
+###########################################################################
+#
+# CREATE INSTANCE tests.
+#
+###########################################################################
+
+# Check that CREATE INSTANCE succeeds for non-existing instance and also check
+# that both config file and internal configuration cache have been updated.
+
+CREATE INSTANCE mysqld3
+  server_id = 3,
+  socket = "$MYSQL_TMP_DIR/mysqld_3.sock";
+
+SHOW INSTANCES;
+ 
+--echo --------------------------------------------------------------------
+--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+
+# Check that CREATE INSTANCE fails for existing instance. Let's all three
+# existing instances (running one, stopped one and just created one). Just in
+# case...
+
+--error 3012 # ER_CREATE_EXISTING_INSTANCE
+CREATE INSTANCE mysqld1;
+
+--error 3012 # ER_CREATE_EXISTING_INSTANCE
+CREATE INSTANCE mysqld2;
+
+--error 3012 # ER_CREATE_EXISTING_INSTANCE
+CREATE INSTANCE mysqld3;
+
+# Check that CREATE INSTANCE can get additional options with and w/o values.
+# Ensure that config file is updated properly.
+
+#   - without values;
+
+--echo --------------------------------------------------------------------
+--exec grep "^nonguarded\$" $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+
+CREATE INSTANCE mysqld4
+  nonguarded,
+  server_id = 4,
+  socket = "$MYSQL_TMP_DIR/mysqld_4.sock";
+
+SHOW INSTANCES;
+
+--echo --------------------------------------------------------------------
+--exec grep "^nonguarded\$" $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+
+#   - with value;
+
+--echo --------------------------------------------------------------------
+--exec grep '^test-A[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^test-B[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+
+CREATE INSTANCE mysqld5
+  test-A = 000,
+  test-B = test,
+  server_id = 5,
+  socket = "$MYSQL_TMP_DIR/mysqld_5.sock";
+
+SHOW INSTANCES;
+
+--echo --------------------------------------------------------------------
+--exec grep '^test-A[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+--exec grep '^test-B[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+
+# Check that CREATE INSTANCE parses options and handles grammar errors
+# correctly. Check that strings with spaces are handled correctly,
+# unknown (for mysqld) options should also be handled.
+
+#   - check handling of extra spaces;
+
+--echo --------------------------------------------------------------------
+--exec grep '^test-C1[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^test-C2[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+
+CREATE INSTANCE mysqld6
+  test-C1  =  10  ,
+  test-C2  =  02  ,
+  server_id = 6,
+  socket = "$MYSQL_TMP_DIR/mysqld_6.sock";
+
+SHOW INSTANCES;
+
+--echo --------------------------------------------------------------------
+--exec grep '^test-C1[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+--exec grep '^test-C2[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+
+#   - check handling of grammar error;
+
+--echo --------------------------------------------------------------------
+--exec grep '^test-D[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^test-E[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+
+--error ER_SYNTAX_ERROR
+CREATE INSTANCE mysqld7  test-D  =  test-D-value  ;
+SHOW INSTANCES;
+
+--error ER_SYNTAX_ERROR
+CREATE INSTANCE mysqld8  test-E  0  ;
+SHOW INSTANCES;
+
+--error ER_SYNTAX_ERROR
+CREATE INSTANCE mysqld8  test-F  =  ;
+SHOW INSTANCES;
+
+--echo --------------------------------------------------------------------
+--exec grep '^test-D[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^test-E[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+
+#   - check parsing of string option values
+
+--echo --------------------------------------------------------------------
+--exec grep '^test-1[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^test-2[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^test-3[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^test-4[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^test-5[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^test-6[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^test-7[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+
+CREATE INSTANCE mysqld9
+  test-1=" hello world ",
+  test-2='  ',
+  server_id = 9,
+  socket = "$MYSQL_TMP_DIR/mysqld_9.sock";
+SHOW INSTANCES;
+
+CREATE INSTANCE mysqld10
+  test-3='\b\babc\sdef',
+  server_id = 10,
+  socket = "$MYSQL_TMP_DIR/mysqld_10.sock";
+# test-3='abc def'
+SHOW INSTANCES;
+
+CREATE INSTANCE mysqld11
+  test-4='abc\tdef',
+  test-5='abc\ndef',
+  server_id = 11,
+  socket = "$MYSQL_TMP_DIR/mysqld_11.sock";
+SHOW INSTANCES;
+
+CREATE INSTANCE mysqld12
+  test-6="abc\rdef",
+  test-7="abc\\def",
+  server_id = 12,
+  socket = "$MYSQL_TMP_DIR/mysqld_12.sock";
+# test-6=abc
+SHOW INSTANCES;
+
+--error ER_SYNTAX_ERROR
+CREATE INSTANCE mysqld13 test-bad=' \ ';
+SHOW INSTANCES;
+
+--echo --------------------------------------------------------------------
+--exec grep '^test-1[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+--exec grep '^test-2[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+--exec grep '^test-3[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+--exec grep '^test-4[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+--exec grep '^test-5[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+--exec grep '^test-6[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+--exec grep '^test-7[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+--exec grep '^test-bad' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+
+
+# Check that CREATE INSTANCE allows to create instances only with properly
+# formed names (mysqld*).
+
+--error 3014 # ER_MALFORMED_INSTANCE_NAME
+CREATE INSTANCE qqq1;
+

mysql-test/suite/im/t/im_life_cycle-im.opt

@@ -0,0 +1 @@
+--monitoring-interval=1

mysql-test/suite/im/t/im_life_cycle.imtest

@@ -0,0 +1,205 @@
+let $UTIL=$MYSQL_TEST_DIR/suite/im/t;
+
+###########################################################################
+#
+# This file contains test for (1.1) test suite.
+#
+# Consult WL#2789 for more information.
+#
+###########################################################################
+
+--source suite/im/t/im_check_env.inc
+
+###########################################################################
+#
+# 1.1.2. Check 'START INSTANCE' command:
+#  - start the second instance;
+#  - check that it is reported as online;
+#  - execute some SQL-statement on mysqld2 to ensure that it is really up and
+#    running;
+#
+###########################################################################
+
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.2.
+--echo --------------------------------------------------------------------
+
+START INSTANCE mysqld2;
+# FIXME: START INSTANCE should be synchronous.
+--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_life_cycle
+
+# FIXME: Result of SHOW INSTANCES here is not deterministic unless START
+# INSTANCE is synchronous. Even waiting for mysqld to start by looking at
+# its pid file is not enough, because it is unknown when IM detects that
+# mysqld has started.
+# SHOW INSTANCES;
+
+--connect (mysql_con,localhost,root,,mysql,$IM_MYSQLD2_PORT,$IM_MYSQLD2_SOCK)
+--connection mysql_con
+
+--replace_result $IM_MYSQLD2_PORT IM_MYSQLD2_PORT
+SHOW VARIABLES LIKE 'port';
+
+--connection default
+--disconnect mysql_con
+
+###########################################################################
+#
+# 1.1.3. Check 'STOP INSTANCE' command:
+#  - stop the second instance;
+#  - check that it is reported as offline;
+#  - TODO: try to execute some SQL-statement to ensure that it is really down;
+#
+###########################################################################
+
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.3.
+--echo --------------------------------------------------------------------
+
+STOP INSTANCE mysqld2;
+# FIXME: STOP INSTANCE should be synchronous.
+--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped im_life_cycle
+
+# FIXME: Result of SHOW INSTANCES here is not deterministic unless START
+# INSTANCE is synchronous. Even waiting for mysqld to start by looking at
+# its pid file is not enough, because it is unknown when IM detects that
+# mysqld has started.
+# SHOW INSTANCES;
+
+###########################################################################
+#
+# 1.1.4. Check that Instance Manager reports correct errors for 'START
+# INSTANCE' command:
+#   - if the client tries to start unregistered instance;
+#   - if the client tries to start already started instance;
+#   - if the client submits invalid arguments;
+#
+###########################################################################
+
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.4.
+--echo --------------------------------------------------------------------
+
+--error 3000 # ER_BAD_INSTANCE_NAME
+START INSTANCE mysqld3;
+
+--error 3002 # ER_INSTANCE_ALREADY_STARTED
+START INSTANCE mysqld1;
+
+###########################################################################
+#
+# 1.1.5. Check that Instance Manager reports correct errors for
+#        'STOP INSTANCE' command:
+#   - if the client tries to start unregistered instance;
+#   - if the client tries to start already stopped instance;
+#   - if the client submits invalid arguments;
+#
+###########################################################################
+
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.5.
+--echo --------------------------------------------------------------------
+
+--error 3000 # ER_BAD_INSTANCE_NAME
+STOP INSTANCE mysqld3;
+
+# TODO: IM should be fixed.
+# BUG#12673: Instance Manager allows to stop the instance many times
+# --error 3002 # ER_INSTANCE_ALREADY_STARTED
+# STOP INSTANCE mysqld2;
+
+###########################################################################
+#
+# 1.1.6. Check that Instance Manager is able to restart guarded instances.
+#
+###########################################################################
+
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.6.
+--echo --------------------------------------------------------------------
+
+--exec $UTIL/kill_n_check.sh $IM_MYSQLD1_PATH_PID restarted 30 im_life_cycle
+
+# Give some time to IM to detect that mysqld was restarted. It should be
+# longer than monitoring interval.
+
+--sleep 3
+
+SHOW INSTANCES;
+
+###########################################################################
+#
+# 1.1.7. Check that Instance Manager does not restart non-guarded instance.
+#
+###########################################################################
+
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.7.
+--echo --------------------------------------------------------------------
+
+START INSTANCE mysqld2;
+# FIXME: START INSTANCE should be synchronous.
+--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_life_cycle
+
+# FIXME: Result of SHOW INSTANCES here is not deterministic unless START
+# INSTANCE is synchronous. Even waiting for mysqld to start by looking at
+# its pid file is not enough, because it is unknown when IM detects that
+# mysqld has started.
+# SHOW INSTANCES;
+
+--exec $UTIL/kill_n_check.sh $IM_MYSQLD2_PATH_PID killed 10 im_life_cycle
+
+# FIXME: Result of SHOW INSTANCES here is not deterministic unless START
+# INSTANCE is synchronous. Even waiting for mysqld to start by looking at
+# its pid file is not enough, because it is unknown when IM detects that
+# mysqld has started.
+# SHOW INSTANCES;
+
+###########################################################################
+#
+# 1.1.8. Check that Instance Manager returns an error on
+# incomplete SHOW INSTANCE STATUS command.
+#
+###########################################################################
+
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.8.
+--echo --------------------------------------------------------------------
+
+--error ER_SYNTAX_ERROR
+SHOW INSTANCE STATUS;
+
+#
+# Tests for bug fixes
+#
+
+#
+# Bug #12813    Instance Manager: START/STOP INSTANCE commands accept
+#                                 a list as argument.
+#
+
+--echo
+--echo --------------------------------------------------------------------
+--echo -- BUG#12813
+--echo --------------------------------------------------------------------
+
+--error ER_SYNTAX_ERROR
+START INSTANCE mysqld1,mysqld2,mysqld3;
+
+--error ER_SYNTAX_ERROR
+STOP INSTANCE mysqld1,mysqld2,mysqld3;
+
+#
+# Bug #12673: Instance Manager: allows to stop the instance many times
+#
+--error 3001
+STOP INSTANCE mysqld2;
+
+--echo End of 5.0 tests

mysql-test/suite/im/t/im_options-im.opt

@@ -0,0 +1 @@
+--monitoring-interval=1

mysql-test/suite/im/t/im_options.imtest

@@ -0,0 +1,248 @@
+###########################################################################
+#
+# This test suite checks the following statements:
+#   - SET <instance id>.<option name> = <option value>;
+#   - UNSET <instance id>.<option name> = <option value>;
+#   - FLUSH INSTANCES;
+#
+# For SET/UNSET we check that:
+#   - SET ignores spaces correctly;
+#   - UNSET does not allow option-value part (= <option value>);
+#   - SET/UNSET can be applied several times w/o error;
+#   - SET/UNSET is allowed only for stopped instances;
+#   - SET/UNSET updates both the configuration cache in IM and
+#     the configuration file;
+#
+# For FLUSH INSTANCES we check that:
+#   - FLUSH INSTANCES is allowed only when all instances are stopped;
+#
+# According to the IM implementation details, we should play at least with the
+# following options:
+#   - server_id
+#   - port
+#   - nonguarded
+#
+# Let's test SET statement on the option 'server_id'. It's expected that
+# originally the instances have the following server ids and states:
+#  - mysqld1: server_id: 1; running (online)
+#  - mysqld2: server_id: 2; stopped (offline)
+#
+# NOTE: each CREATE INSTANCE statement must specify socket-file-name, otherwise
+# this results of the test can be affected by another running test suite.
+#
+###########################################################################
+
+--source suite/im/t/im_check_env.inc
+
+###########################################################################
+#
+# Check that SET/UNSET is allowed only for stopped instances.
+#
+###########################################################################
+
+# - check that SET/UNSET is denied for running instances;
+
+--error 3015 # ER_INSTANCE_IS_ACTIVE
+UNSET mysqld1.server_id;
+
+--error 3015 # ER_INSTANCE_IS_ACTIVE
+SET mysqld1.server_id = 11;
+
+# - check that SET/UNSET is denied for active instances:
+#   - create dummy misconfigured instance;
+#   - start it;
+#   - try to set/unset options;
+
+CREATE INSTANCE mysqld3
+  datadir = '/',
+  server_id = 3,
+  socket = "$MYSQL_TMP_DIR/mysqld_3.sock";
+START INSTANCE mysqld3;
+
+# FIXME: START INSTANCE should be synchronous.
+--sleep 3
+# should be longer than monitoring interval and enough to start instance.
+
+# NOTE: We can not analyze state of the instance here -- it can be Failed or
+# Starting because Instance Manager is trying to start the misconfigured
+# instance several times.
+
+--error 3015 # ER_INSTANCE_IS_ACTIVE
+UNSET mysqld3.server_id;
+
+--error 3015 # ER_INSTANCE_IS_ACTIVE
+SET mysqld3.server_id = 11;
+
+STOP INSTANCE mysqld3;
+
+# FIXME: STOP INSTANCE should be synchronous.
+--sleep 3
+# should be longer than monitoring interval and enough to stop instance.
+
+--replace_column 3 VERSION_NUMBER 4 VERSION
+SHOW INSTANCE STATUS mysqld3;
+
+# - check that SET/UNSET succeed for stopped instances;
+# - check that SET/UNSET can be applied multiple times;
+
+UNSET mysqld2.server_id;
+UNSET mysqld2.server_id;
+
+--replace_column 2 option_value
+SHOW INSTANCE OPTIONS mysqld2;
+
+SET mysqld2.server_id = 2;
+SET mysqld2.server_id = 2;
+
+--replace_column 2 option_value
+SHOW INSTANCE OPTIONS mysqld2;
+
+# - check that UNSET does not allow option-value part (= <option value>);
+
+--error ER_SYNTAX_ERROR
+UNSET mysqld2.server_id = 11;
+
+# - check that SET/UNSET working properly with multiple options;
+
+SET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc = 0010, mysqld3.ddd = 0020;
+
+--echo --------------------------------------------------------------------
+--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf ;
+--echo --------------------------------------------------------------------
+--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf ;
+--echo --------------------------------------------------------------------
+--exec grep '^ccc[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;
+--echo --------------------------------------------------------------------
+--exec grep '^ddd[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;
+--echo --------------------------------------------------------------------
+
+UNSET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc, mysqld3.ddd;
+
+--echo --------------------------------------------------------------------
+--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^ccc[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^ddd[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+
+# - check that if some instance name is invalid or the active is active,
+#   whole SET-statement will not be executed;
+
+--error 3000 # ER_BAD_INSTANCE_NAME
+SET mysqld2.aaa, mysqld3.bbb, mysqld.ccc = 0010;
+
+--echo --------------------------------------------------------------------
+--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^ccc[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+
+--error 3015 # ER_INSTANCE_IS_ACTIVE
+SET mysqld2.aaa, mysqld3.bbb, mysqld1.ccc = 0010;
+
+--echo --------------------------------------------------------------------
+--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep '^ccc[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+
+# - check that if some instance name is invalid or the active is active,
+#   whole UNSET-statement will not be executed;
+
+--error 3000 # ER_BAD_INSTANCE_NAME
+UNSET mysqld2.server_id, mysqld3.server_id, mysqld.ccc;
+
+--echo --------------------------------------------------------------------
+--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+
+--error 3015 # ER_INSTANCE_IS_ACTIVE
+UNSET mysqld2.server_id, mysqld3.server_id, mysqld1.ccc;
+
+--echo --------------------------------------------------------------------
+--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;
+--echo --------------------------------------------------------------------
+
+DROP INSTANCE mysqld3;
+
+# - check that spaces are handled correctly;
+
+SET mysqld2.server_id=222;
+SET mysqld2.server_id = 222;
+SET   mysqld2.server_id   =  222  ;
+SET   mysqld2  .  server_id  =  222  ;
+SET   mysqld2  .  server_id  =  222  , mysqld2  .  aaa  , mysqld2  .  bbb  ;
+
+--echo --------------------------------------------------------------------
+--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;
+--echo --------------------------------------------------------------------
+--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf ;
+--echo --------------------------------------------------------------------
+--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf ;
+--echo --------------------------------------------------------------------
+
+UNSET mysqld2  . aaa  ,  mysqld2  .  bbb ;
+
+--echo --------------------------------------------------------------------
+--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;
+--echo --------------------------------------------------------------------
+--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf || true;
+--echo --------------------------------------------------------------------
+
+###########################################################################
+#
+# Check that SET/UNSET updates both the configuration cache in IM and
+# the configuration file.
+#
+###########################################################################
+
+#   - check that the configuration file has been updated (i.e. contains
+#     server_id=SERVER_ID for mysqld2);
+
+--echo --------------------------------------------------------------------
+--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;
+--echo --------------------------------------------------------------------
+
+#   - (for mysqld1) check that the running instance has not been affected:
+#     connect to the instance and check that 'SHOW VARIABLES LIKE 'server_id''
+#     returns zero;
+
+--connection mysql1_con
+
+SHOW VARIABLES LIKE 'server_id';
+
+--connection default
+
+#   - check that internal cache of Instance Manager has been affected;
+#     TODO: we should check only server_id option here.
+
+# SHOW INSTANCE OPTIONS mysqld2;
+
+###########################################################################
+#
+# Check that FLUSH INSTANCES is allowed only when all instances are stopped.
+#
+###########################################################################
+
+SHOW INSTANCES;
+
+--error 3016 # ER_THERE_IS_ACTIVE_INSTACE
+FLUSH INSTANCES;
+
+STOP INSTANCE mysqld1;
+# FIXME: STOP INSTANCE should be synchronous.
+--sleep 3
+# should be longer than monitoring interval and enough to stop instance.
+
+SHOW INSTANCES;
+
+FLUSH INSTANCES;

mysql-test/suite/im/t/im_utils-im.opt

@@ -0,0 +1 @@
+--monitoring-interval=1

mysql-test/suite/im/t/im_utils.imtest

@@ -0,0 +1,107 @@
+###########################################################################
+#
+# This file contains test for (2) test suite.
+#
+# Consult WL#2789 for more information.
+#
+###########################################################################
+
+--source suite/im/t/im_check_env.inc
+
+let $UTIL=$MYSQL_TEST_DIR/suite/im/t;
+
+###########################################################################
+
+#
+# Check 'SHOW INSTANCE OPTIONS' command.
+#
+# Since configuration of an mysqld-instance contains directories, we should
+# completely ignore the second column (values) in order to make the test
+# case produce the same results on different installations;
+# TODO: ignore values of only directory-specific options.
+#
+
+--replace_column 2 VALUE
+SHOW INSTANCE OPTIONS mysqld1;
+
+--replace_column 2 VALUE
+SHOW INSTANCE OPTIONS mysqld2;
+
+#
+# Before checking log files, we should start the second instance (mysqld2) to
+# give it a chance to create log files.
+#
+
+START INSTANCE mysqld2;
+--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_utils
+
+STOP INSTANCE mysqld2;
+--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped im_utils
+
+#
+# Check 'SHOW LOG FILES' command:
+#  - check that log files of both offline and online instances are accessible;
+#  - since placement of the log files is installation-specific, we should
+#    ignore it in comparisson;
+#  - also, we should ignore log file size, since it may depend on the version
+#    being tested;
+#
+
+--replace_column 2 PATH 3 FILE_SIZE
+SHOW mysqld1 LOG FILES;
+
+--replace_column 2 PATH 3 FILE_SIZE
+SHOW mysqld2 LOG FILES;
+
+#
+# Check 'SHOW LOG' command:
+#  - check that all three kinds of logs are available for both offline and
+#    online instances;
+#  - we should ignore the value, because it is very specific and depends on
+#    many factors; we only check that Instance Manager is able to provide log
+#    files.
+#
+
+# mysqld1 (online) w/o the optional argument.
+
+--replace_column 1 LOG_DATA
+SHOW mysqld1 LOG ERROR 10;
+
+--replace_column 1 LOG_DATA
+SHOW mysqld1 LOG SLOW 10;
+
+--replace_column 1 LOG_DATA
+SHOW mysqld1 LOG GENERAL 10;
+
+# mysqld1 (online) with the optional argument.
+
+--replace_column 1 LOG_DATA
+SHOW mysqld1 LOG ERROR 10, 2;
+
+--replace_column 1 LOG_DATA
+SHOW mysqld1 LOG SLOW 10, 2;
+
+--replace_column 1 LOG_DATA
+SHOW mysqld1 LOG GENERAL 10, 2;
+
+# mysqld2 (offline) w/o the optional argument.
+
+--replace_column 1 LOG_DATA
+SHOW mysqld2 LOG ERROR 10;
+
+--replace_column 1 LOG_DATA
+SHOW mysqld2 LOG SLOW 10;
+
+--replace_column 1 LOG_DATA
+SHOW mysqld2 LOG GENERAL 10;
+
+# mysqld2 (offline) with the optional argument.
+
+--replace_column 1 LOG_DATA
+SHOW mysqld2 LOG ERROR 10, 2;
+
+--replace_column 1 LOG_DATA
+SHOW mysqld2 LOG SLOW 10, 2;
+
+--replace_column 1 LOG_DATA
+SHOW mysqld2 LOG GENERAL 10, 2;

mysql-test/suite/im/t/kill_n_check.sh

@@ -0,0 +1,147 @@
+#!/bin/sh
+
+###########################################################################
+
+# NOTE: this script returns 0 (success) even in case of failure (except for
+# usage-error). This is because this script is executed under
+# mysql-test-run[.pl] and it's better to examine particular problem in log
+# file, than just having said that the test case has failed.
+
+###########################################################################
+
+basename=`basename "$0"`
+dirname=`dirname "$0"`
+
+###########################################################################
+
+. "$dirname/utils.sh"
+
+###########################################################################
+
+check_restart()
+{
+  if [ ! -r "$pid_path" ]; then
+    log_debug "No '$pid_path' found."
+    user_msg='the process was killed'
+    return 1
+  fi
+
+  new_pid=`cat "$pid_path" 2>/dev/null`
+  err_code=$?
+
+  log_debug "err_code: $err_code; original_pid: $original_pid; new_pid: $new_pid."
+
+  if [ $err_code -eq 0 -a "$original_pid" = "$new_pid" ]; then
+    log_debug "The process was not restarted."
+    user_msg='the process was not restarted'
+    return 1
+  fi
+
+  log_debug "The process was restarted."
+  user_msg='the process was restarted'
+  return 0
+}
+
+###########################################################################
+
+if [ $# -ne 4 ]; then
+  echo "Usage: $basename <pid file path> killed|restarted <timeout> <test id>"
+  exit 1
+fi
+
+pid_path="$1"
+expected_result="$2"
+total_timeout="$3"
+test_id="$4"
+log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"
+
+log_debug "-- $basename: starting --"
+log_debug "pid_path: '$pid_path'"
+log_debug "expected_result: '$expected_result'"
+log_debug "total_timeout: '$total_timeout'"
+log_debug "test_id: '$test_id'"
+log_debug "log_file: '$log_file'"
+
+###########################################################################
+
+if [ "$expected_result" != 'killed' -a \
+     "$expected_result" != 'restarted' ]; then
+  log_error "Invalid second argument ($expected_result): 'killed' or 'restarted' expected."
+  quit 0
+fi
+
+if [ -z "$pid_path" ]; then
+  log_error "Invalid PID path ($pid_path)."
+  quit 0
+fi
+
+if [ ! -r "$pid_path" ]; then
+  log_error "PID file ($pid_path) does not exist."
+  quit 0
+fi
+
+if [ -z "$total_timeout" ]; then
+  log_error "Timeout is not specified."
+  quit 0
+fi
+
+###########################################################################
+
+original_pid=`cat "$pid_path"`
+log_debug "original_pid: $original_pid."
+
+log_info "Killing the process..."
+
+kill -9 $original_pid
+
+###########################################################################
+
+log_info "Waiting..."
+
+if [ "$expected_result" = "restarted" ]; then
+
+  # Wait for the process to restart.
+
+  cur_attempt=1
+
+  while true; do
+
+    log_debug "cur_attempt: $cur_attempt."
+
+    if check_restart; then
+      log_info "Success: $user_msg."
+      quit 0
+    fi
+
+    [ $cur_attempt -ge $total_timeout ] && break
+
+    log_debug "Sleeping for 1 second..."
+    sleep 1
+
+    cur_attempt=`expr $cur_attempt + 1`
+
+  done
+
+  log_error "$user_msg."
+  quit 0
+
+else # $expected_result == killed
+
+  # Here we have to sleep for some long time to ensure that the process will
+  # not be restarted.
+
+  log_debug "Sleeping for $total_timeout seconds..."
+  sleep $total_timeout
+
+  new_pid=`cat "$pid_path" 2>/dev/null`
+  log_debug "new_pid: $new_pid."
+
+  if [ "$new_pid" -a "$new_pid" -ne "$original_pid" ]; then
+    log_error "The process was restarted."
+  else
+    log_info "Success: the process was killed."
+  fi
+
+  quit 0
+
+fi

mysql-test/suite/im/t/log.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+###########################################################################
+
+basename=`basename "$0"`
+dirname=`dirname "$0"`
+
+###########################################################################
+
+. "$dirname/utils.sh"
+
+###########################################################################
+
+if [ $# -lt 2 ]; then
+  echo "Usage: $basename <test id> log message ..."
+  exit 1
+fi
+
+test_id="$1"
+log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"
+
+shift
+
+log_debug "$*"

mysql-test/suite/im/t/utils.sh

@@ -0,0 +1,55 @@
+###########################################################################
+#
+# This file provides utility functions and is included by other scripts.
+#
+# The following global variables must be set before calling functions from this
+# file:
+#   - basename -- base name of the calling script (main application);
+#   - log_file -- where to store log records;
+#
+###########################################################################
+
+log()
+{
+  [ -z "$log_file" ] && return;
+
+  log_level="$1"
+  log_msg="$2"
+  ts=`date`
+
+  echo "[$ts] [$basename] [$log_level] $log_msg" >> "$log_file";
+}
+
+###########################################################################
+
+log_debug()
+{
+  log 'DEBUG' "$1"
+}
+
+###########################################################################
+
+log_info()
+{
+  log 'INFO' "$1"
+  echo "$1"
+}
+
+###########################################################################
+
+log_error()
+{
+  log 'ERROR' "$1"
+  echo "Error: $1"
+}
+
+###########################################################################
+
+quit()
+{
+  exit_status="$1"
+
+  log_debug "-- $basename: finished (exit_status: $exit_status) --"
+
+  exit $exit_status
+}

mysql-test/suite/im/t/wait_for_process.sh

@@ -0,0 +1,114 @@
+#!/bin/sh
+
+###########################################################################
+
+# NOTE: this script returns 0 (success) even in case of failure (except for
+# usage-error). This is because this script is executed under
+# mysql-test-run[.pl] and it's better to examine particular problem in log
+# file, than just having said that the test case has failed.
+
+###########################################################################
+
+basename=`basename "$0"`
+dirname=`dirname "$0"`
+
+###########################################################################
+
+. "$dirname/utils.sh"
+
+###########################################################################
+
+check_started()
+{
+  if [ ! -r "$pid_path" ]; then
+    log_debug "No PID-file ($pid_path) found -- not started."
+    return 1
+  fi
+
+  new_pid=`cat "$pid_path" 2>/dev/null`
+  err_code=$?
+
+  log_debug "err_code: $err_code; new_pid: $new_pid."
+
+  if [ $? -ne 0 -o -z "$new_pid" ]; then
+    log_debug "The process was not started."
+    return 1
+  fi
+
+  log_debug "The process was started."
+  return 0
+}
+
+###########################################################################
+
+check_stopped()
+{
+  if [ -r "$pid_path" ]; then
+    log_debug "PID-file '$pid_path' exists -- not stopped."
+    return 1
+  fi
+
+  log_debug "No PID-file ($pid_path) found -- stopped."
+  return 0
+}
+
+###########################################################################
+
+if [ $# -ne 4 ]; then
+  echo "Usage: $basename <pid file path> <total attempts> started|stopped <test id>"
+  exit 1
+fi
+
+pid_path="$1"
+total_attempts="$2"
+event="$3"
+test_id="$4"
+log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"
+
+log_debug "-- $basename: starting --"
+log_debug "pid_path: '$pid_path'"
+log_debug "total_attempts: '$total_attempts'"
+log_debug "event: '$event'"
+log_debug "test_id: '$test_id'"
+log_debug "log_file: '$log_file'"
+
+###########################################################################
+
+case "$event" in
+  started)
+    check_fn='check_started';
+    ;;
+
+  stopped)
+    check_fn='check_stopped';
+    ;;
+
+  *)
+    log_error "Invalid third argument ('started' or 'stopped' expected)."
+    quit 0
+esac
+
+###########################################################################
+
+cur_attempt=1
+
+while true; do
+
+  log_debug "cur_attempt: $cur_attempt."
+
+  if ( eval $check_fn ); then
+    log_info "Success: the process has been $event."
+    quit 0
+  fi
+
+  [ $cur_attempt -ge $total_attempts ] && break
+
+  log_debug "Sleeping for 1 second..."
+  sleep 1
+
+  cur_attempt=`expr $cur_attempt + 1`
+
+done
+
+log_error "The process has not been $event in $total_attempts secs."
+quit 0

mysql-test/suite/im/t/wait_for_socket.sh

@@ -0,0 +1,94 @@
+#!/bin/sh
+
+###########################################################################
+
+# NOTE: this script returns 0 (success) even in case of failure (except for
+# usage-error). This is because this script is executed under
+# mysql-test-run[.pl] and it's better to examine particular problem in log
+# file, than just having said that the test case has failed.
+
+###########################################################################
+
+basename=`basename "$0"`
+dirname=`dirname "$0"`
+
+###########################################################################
+
+. "$dirname/utils.sh"
+
+###########################################################################
+
+if [ $# -ne 7 ]; then
+  echo "Usage: wait_for_socket.sh <executable path> <socket path> <username> <password> <db> <timeout> <test id>"
+  exit 1
+fi
+
+client_exe="$1"
+socket_path="$2"
+username="$3"
+password="$4"
+db="$5"
+total_timeout="$6"
+test_id="$7"
+log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"
+
+log_debug "-- $basename: starting --"
+log_debug "client_exe: '$client_exe'"
+log_debug "socket_path: '$socket_path'"
+log_debug "username: '$username'"
+log_debug "password: '$password'"
+log_debug "db: '$db'"
+log_debug "total_timeout: '$total_timeout'"
+log_debug "test_id: '$test_id'"
+log_debug "log_file: '$log_file'"
+
+###########################################################################
+
+if [ -z "$client_exe" ]; then
+  log_error "Invalid path to client executable ($client_exe)."
+  quit 0;
+fi
+
+if [ ! -x "$client_exe" ]; then
+  log_error "Client by path '$client_exe' is not available."
+  quit 0;
+fi
+
+if [ -z "$socket_path" ]; then
+  log_error "Invalid socket patch ($socket_path)."
+  quit 0
+fi
+
+###########################################################################
+
+client_args="--no-defaults --silent --socket=$socket_path --connect_timeout=1 "
+
+[ -n "$username" ] && client_args="$client_args --user=$username "
+[ -n "$password" ] && client_args="$client_args --password=$password "
+[ -n "$db" ] && client_args="$client_args $db"
+
+log_debug "client_args: '$client_args'"
+
+###########################################################################
+
+cur_attempt=1
+
+while true; do
+
+  log_debug "cur_attempt: $cur_attempt."
+
+  if ( echo 'quit' | "$client_exe" $client_args >/dev/null 2>&1 ); then
+    log_info "Success: server is ready to accept connection on socket."
+    quit 0
+  fi
+
+  [ $cur_attempt -ge $total_timeout ] && break
+
+  sleep 1
+
+  cur_attempt=`expr $cur_attempt + 1`
+
+done
+
+log_error "Server does not accept connections after $total_timeout seconds."
+quit 0

mysql-test/suite/ndb/r/ndb_dd_basic.result

@@ -8,20 +8,20 @@ INITIAL_SIZE 16M
 UNDO_BUFFER_SIZE = 1M
 ENGINE=MYISAM;
 Warnings:
-Error	1475	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+Error	1476	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 ALTER LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile02.dat'
 INITIAL_SIZE = 4M 
 ENGINE=XYZ;
 Warnings:
 Warning	1286	Unknown table engine 'XYZ'
-Error	1475	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+Error	1476	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 CREATE TABLESPACE ts1
 ADD DATAFILE 'datafile.dat'
 USE LOGFILE GROUP lg1
 INITIAL_SIZE 12M;
 Warnings:
-Error	1475	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+Error	1476	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 set storage_engine=ndb;
 CREATE LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile.dat'

mysql-test/suite/ndb/r/ndb_dd_ddl.result

@@ -16,7 +16,7 @@ ERROR HY000: Failed to create LOGFILE GROUP
 SHOW WARNINGS;
 Level	Code	Message
 Error	1296	Got error 1514 'Currently there is a limit of one logfile group' from NDB
-Error	1525	Failed to create LOGFILE GROUP
+Error	1526	Failed to create LOGFILE GROUP
 CREATE LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile.dat'
 INITIAL_SIZE 1M

mysql-test/suite/ndb/r/ndb_gis.result

@@ -463,7 +463,7 @@ drop table t1;
 End of 4.1 tests
 CREATE TABLE t1 (name VARCHAR(100), square GEOMETRY);
 Warnings:
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1476	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 INSERT INTO t1 VALUES("center", GeomFromText('POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0))'));
 INSERT INTO t1 VALUES("small",  GeomFromText('POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0))'));
 INSERT INTO t1 VALUES("big",    GeomFromText('POLYGON (( 0 0, 0 3, 3 3, 3 0, 0 0))'));
@@ -1013,7 +1013,7 @@ drop table t1;
 End of 4.1 tests
 CREATE TABLE t1 (name VARCHAR(100), square GEOMETRY);
 Warnings:
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1476	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 INSERT INTO t1 VALUES("center", GeomFromText('POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0))'));
 INSERT INTO t1 VALUES("small",  GeomFromText('POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0))'));
 INSERT INTO t1 VALUES("big",    GeomFromText('POLYGON (( 0 0, 0 3, 3 3, 3 0, 0 0))'));

mysql-test/suite/ndb/r/ndb_row_format.result

@@ -8,7 +8,7 @@ ENGINE=NDB;
 ERROR HY000: Can't create table 'test.t1' (errno: 138)
 SHOW WARNINGS;
 Level	Code	Message
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Row format FIXED incompatible with variable sized attribute'
+Error	1476	Table storage engine 'ndbcluster' does not support the create option 'Row format FIXED incompatible with variable sized attribute'
 Error	1005	Can't create table 'test.t1' (errno: 138)
 CREATE TABLE t1
 ( a INT KEY,

mysql-test/suite/ndb/r/ndb_single_user.result

@@ -11,7 +11,7 @@ ERROR HY000: Failed to create LOGFILE GROUP
 show warnings;
 Level	Code	Message
 Error	1296	Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
-Error	1525	Failed to create LOGFILE GROUP
+Error	1526	Failed to create LOGFILE GROUP
 create table t1 (a int key, b int unique, c int) engine ndb;
 CREATE LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile.dat'
@@ -27,14 +27,14 @@ ERROR HY000: Failed to create TABLESPACE
 show warnings;
 Level	Code	Message
 Error	1296	Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
-Error	1525	Failed to create TABLESPACE
+Error	1526	Failed to create TABLESPACE
 DROP LOGFILE GROUP lg1 
 ENGINE =NDB;
 ERROR HY000: Failed to drop LOGFILE GROUP
 show warnings;
 Level	Code	Message
 Error	1296	Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
-Error	1526	Failed to drop LOGFILE GROUP
+Error	1527	Failed to drop LOGFILE GROUP
 CREATE TABLESPACE ts1
 ADD DATAFILE 'datafile.dat'
 USE LOGFILE GROUP lg1
@@ -47,7 +47,7 @@ ERROR HY000: Failed to alter:  DROP DATAFILE
 show warnings;
 Level	Code	Message
 Error	1296	Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
-Error	1530	Failed to alter:  DROP DATAFILE
+Error	1531	Failed to alter:  DROP DATAFILE
 ALTER TABLESPACE ts1
 DROP DATAFILE 'datafile.dat'
 ENGINE NDB;
@@ -57,7 +57,7 @@ ERROR HY000: Failed to drop TABLESPACE
 show warnings;
 Level	Code	Message
 Error	1296	Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
-Error	1526	Failed to drop TABLESPACE
+Error	1527	Failed to drop TABLESPACE
 DROP TABLESPACE ts1
 ENGINE NDB;
 DROP LOGFILE GROUP lg1 

mysql-test/suite/rpl/r/rpl_binlog_grant.result

@@ -0,0 +1,50 @@
+drop database if exists d1;
+create database d1;
+use d1;
+create table t (s1 int) engine=innodb;
+set @@autocommit=0;
+start transaction;
+insert into t values (1);
+grant select on t to x@y;
+rollback;
+show grants for x@y;
+Grants for x@y
+GRANT USAGE ON *.* TO 'x'@'y'
+GRANT SELECT ON `d1`.`t` TO 'x'@'y'
+show binlog events;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	106	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	106	Query	1	193	drop database if exists d1
+master-bin.000001	193	Query	1	272	create database d1
+master-bin.000001	272	Query	1	370	use `d1`; create table t (s1 int) engine=innodb
+master-bin.000001	370	Query	1	436	use `d1`; BEGIN
+master-bin.000001	436	Query	1	521	use `d1`; insert into t values (1)
+master-bin.000001	521	Xid	1	548	COMMIT /* XID */
+master-bin.000001	548	Query	1	633	use `d1`; grant select on t to x@y
+start transaction;
+insert into t values (2);
+revoke select on t from x@y;
+commit;
+select * from t;
+s1
+1
+2
+show grants for x@y;
+Grants for x@y
+GRANT USAGE ON *.* TO 'x'@'y'
+show binlog events;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	106	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	106	Query	1	193	drop database if exists d1
+master-bin.000001	193	Query	1	272	create database d1
+master-bin.000001	272	Query	1	370	use `d1`; create table t (s1 int) engine=innodb
+master-bin.000001	370	Query	1	436	use `d1`; BEGIN
+master-bin.000001	436	Query	1	521	use `d1`; insert into t values (1)
+master-bin.000001	521	Xid	1	548	COMMIT /* XID */
+master-bin.000001	548	Query	1	633	use `d1`; grant select on t to x@y
+master-bin.000001	633	Query	1	699	use `d1`; BEGIN
+master-bin.000001	699	Query	1	784	use `d1`; insert into t values (2)
+master-bin.000001	784	Xid	1	811	COMMIT /* XID */
+master-bin.000001	811	Query	1	899	use `d1`; revoke select on t from x@y
+drop user x@y;
+drop database d1;

mysql-test/suite/rpl/r/rpl_extraCol_innodb.result

@@ -33,6 +33,73 @@ a	b	c	d	e
 3	4	QA	2	TEST
 *** Drop t1  ***
 DROP TABLE t1;
+*** Create t2 on slave  ***
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t2 (a INT, b INT PRIMARY KEY, c CHAR(5),
+d FLOAT DEFAULT '2.00',
+e CHAR(5) DEFAULT 'TEST2')
+ENGINE='InnoDB';
+*** Create t2 on Master ***
+CREATE TABLE t2 (a INT PRIMARY KEY, b INT, c CHAR(10)
+) ENGINE='InnoDB';
+RESET MASTER;
+*** Master Data Insert ***
+INSERT INTO t2 () VALUES(1,2,'Kyle, TEX'),(2,1,'JOE AUSTIN'),(3,4,'QA TESTING');
+SELECT * FROM t2 ORDER BY a;
+a	b	c
+1	2	Kyle, TEX
+2	1	JOE AUSTIN
+3	4	QA TESTING
+*** Start Slave ***
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
+STOP SLAVE;
+RESET SLAVE;
+SELECT * FROM t2 ORDER BY a;
+a	b	c	d	e
+RESET MASTER;
+START SLAVE;
+*** Drop t2  ***
+DROP TABLE t2;
 *** Create t3 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
@@ -57,7 +124,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -69,10 +136,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -88,9 +155,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -119,7 +186,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -131,10 +198,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -150,9 +217,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -181,7 +248,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -193,10 +260,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -212,9 +279,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -242,7 +309,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -254,10 +321,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -273,9 +340,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
 *** Drop t6  ***
@@ -354,7 +421,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -366,10 +433,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -385,9 +452,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -415,7 +482,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -427,10 +494,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -446,9 +513,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -605,7 +672,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -617,7 +684,7 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
 Last_Errno	1060
@@ -636,8 +703,8 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
+Last_IO_Errno	#
+Last_IO_Error	#
 Last_SQL_Errno	1060
 Last_SQL_Error	Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
@@ -740,7 +807,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -752,10 +819,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -771,9 +838,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;

mysql-test/suite/rpl/r/rpl_extraCol_myisam.result

@@ -33,6 +33,73 @@ a	b	c	d	e
 3	4	QA	2	TEST
 *** Drop t1  ***
 DROP TABLE t1;
+*** Create t2 on slave  ***
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t2 (a INT, b INT PRIMARY KEY, c CHAR(5),
+d FLOAT DEFAULT '2.00',
+e CHAR(5) DEFAULT 'TEST2')
+ENGINE='MyISAM';
+*** Create t2 on Master ***
+CREATE TABLE t2 (a INT PRIMARY KEY, b INT, c CHAR(10)
+) ENGINE='MyISAM';
+RESET MASTER;
+*** Master Data Insert ***
+INSERT INTO t2 () VALUES(1,2,'Kyle, TEX'),(2,1,'JOE AUSTIN'),(3,4,'QA TESTING');
+SELECT * FROM t2 ORDER BY a;
+a	b	c
+1	2	Kyle, TEX
+2	1	JOE AUSTIN
+3	4	QA TESTING
+*** Start Slave ***
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
+STOP SLAVE;
+RESET SLAVE;
+SELECT * FROM t2 ORDER BY a;
+a	b	c	d	e
+RESET MASTER;
+START SLAVE;
+*** Drop t2  ***
+DROP TABLE t2;
 *** Create t3 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
@@ -57,7 +124,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -69,10 +136,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -88,9 +155,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -119,7 +186,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -131,10 +198,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -150,9 +217,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -181,7 +248,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -193,10 +260,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -212,9 +279,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -242,7 +309,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -254,10 +321,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -273,9 +340,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
 *** Drop t6  ***
@@ -354,7 +421,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -366,10 +433,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -385,9 +452,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -415,7 +482,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -427,10 +494,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -446,9 +513,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -605,7 +672,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -617,7 +684,7 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
 Last_Errno	1060
@@ -636,8 +703,8 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
+Last_IO_Errno	#
+Last_IO_Error	#
 Last_SQL_Errno	1060
 Last_SQL_Error	Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
@@ -740,7 +807,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -752,10 +819,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -771,9 +838,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;

mysql-test/suite/rpl/r/rpl_incident.result

@@ -44,7 +44,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1587
+Last_Errno	1588
 Last_Error	The incident LOST_EVENTS occured on the master. Message: <none>
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -62,7 +62,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	0
 Last_IO_Error	
-Last_SQL_Errno	1587
+Last_SQL_Errno	1588
 Last_SQL_Error	The incident LOST_EVENTS occured on the master. Message: <none>
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 START SLAVE;

mysql-test/suite/rpl/r/rpl_loaddata_fatal.result

@@ -65,7 +65,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1590
+Last_Errno	1591
 Last_Error	Fatal error: Not enough memory
 Skip_Counter	0
 Exec_Master_Log_Pos	325
@@ -83,7 +83,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1590
+Last_SQL_Errno	1591
 Last_SQL_Error	Fatal error: Not enough memory
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 START SLAVE;

mysql-test/suite/rpl/r/rpl_ps.result

@@ -26,5 +26,55 @@ from-master-2-'',
 from-var-from-master-3
 drop table t1;
 stop slave;
+
+########################################################################
+#
+# BUG#25843: Changing default database between PREPARE and EXECUTE of
+# statement breaks binlog.
+#
+########################################################################
+
+# Connection: slave
+
+
+START SLAVE;
+
+# Connection: master
+
+
+CREATE DATABASE mysqltest1;
+CREATE TABLE t1(db_name CHAR(32), db_col_name CHAR(32));
+
+PREPARE stmt_d_1 FROM 'INSERT INTO t1 VALUES(DATABASE(), @@collation_database)';
+
+EXECUTE stmt_d_1;
+
+use mysqltest1;
+
+EXECUTE stmt_d_1;
+
+
+# Connection: slave
+
+
+SELECT * FROM t1;
+db_name	db_col_name
+test	latin1_swedish_ci
+test	latin1_swedish_ci
+
+# Connection: master
+
+
+DROP DATABASE mysqltest1;
+
+use test;
+
+
+# Connection: slave
+
+
+STOP SLAVE;
+
+########################################################################
 reset master;
 reset slave;

mysql-test/suite/rpl/r/rpl_row_colSize.result

@@ -0,0 +1,754 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+DROP TABLE IF EXISTS t1;
+**** Testing WL#3228 changes. ****
+*** Create "wider" table on slave ***
+Checking MYSQL_TYPE_NEWDECIMAL fields
+DROP TABLE IF EXISTS t1;
+Warnings:
+Note	1051	Unknown table 't1'
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a DECIMAL(5,2));
+CREATE TABLE t1 (a DECIMAL(20, 10));
+RESET MASTER;
+INSERT INTO t1 VALUES (901251.90125);
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a DECIMAL(27, 9));
+CREATE TABLE t1 (a DECIMAL(27, 18));
+RESET MASTER;
+INSERT INTO t1 VALUES (901251.90125);
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 12, test.t1 on slave has size 12. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 12, test.t1 on slave has size 12. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a NUMERIC(5,2));
+CREATE TABLE t1 (a NUMERIC(20, 10));
+RESET MASTER;
+INSERT INTO t1 VALUES (901251.90125);
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+Checking MYSQL_TYPE_FLOAT fields
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a FLOAT(20));
+CREATE TABLE t1 (a FLOAT(47));
+RESET MASTER;
+INSERT INTO t1 VALUES (901251.90125);
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 5, test.t1 has type 4
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 5, test.t1 has type 4
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+Checking MYSQL_TYPE_BIT fields
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a BIT(5));
+CREATE TABLE t1 (a BIT(64));
+RESET MASTER;
+INSERT INTO t1 VALUES (B'10101');
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 8, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 8, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a BIT(11));
+CREATE TABLE t1 (a BIT(12));
+RESET MASTER;
+INSERT INTO t1 VALUES (B'10101');
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 2. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 2. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+Checking MYSQL_TYPE_SET fields
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a SET('4'));
+CREATE TABLE t1 (a SET('1','2','3','4','5','6','7','8','9'));
+RESET MASTER;
+INSERT INTO t1 VALUES ('4');
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+Checking MYSQL_TYPE_STRING fields
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a CHAR(10));
+CREATE TABLE t1 (a CHAR(20));
+RESET MASTER;
+INSERT INTO t1 VALUES ('This is a test.');
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 20, test.t1 on slave has size 11. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 20, test.t1 on slave has size 11. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+Checking MYSQL_TYPE_ENUM fields
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a ENUM('44','54'));
+CREATE TABLE t1 (a ENUM(
+'01','02','03','04','05','06','07','08','09',
+'11','12','13','14','15','16','17','18','19',
+'21','22','23','24','25','26','27','28','29',
+'31','32','33','34','35','36','37','38','39',
+'41','42','43','44','45','46','47','48','49',
+'51','52','53','54','55','56','57','58','59',
+'61','62','63','64','65','66','67','68','69',
+'71','72','73','74','75','76','77','78','79',
+'81','82','83','84','85','86','87','88','89',
+'91','92','93','94','95','96','97','98','99',
+'101','102','103','104','105','106','107','108','109',
+'111','112','113','114','115','116','117','118','119',
+'121','122','123','124','125','126','127','128','129',
+'131','132','133','134','135','136','137','138','139',
+'141','142','143','144','145','146','147','148','149',
+'151','152','153','154','155','156','157','158','159',
+'161','162','163','164','165','166','167','168','169',
+'171','172','173','174','175','176','177','178','179',
+'181','182','183','184','185','186','187','188','189',
+'191','192','193','194','195','196','197','198','199',
+'201','202','203','204','205','206','207','208','209',
+'211','212','213','214','215','216','217','218','219',
+'221','222','223','224','225','226','227','228','229',
+'231','232','233','234','235','236','237','238','239',
+'241','242','243','244','245','246','247','248','249',
+'251','252','253','254','255','256','257','258','259',
+'261','262','263','264','265','266','267','268','269',
+'271','272','273','274','275','276','277','278','279',
+'281','282','283','284','285','286','287','288','289',
+'291','292','293','294','295','296','297','298','299'
+            ));
+RESET MASTER;
+INSERT INTO t1 VALUES ('44');
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+Checking MYSQL_TYPE_VARCHAR fields
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a VARCHAR(100));
+CREATE TABLE t1 (a VARCHAR(2000));
+RESET MASTER;
+INSERT INTO t1 VALUES ('This is a test.');
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 100. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 100. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a VARCHAR(10));
+CREATE TABLE t1 (a VARCHAR(200));
+RESET MASTER;
+INSERT INTO t1 VALUES ('This is a test.');
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 200, test.t1 on slave has size 10. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 200, test.t1 on slave has size 10. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a VARCHAR(1000));
+CREATE TABLE t1 (a VARCHAR(2000));
+RESET MASTER;
+INSERT INTO t1 VALUES ('This is a test.');
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 1000. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 1000. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+Checking MYSQL_TYPE_BLOB fields
+DROP TABLE IF EXISTS t1;
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (a TINYBLOB);
+CREATE TABLE t1 (a LONGBLOB);
+RESET MASTER;
+INSERT INTO t1 VALUES ('This is a test.');
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 4, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 0 size mismatch - master has size 4, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+*** Cleanup  ***
+DROP TABLE IF EXISTS t1;

mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result

@@ -214,7 +214,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 3, test.t4 has type 4
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -232,7 +232,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	0
 Last_IO_Error	
-Last_SQL_Errno	1532
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 3, test.t4 has type 4
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -257,7 +257,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 1 type mismatch - received type 3, test.t5 has type 4
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -275,7 +275,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	0
 Last_IO_Error	
-Last_SQL_Errno	1532
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 1 type mismatch - received type 3, test.t5 has type 4
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -300,7 +300,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 3, test.t6 has type 4
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -318,7 +318,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	0
 Last_IO_Error	
-Last_SQL_Errno	1532
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 3, test.t6 has type 4
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;

mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result

@@ -214,7 +214,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 3, test.t4 has type 4
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -232,7 +232,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	0
 Last_IO_Error	
-Last_SQL_Errno	1532
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 3, test.t4 has type 4
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -257,7 +257,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 1 type mismatch - received type 3, test.t5 has type 4
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -275,7 +275,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	0
 Last_IO_Error	
-Last_SQL_Errno	1532
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 1 type mismatch - received type 3, test.t5 has type 4
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -300,7 +300,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 3, test.t6 has type 4
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -318,7 +318,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	0
 Last_IO_Error	
-Last_SQL_Errno	1532
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 3, test.t6 has type 4
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;

mysql-test/suite/rpl/r/rpl_udf.result

@@ -14,13 +14,13 @@ CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
 affected rows: 0
 CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
 ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 myfunc_double	1	UDF_LIB	function
 myfunc_int	2	UDF_LIB	function
 affected rows: 2
 "Running on the slave"
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 myfunc_double	1	UDF_LIB	function
 myfunc_int	2	UDF_LIB	function
@@ -64,11 +64,11 @@ DROP FUNCTION myfunc_double;
 affected rows: 0
 DROP FUNCTION myfunc_int;
 affected rows: 0
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 affected rows: 0
 "Running on the slave"
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 affected rows: 0
 "Running on the master"
@@ -80,13 +80,13 @@ CREATE FUNCTION myfuncsql_int(i INT) RETURNS INTEGER DETERMINISTIC RETURN i;
 affected rows: 0
 CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 2.00;
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	
 affected rows: 2
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	
@@ -122,13 +122,13 @@ ALTER FUNCTION myfuncsql_int COMMENT "This was altered.";
 affected rows: 0
 ALTER FUNCTION myfuncsql_double COMMENT "This was altered.";
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	This was altered.
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
 affected rows: 2
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	This was altered.
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
@@ -146,11 +146,11 @@ DROP FUNCTION myfuncsql_double;
 affected rows: 0
 DROP FUNCTION myfuncsql_int;
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 affected rows: 0
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 affected rows: 0
 "Running on the master"
@@ -166,35 +166,35 @@ CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
 affected rows: 0
 CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
 ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
-myfunc_int	2	UDF_LIB	function
 myfunc_double	1	UDF_LIB	function
+myfunc_int	2	UDF_LIB	function
 affected rows: 2
 "Running on the slave"
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
-myfunc_int	2	UDF_LIB	function
 myfunc_double	1	UDF_LIB	function
+myfunc_int	2	UDF_LIB	function
 affected rows: 2
 "Running on the master"
 CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
 affected rows: 0
 INSERT INTO t1 VALUES(myfunc_int(100), myfunc_double(50.00));
 Warnings:
-Warning	1589	Statement is not safe to log in statement format.
+Warning	1590	Statement is not safe to log in statement format.
 affected rows: 1
 INSERT INTO t1 VALUES(myfunc_int(10), myfunc_double(5.00));
 Warnings:
-Warning	1589	Statement is not safe to log in statement format.
+Warning	1590	Statement is not safe to log in statement format.
 affected rows: 1
 INSERT INTO t1 VALUES(myfunc_int(200), myfunc_double(25.00));
 Warnings:
-Warning	1589	Statement is not safe to log in statement format.
+Warning	1590	Statement is not safe to log in statement format.
 affected rows: 1
 INSERT INTO t1 VALUES(myfunc_int(1), myfunc_double(500.00));
 Warnings:
-Warning	1589	Statement is not safe to log in statement format.
+Warning	1590	Statement is not safe to log in statement format.
 affected rows: 1
 SELECT * FROM t1 ORDER BY sum;
 sum	price
@@ -224,11 +224,11 @@ DROP FUNCTION myfunc_double;
 affected rows: 0
 DROP FUNCTION myfunc_int;
 affected rows: 0
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 affected rows: 0
 "Running on the slave"
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 affected rows: 0
 "Running on the master"
@@ -240,13 +240,13 @@ CREATE FUNCTION myfuncsql_int(i INT) RETURNS INTEGER DETERMINISTIC RETURN i;
 affected rows: 0
 CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 2.00;
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	
 affected rows: 2
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	
@@ -282,13 +282,13 @@ ALTER FUNCTION myfuncsql_int COMMENT "This was altered.";
 affected rows: 0
 ALTER FUNCTION myfuncsql_double COMMENT "This was altered.";
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	This was altered.
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
 affected rows: 2
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	This was altered.
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
@@ -306,11 +306,11 @@ DROP FUNCTION myfuncsql_double;
 affected rows: 0
 DROP FUNCTION myfuncsql_int;
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 affected rows: 0
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
 db	name	type	param_list	body	comment
 affected rows: 0
 "Running on the master"

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

@@ -11,8 +11,6 @@
 ##############################################################################
 
 rpl_ddl                  : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
-#rpl_innodb_mixed_ddl     : Bug #29363 rpl.rpl_innodb_mixed_* test failures
-#rpl_innodb_mixed_dml     : Bug #29363 rpl.rpl_innodb_mixed_* test failures
 rpl_invoked_features     : BUG#29020 2007-06-21 Lars Non-deterministic test case
 rpl_auto_increment_11932   : Bug#29809 2007-07-16 ingo Slave SQL errors in warnings file
 rpl_stm_extraColmaster_ndb : WL#3915 : Statement-based replication not supported in ndb. Enable test when supported.

mysql-test/suite/rpl/t/rpl_binlog_grant.test

@@ -0,0 +1,43 @@
+-- source include/have_innodb.inc
+-- source include/not_embedded.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
+
+let $VERSION=`select version()`;
+
+# Bug #21975: grant/revoke statements in transaction
+# used to disappear from binlog upon rallback.
+# Now GRANT/REVOKE do implicitly commit
+# transaction
+
+--disable_warnings
+drop database if exists d1;
+--enable_warnings
+create database d1;
+use d1;
+create table t (s1 int) engine=innodb;
+set @@autocommit=0;
+start transaction;
+insert into t values (1);
+grant select on t to x@y;
+#
+# There is no active transaction here
+#
+rollback;
+show grants for x@y;
+--replace_result $VERSION VERSION
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
+show binlog events;
+start transaction;
+insert into t values (2);
+revoke select on t from x@y;
+#
+# There is no active transaction here
+#
+commit;
+select * from t;
+show grants for x@y;
+--replace_result $VERSION VERSION
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
+show binlog events;
+drop user x@y;
+drop database d1;

mysql-test/suite/rpl/t/rpl_packet.test

@@ -68,6 +68,7 @@ INSERT INTO `t1`(`f1`) VALUES ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 # The slave I/O thread must stop after trying to read the above event
 connection slave; 
 sleep 2;
+--source include/wait_for_slave_io_to_stop.inc
 SHOW STATUS LIKE 'Slave_running';
 
 # cleanup

mysql-test/suite/rpl/t/rpl_ps.test

@@ -46,6 +46,101 @@ stop slave;
 
 # End of 4.1 tests
 
+#
+# Bug #25843 Changing default database between PREPARE and EXECUTE of statement
+# breaks binlog.
+#
+# There were actually two problems discovered by this bug:
+#
+#   1. Default (current) database is not fixed at the creation time.
+#      That leads to wrong output of DATABASE() function.
+#
+#   2. Database attributes (@@collation_database) are not fixed at the creation
+#      time. That leads to wrong resultset.
+#
+# Binlog breakage and Query Cache wrong output happened because of the first
+# problem.
+#
+
+--echo
+--echo ########################################################################
+--echo #
+--echo # BUG#25843: Changing default database between PREPARE and EXECUTE of
+--echo # statement breaks binlog.
+--echo #
+--echo ########################################################################
+
+###############################################################################
+
+--echo
+--echo # Connection: slave
+--echo
+--connection slave
+
+--echo
+START SLAVE;
+
+--echo
+--echo # Connection: master
+--echo
+--connection master
+
+--echo
+CREATE DATABASE mysqltest1;
+CREATE TABLE t1(db_name CHAR(32), db_col_name CHAR(32));
+
+--echo
+PREPARE stmt_d_1 FROM 'INSERT INTO t1 VALUES(DATABASE(), @@collation_database)';
+
+--echo
+EXECUTE stmt_d_1;
+
+--echo
+use mysqltest1;
+
+--echo
+EXECUTE stmt_d_1;
+
+--echo
+--save_master_pos
+
+--echo
+--echo # Connection: slave
+--echo
+--connection slave
+--sync_with_master
+
+--echo
+SELECT * FROM t1;
+
+--echo
+--echo # Connection: master
+--echo
+--connection master
+
+--echo
+DROP DATABASE mysqltest1;
+
+--echo
+use test;
+
+--echo
+--save_master_pos
+
+--echo
+--echo # Connection: slave
+--echo
+--connection slave
+--sync_with_master
+
+--echo
+STOP SLAVE;
+
+--echo
+--echo ########################################################################
+
+###############################################################################
+
 reset master;
 reset slave;
 disconnect master;

mysql-test/suite/rpl/t/rpl_row_colSize.test

@@ -0,0 +1,168 @@
+##################################################################
+# rpl_colSize                                                    #
+#                                                                #
+# This test is designed to test the changes included in WL#3228. #
+# The changes include the ability to replicate with the master   #
+# having columns that are smaller (shorter) than the slave.      #
+##################################################################
+
+-- source include/master-slave.inc
+-- source include/have_binlog_format_row.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+
+--echo **** Testing WL#3228 changes. ****
+--echo *** Create "wider" table on slave ***
+sync_slave_with_master;
+
+#
+# Check each column type to verify error 1532 fires (BUG#22086)
+# This check covers only those fields that require additional
+# metadata from the master to be replicated to the slave. These
+# field types are:
+#   MYSQL_TYPE_NEWDECIMAL:
+#   MYSQL_TYPE_FLOAT:
+#   MYSQL_TYPE_BIT:
+#   MYSQL_TYPE_SET:
+#   MYSQL_TYPE_STRING:
+#   MYSQL_TYPE_ENUM:
+#   MYSQL_TYPE_VARCHAR:
+#   MYSQL_TYPE_BLOB:
+
+#
+# Test: Checking MYSQL_TYPE_NEWDECIMAL fields
+#
+--echo Checking MYSQL_TYPE_NEWDECIMAL fields
+let $test_table_master = CREATE TABLE t1 (a DECIMAL(20, 10));
+let $test_table_slave = CREATE TABLE t1 (a DECIMAL(5,2));
+let $test_insert = INSERT INTO t1 VALUES (901251.90125);
+source include/test_fieldsize.inc;
+
+let $test_table_master = CREATE TABLE t1 (a DECIMAL(27, 18));
+let $test_table_slave = CREATE TABLE t1 (a DECIMAL(27, 9));
+let $test_insert = INSERT INTO t1 VALUES (901251.90125);
+source include/test_fieldsize.inc;
+
+let $test_table_master = CREATE TABLE t1 (a NUMERIC(20, 10));
+let $test_table_slave = CREATE TABLE t1 (a NUMERIC(5,2));
+let $test_insert = INSERT INTO t1 VALUES (901251.90125);
+source include/test_fieldsize.inc;
+
+#
+# Test: Checking MYSQL_TYPE_FLOAT fields
+#
+--echo Checking MYSQL_TYPE_FLOAT fields
+let $test_table_master = CREATE TABLE t1 (a FLOAT(47));
+let $test_table_slave = CREATE TABLE t1 (a FLOAT(20));
+let $test_insert = INSERT INTO t1 VALUES (901251.90125);
+source include/test_fieldsize.inc;
+
+#
+# Test: Checking MYSQL_TYPE_BIT fields
+#
+--echo Checking MYSQL_TYPE_BIT fields
+let $test_table_master = CREATE TABLE t1 (a BIT(64));
+let $test_table_slave = CREATE TABLE t1 (a BIT(5));
+let $test_insert = INSERT INTO t1 VALUES (B'10101');
+source include/test_fieldsize.inc;
+
+let $test_table_master = CREATE TABLE t1 (a BIT(12));
+let $test_table_slave = CREATE TABLE t1 (a BIT(11));
+let $test_insert = INSERT INTO t1 VALUES (B'10101');
+source include/test_fieldsize.inc;
+
+#
+# Test: Checking MYSQL_TYPE_SET fields
+#
+--echo Checking MYSQL_TYPE_SET fields
+let $test_table_master = CREATE TABLE t1 (a SET('1','2','3','4','5','6','7','8','9'));
+let $test_table_slave = CREATE TABLE t1 (a SET('4'));
+let $test_insert = INSERT INTO t1 VALUES ('4');
+source include/test_fieldsize.inc;
+
+#
+# Test: Checking MYSQL_TYPE_STRING fields
+#
+--echo Checking MYSQL_TYPE_STRING fields
+let $test_table_master = CREATE TABLE t1 (a CHAR(20));
+let $test_table_slave = CREATE TABLE t1 (a CHAR(10));
+let $test_insert = INSERT INTO t1 VALUES ('This is a test.');
+source include/test_fieldsize.inc;
+
+#
+# Test: Checking MYSQL_TYPE_ENUM fields
+#
+--echo Checking MYSQL_TYPE_ENUM fields
+let $test_table_master = CREATE TABLE t1 (a ENUM(
+            '01','02','03','04','05','06','07','08','09',
+            '11','12','13','14','15','16','17','18','19',
+            '21','22','23','24','25','26','27','28','29',
+            '31','32','33','34','35','36','37','38','39',
+            '41','42','43','44','45','46','47','48','49',
+            '51','52','53','54','55','56','57','58','59',
+            '61','62','63','64','65','66','67','68','69',
+            '71','72','73','74','75','76','77','78','79',
+            '81','82','83','84','85','86','87','88','89',
+            '91','92','93','94','95','96','97','98','99',
+            '101','102','103','104','105','106','107','108','109',
+            '111','112','113','114','115','116','117','118','119',
+            '121','122','123','124','125','126','127','128','129',
+            '131','132','133','134','135','136','137','138','139',
+            '141','142','143','144','145','146','147','148','149',
+            '151','152','153','154','155','156','157','158','159',
+            '161','162','163','164','165','166','167','168','169',
+            '171','172','173','174','175','176','177','178','179',
+            '181','182','183','184','185','186','187','188','189',
+            '191','192','193','194','195','196','197','198','199',
+            '201','202','203','204','205','206','207','208','209',
+            '211','212','213','214','215','216','217','218','219',
+            '221','222','223','224','225','226','227','228','229',
+            '231','232','233','234','235','236','237','238','239',
+            '241','242','243','244','245','246','247','248','249',
+            '251','252','253','254','255','256','257','258','259',
+            '261','262','263','264','265','266','267','268','269',
+            '271','272','273','274','275','276','277','278','279',
+            '281','282','283','284','285','286','287','288','289',
+            '291','292','293','294','295','296','297','298','299'
+            ));
+let $test_table_slave = CREATE TABLE t1 (a ENUM('44','54'));
+let $test_insert = INSERT INTO t1 VALUES ('44');
+source include/test_fieldsize.inc;
+
+#
+# Test: Checking MYSQL_TYPE_VARCHAR fields
+#
+--echo Checking MYSQL_TYPE_VARCHAR fields
+let $test_table_master = CREATE TABLE t1 (a VARCHAR(2000));
+let $test_table_slave = CREATE TABLE t1 (a VARCHAR(100));
+let $test_insert = INSERT INTO t1 VALUES ('This is a test.');
+source include/test_fieldsize.inc;
+
+let $test_table_master = CREATE TABLE t1 (a VARCHAR(200));
+let $test_table_slave = CREATE TABLE t1 (a VARCHAR(10));
+let $test_insert = INSERT INTO t1 VALUES ('This is a test.');
+source include/test_fieldsize.inc;
+
+let $test_table_master = CREATE TABLE t1 (a VARCHAR(2000));
+let $test_table_slave = CREATE TABLE t1 (a VARCHAR(1000));
+let $test_insert = INSERT INTO t1 VALUES ('This is a test.');
+source include/test_fieldsize.inc;
+
+#
+# Test: Checking MYSQL_TYPE_BLOB fields
+#
+--echo Checking MYSQL_TYPE_BLOB fields
+let $test_table_master = CREATE TABLE t1 (a LONGBLOB);
+let $test_table_slave = CREATE TABLE t1 (a TINYBLOB);
+let $test_insert = INSERT INTO t1 VALUES ('This is a test.');
+source include/test_fieldsize.inc;
+
+--echo *** Cleanup  ***
+connection master;
+DROP TABLE IF EXISTS t1;
+sync_slave_with_master;
+# END 5.1 Test Case
+

mysql-test/suite/rpl/t/rpl_ssl.test

@@ -41,28 +41,43 @@ select * from t1;
 
 # Do the same thing a number of times
 disable_query_log;
+disable_result_log;
 let $i= 100;
 while ($i)
 {
   start slave;
   connection master;
   insert into t1 values (NULL);
+  select * from t1; # Some variance
   connection slave;
+  select * from t1; # Some variance
   stop slave;
   dec $i;
 }
 start slave;
 enable_query_log;
+enable_result_log;
 connection master;
 # INSERT one more record to make sure
 # the sync has something to do
 insert into t1 values (NULL);
+let $master_count= `select count(*) from t1`;
+
 sync_slave_with_master;
 --source include/wait_for_slave_to_start.inc
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
 --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
 query_vertical show slave status;
 
+let $slave_count= `select count(*) from t1`;
+
+if (`select $slave_count != $master_count`)
+{
+  echo master and slave differed in number of rows;
+  echo master: $master_count;
+  echo slave: $slave_count;
+}
+
 connection master;
 drop user replssl@localhost;
 drop table t1;

mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result

@@ -33,6 +33,73 @@ a	b	c	d	e
 3	4	QA	NULL	NULL
 *** Drop t1  ***
 DROP TABLE t1;
+*** Create t2 on slave  ***
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t2 (a INT, b INT PRIMARY KEY, c CHAR(5),
+d FLOAT DEFAULT '2.00',
+e CHAR(5) DEFAULT 'TEST2')
+ENGINE='NDB';
+*** Create t2 on Master ***
+CREATE TABLE t2 (a INT PRIMARY KEY, b INT, c CHAR(10)
+) ENGINE='NDB';
+RESET MASTER;
+*** Master Data Insert ***
+INSERT INTO t2 () VALUES(1,2,'Kyle, TEX'),(2,1,'JOE AUSTIN'),(3,4,'QA TESTING');
+SELECT * FROM t2 ORDER BY a;
+a	b	c
+1	2	Kyle, TEX
+2	1	JOE AUSTIN
+3	4	QA TESTING
+*** Start Slave ***
+START SLAVE;
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	#
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1533
+Last_Error	Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
+Last_SQL_Error	Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
+STOP SLAVE;
+RESET SLAVE;
+SELECT * FROM t2 ORDER BY a;
+a	b	c	d	e
+RESET MASTER;
+START SLAVE;
+*** Drop t2  ***
+DROP TABLE t2;
 *** Create t3 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
@@ -57,7 +124,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -69,10 +136,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -88,9 +155,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -119,7 +186,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -131,10 +198,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -150,9 +217,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -181,7 +248,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -193,10 +260,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -212,9 +279,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -242,7 +309,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -254,10 +321,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -273,9 +340,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
 *** Drop t6  ***
@@ -354,7 +421,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -366,10 +433,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -385,9 +452,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -415,7 +482,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -427,10 +494,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -446,9 +513,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -605,7 +672,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -617,7 +684,7 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
 Last_Errno	1060
@@ -636,8 +703,8 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
+Last_IO_Errno	#
+Last_IO_Error	#
 Last_SQL_Errno	1060
 Last_SQL_Error	Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
@@ -741,7 +808,7 @@ SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	MASTER_PORT
+Master_Port	#
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	#
@@ -753,10 +820,10 @@ Slave_SQL_Running	No
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1532
+Last_Errno	1533
 Last_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -772,9 +839,9 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1532
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	1533
 Last_SQL_Error	Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;