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

into mysql.com:/home/psergey/mysql-5.1-ppruning-r5

mysql-test/r/ndb_alter_table_row.result

@@ -8,8 +8,6 @@ a	b	c
 2	two	two
 alter table t1 drop index c;
 select * from t1 where c = 'two';
-ERROR HY000: Table definition has changed, please retry transaction
-select * from t1 where c = 'two';
 a	b	c
 2	two	two
 drop table t1;

mysql-test/t/disabled.def

@@ -26,6 +26,5 @@ rpl_ndb_basic   : Bug#16228
 rpl_sp          : Bug #16456
 ndb_autodiscover : Needs to be fixed w.r.t binlog
 ndb_autodiscover2 : Needs to be fixed w.r.t binlog
-ndb_alter_table_row : dbug assert in RBR mode when executing test suite
 ndb_condition_pushdown: Bug #16596: Crash in mysql_unpack_partition
 ndb_index_ordered : Bug #16596: Crash in mysql_unpack_partition

mysql-test/t/ndb_alter_table_row.test

@@ -17,8 +17,6 @@ select * from t1 where c = 'two';
 connection server1;
 alter table t1 drop index c;
 connection server2;
---error 1412
-select * from t1 where c = 'two';
 select * from t1 where c = 'two';
 connection server1;
 drop table t1;

sql/ha_ndbcluster.cc

@@ -9161,6 +9161,7 @@ uint ha_ndbcluster::set_up_partition_info(partition_info *part_info,
 bool ha_ndbcluster::check_if_incompatible_data(HA_CREATE_INFO *info,
 					       uint table_changes)
 {
+  return COMPATIBLE_DATA_NO; // Disable fast add/drop index  
   if (table_changes != IS_EQUAL_YES)
     return COMPATIBLE_DATA_NO;
   

sql/ha_partition.cc

@@ -5009,8 +5009,11 @@ void ha_partition::print_error(int error, myf errflag)
   DBUG_PRINT("enter", ("error = %d", error));
 
   if (error == HA_ERR_NO_PARTITION_FOUND)
+  {
+    char buf[100];
     my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, MYF(0),
-             m_part_info->part_expr->val_int());
+             llstr(m_part_info->part_expr->val_int(), buf));
+  }
   else
     m_file[0]->print_error(error, errflag);
   DBUG_VOID_RETURN;

sql/share/errmsg.txt

@@ -5738,7 +5738,7 @@ ER_PLUGIN_IS_NOT_LOADED
 ER_WRONG_VALUE
 	eng "Incorrect %-.32s value: '%-.128s'"
 ER_NO_PARTITION_FOR_GIVEN_VALUE
-	eng "Table has no partition for value %ld"
+	eng "Table has no partition for value %-.64s"
 ER_TABLESPACE_OPTION_ONLY_ONCE
         eng "It is not allowed to specify %s more than once"
 ER_CREATE_TABLESPACE_FAILED