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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

mysql-test/t/disabled.def

@@ -26,7 +26,7 @@ rpl_ndb_2innodb         : Bugs#17400: delete & update of rows in table without p
 rpl_ndb_2myisam         : Bugs#17400: delete & update of rows in table without pk fails
 rpl_ndb_auto_inc        : Bug#17086
 rpl_ndb_basic           : Bug#16228 [IN REVIEW]
-rpl_ndb_charset         : Bug#17246
+#rpl_ndb_charset         : Bug#17246 enable for test (no patch)
 rpl_ndb_ddl             : Bug#17400: delete & update of rows in table without pk fails
 rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails
 rpl_ndb_innodb2ndb      : Bugs#17400: delete & update of rows in table without pk fails