Commit 02ef77d8 authored by bar@bar.myoffice.izhnet.ru's avatar bar@bar.myoffice.izhnet.ru
Browse files

Merge mysql.com:/home/bar/mysql-work/mysql-5.1.b29562 

into  mysql.com:/home/bar/mysql-work/mysql-5.1.b29562v2
parents f379d0f2 7840cdae

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

+19 −1
Original line number Diff line number Diff line 
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;

show variables like 'collation_server';

Variable_name	Value

collation_server	ucs2_unicode_ci
@@ -5,5 +11,17 @@ show variables like "%character_set_ser%"; 
Variable_name	Value

character_set_server	ucs2

DROP TABLE IF EXISTS t1;

create table t1 (a int);

create table t1 (a int) ENGINE=NDB;

drop table t1;

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;

nid	nom	prenom

1	XYZ1	ABC1

select * from t1 order by nid;

nid	nom	prenom

1	XYZ1	ABC1

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

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ rpl_ndb_2innodb : Bug #32648 Test failure between NDB Cluster and oth 
rpl_ndb_2myisam          : Bug #32648  	Test failure between NDB Cluster and other engines

rpl_ndb_2other           : Bug #32648  	Test failure between NDB Cluster and other engines

rpl_ndb_ddl              : BUG#28798 2007-05-31  lars  Valgrind failure in NDB

rpl_ndb_ctype_ucs2_def   : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset

rpl_ndb_extraColMaster   : BUG#30854 : Tables name show as binary in slave err msg on vm-win2003-64-b and Solaris

rpl_ndb_mix_innodb       : Bug #32720   Test rpl_ndb_mix_innodb fails on SPARC and PowerPC

sql/ha_ndbcluster_binlog.cc

+3 −2
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ static int ndbcluster_create_ndb_apply_status_table(THD *thd) 
                   " log_name VARCHAR(255) BINARY NOT NULL, "

                   " start_pos BIGINT UNSIGNED NOT NULL, "

                   " end_pos BIGINT UNSIGNED NOT NULL, "

                   " PRIMARY KEY USING HASH (server_id) ) ENGINE=NDB");

                   " PRIMARY KEY USING HASH (server_id) ) ENGINE=NDB CHARACTER SET utf8");



  const int no_print_error[4]= {ER_TABLE_EXISTS_ERROR,

                                701,
@@ -835,7 +835,7 @@ static int ndbcluster_create_schema_table(THD *thd) 
                   " id INT UNSIGNED NOT NULL,"

                   " version INT UNSIGNED NOT NULL,"

                   " type INT UNSIGNED NOT NULL,"

                   " PRIMARY KEY USING HASH (db,name) ) ENGINE=NDB");

                   " PRIMARY KEY USING HASH (db,name) ) ENGINE=NDB CHARACTER SET utf8");



  const int no_print_error[4]= {ER_TABLE_EXISTS_ERROR,

                                701,
@@ -3960,6 +3960,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
        i_ndb->setReportThreshEventFreeMem(ndb_report_thresh_binlog_mem_usage);



        bzero((char*) &row, sizeof(row));

        thd->variables.character_set_client= &my_charset_latin1;

        injector::transaction trans;

        // pass table map before epoch

        {

sql/log_event.cc

+1 −0
Original line number Diff line number Diff line
@@ -1669,6 +1669,7 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg, 
  DBUG_ASSERT(thd_arg->variables.character_set_client->number < 256*256);

  DBUG_ASSERT(thd_arg->variables.collation_connection->number < 256*256);

  DBUG_ASSERT(thd_arg->variables.collation_server->number < 256*256);

  DBUG_ASSERT(thd_arg->variables.character_set_client->mbminlen == 1);

  int2store(charset, thd_arg->variables.character_set_client->number);

  int2store(charset+2, thd_arg->variables.collation_connection->number);

  int2store(charset+4, thd_arg->variables.collation_server->number);