Commit 96413a44 authored by mskold@mysql.com's avatar mskold@mysql.com

Using new error code HA_ERR_TABLE_DEF_CHANGED to signal wrong schema version of table

parent 8ca38a90
...@@ -152,7 +152,7 @@ connection server1; ...@@ -152,7 +152,7 @@ connection server1;
alter table t1 drop index c; alter table t1 drop index c;
connection server2; connection server2;
# This should fail since index information is not automatically refreshed # This should fail since index information is not automatically refreshed
--error 1105 --error 1412
select * from t1 where b = 'two'; select * from t1 where b = 'two';
select * from t1 where b = 'two'; select * from t1 where b = 'two';
connection server1; connection server1;
......
...@@ -3342,8 +3342,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) ...@@ -3342,8 +3342,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
/* /*
The table has been altered, caller has to retry The table has been altered, caller has to retry
*/ */
NdbError err= ndb->getNdbError(NDB_INVALID_SCHEMA_OBJECT); DBUG_RETURN(my_errno= HA_ERR_TABLE_DEF_CHANGED);
DBUG_RETURN(ndb_to_mysql_error(&err));
} }
m_table_info= tab_info; m_table_info= tab_info;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment