Merge shellback.(none):/home/msvensson/mysql/bug17728/my51-bug17728

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  SCCS merged

mysql-test/t/rpl_ndb_multi_update2.test

@@ -3,5 +3,10 @@
 # to reuse test code between engine runs                   #
 ############################################################
 -- source include/have_ndb.inc
+
+# Run this only for row based replication, as replication of
+# auto_increment values are not supported with NDB as storage engine
+-- source include/have_binlog_format_row.inc
+
 let $engine_type=NDB;
 --source extra/rpl_tests/rpl_multi_update2.test