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

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


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_alter_table2.test:
  Auto merged
mysql-test/t/ndb_alter_table3.test:
  Auto merged
mysql-test/t/ndb_autodiscover3.test:
  Auto merged
mysql-test/t/ndb_binlog_log_bin.test:
  Auto merged
mysql-test/t/ndb_binlog_multi.test:
  Auto merged
mysql-test/t/ndb_cache_multi.test:
  Auto merged
mysql-test/t/ndb_cache_multi2.test:
  Auto merged
mysql-test/t/ndb_single_user.test:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged

mysql-test/lib/mtr_cases.pl

@@ -631,6 +631,7 @@ our @tags=
  ["include/big_test.inc", "big_test", 1],
  ["include/have_debug.inc", "need_debug", 1],
  ["include/have_ndb.inc", "ndb_test", 1],
+ ["include/have_multi_ndb.inc", "ndb_test", 1],
  ["include/have_ndb_extra.inc", "ndb_extra", 1],
  ["require_manager", "require_manager", 1],
 );

mysql-test/r/rpl_ndb_ctype_ucs2_def.result

+show variables like 'collation_server';
+Variable_name	Value
+collation_server	ucs2_unicode_ci
+show variables like "%character_set_ser%";
+Variable_name	Value
+character_set_server	ucs2
+DROP TABLE IF EXISTS t1;
+create table t1 (a int);
+drop table t1;

mysql-test/t/ndb_alter_table.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_alter_table2.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_alter_table3.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_autodiscover3.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
@@ -10,6 +9,9 @@
 drop table if exists t1, t2;
 --enable_warnings
 
+connect (con1,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect (con2,127.0.0.1,root,,test,$MASTER_MYPORT1,);
+
 # Workaround for Bug#27644
 # ndb: connecting api node/mysqld may "steal" node_id from running mysqld
 # - let ndb_waiter use a fixed node id so "steal" cannot happen
@@ -27,8 +29,14 @@ insert into t1 values (1);
 --exec $NDB_MGM --no-defaults -e "all restart" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
 # Wait for mysqld to reconnect and exit from readonly mode
-# Should preferrably be a "while (!"select ndb_readonly")" loop
-sleep 2;
+--disable_query_log
+--connection con1
+--source include/ndb_not_readonly.inc
+--connection con2
+--source include/ndb_not_readonly.inc
+--enable_query_log
+
+--connection server1
 --error 1297
 insert into t1 values (2);
 --error 1296
@@ -47,8 +55,13 @@ select * from t2 order by a limit 3;
 --exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
 # to ensure mysqld has connected again, and recreated system tables
---exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -r 30 -d cluster ndb_apply_status >> $NDB_TOOLS_OUTPUT
-sleep 2;
+--disable_query_log
+--connection con1
+--source include/ndb_not_readonly.inc
+--connection con2
+--source include/ndb_not_readonly.inc
+--enable_query_log
+
 --connection server2
 --error ER_NO_SUCH_TABLE
 select * from t2;
@@ -66,8 +79,13 @@ reset master;
 --exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
 # to ensure mysqld has connected again, and recreated system tables
---exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -r 30 -d cluster ndb_apply_status >> $NDB_TOOLS_OUTPUT
-sleep 2;
+--disable_query_log
+--connection con1
+--source include/ndb_not_readonly.inc
+--connection con2
+--source include/ndb_not_readonly.inc
+--enable_query_log
+
 --connection server1
 --error ER_NO_SUCH_TABLE
 select * from t2;

mysql-test/t/ndb_binlog_ddl_multi.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/have_binlog_format_row.inc
 

mysql-test/t/ndb_binlog_log_bin.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/have_binlog_format_row.inc
 

mysql-test/t/ndb_binlog_multi.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/have_binlog_format_row.inc
 

mysql-test/t/ndb_cache_multi.test

 -- source include/have_query_cache.inc
--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_cache_multi2.test

 -- source include/have_query_cache.inc
--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_single_user.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc

mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt

+--default-collation=ucs2_unicode_ci --default-character-set=ucs2,latin1

mysql-test/t/rpl_ndb_ctype_ucs2_def.test

+--source include/have_ucs2.inc
+--source include/have_ndb.inc
+--source include/ndb_master-slave.inc
+
+#
+# MySQL Bug#15276: MySQL ignores collation-server
+#
+show variables like 'collation_server';
+
+#
+# Check that NDB replication doesn't explode with default charset
+# being multibyte.
+#
+# Theorised that this could be a problem when dealing with:
+# Bug #27404 util thd mysql_parse sig11 when mysqld default multibyte charset
+#
+# Sort of related to:
+# Bug#18004 Connecting crashes server when default charset is UCS2
+#
+#
+show variables like "%character_set_ser%";
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+create table t1 (a int) ENGINE=NDB;
+drop table t1;
+
+--connection master
+CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0',
+                    `nom` char(4) default NULL,
+                    `prenom` char(4) default NULL,
+                    PRIMARY KEY  (`nid`))
+    ENGINE=ndbcluster;
+
+INSERT INTO t1 VALUES(1,"XYZ1","ABC1");
+select * from t1 order by nid;
+
+--sync_slave_with_master
+# connect to slave and ensure data it there.
+--connection slave
+select * from t1 order by nid;
+

sql/ha_ndbcluster.cc

@@ -8976,6 +8976,14 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
   thd->main_security_ctx.master_access= ~0;
   thd->main_security_ctx.priv_user = 0;
 
+  CHARSET_INFO *charset_connection;
+  charset_connection= get_charset_by_csname("utf8",
+                                            MY_CS_PRIMARY, MYF(MY_WME));
+  thd->variables.character_set_client= charset_connection;
+  thd->variables.character_set_results= charset_connection;
+  thd->variables.collation_connection= charset_connection;
+  thd->update_charset();
+
   /* Signal successful initialization */
   ndb_util_thread_running= 1;
   pthread_cond_signal(&COND_ndb_util_ready);