bk commit into 5.1 tree (stewart:1.2544) BUG#27404

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-30 18:02:54+10:00, stewart@stripped +3 -0
  [PATCH] Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset
  
  Test that we can start a MySQL Server with a default multibyte charset with
  NDB running. Test *really* basic functionality too.
  
  Index: ndb-work/mysql-test/r/rpl_ndb_ctype_ucs2_def.result
  ===================================================================

  mysql-test/r/rpl_ndb_ctype_ucs2_def.result@stripped, 2007-06-29 15:44:03+10:00,
stewart@stripped +9 -0
    Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset

  mysql-test/r/rpl_ndb_ctype_ucs2_def.result@stripped, 2007-06-29 15:44:03+10:00,
stewart@stripped +0 -0

  mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt@stripped, 2007-06-29 15:44:03+10:00,
stewart@stripped +1 -0
    Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset

  mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt@stripped, 2007-06-29 15:44:03+10:00,
stewart@stripped +0 -0

  mysql-test/t/rpl_ndb_ctype_ucs2_def.test@stripped, 2007-06-29 15:44:03+10:00,
stewart@stripped +42 -0
    Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset

  mysql-test/t/rpl_ndb_ctype_ucs2_def.test@stripped, 2007-06-29 15:44:03+10:00,
stewart@stripped +0 -0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb-merge
--- New file ---
+++ mysql-test/r/rpl_ndb_ctype_ucs2_def.result	07/06/29 15:44:03
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;

--- New file ---
+++ mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt	07/06/29 15:44:03
--default-collation=ucs2_unicode_ci --default-character-set=ucs2,latin1

--- New file ---
+++ mysql-test/t/rpl_ndb_ctype_ucs2_def.test	07/06/29 15:44:03
--source include/have_ucs2.inc
--source include/have_ndb.inc
--source include/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;