Commit bd3cbbe5 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
parents f2e9a5cf 9d9ac1b0

include/m_ctype.h

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ typedef struct uni_ctype_st 


extern MY_UNI_CTYPE my_uni_ctype[256];





/* wm_wc and wc_mb return codes */

#define MY_CS_ILSEQ	0     /* Wrong by sequence: wb_wc                   */

#define MY_CS_ILUNI	0     /* Cannot encode Unicode to charset: wc_mb    */

mysql-test/t/disabled.def

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ rpl_ndb_2innodb : assertion in get_parts_for_update() 
rpl_ndb_2myisam         : assertion in get_parts_for_update()

rpl_ndb_auto_inc        : Bug#17086

#rpl_ndb_basic           : Bug#16228 [IN REVIEW]

rpl_ndb_blob            : interferes with following tests, causing hang

rpl_ndb_blob2           : interferes with following tests, causing hang

#rpl_ndb_blob            : interferes with following tests, causing hang

#rpl_ndb_blob2           : interferes with following tests, causing hang

rpl_ndb_ddl             : master hangs

#rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails

rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails