mirror of
https://github.com/MariaDB/server.git
synced 2025-08-30 11:22:14 +03:00
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
This commit is contained in:
@@ -2776,9 +2776,13 @@ runDropDDObjects(NDBT_Context* ctx, NDBT_Step* step){
|
|||||||
case NdbDictionary::Object::UserTable:
|
case NdbDictionary::Object::UserTable:
|
||||||
tableFound = list.elements[i].name;
|
tableFound = list.elements[i].name;
|
||||||
if(tableFound != 0){
|
if(tableFound != 0){
|
||||||
if(pDict->dropTable(tableFound) != 0){
|
if(strcmp(tableFound, "ndb_apply_status") != 0 &&
|
||||||
g_err << "Failed to drop table: " << pDict->getNdbError() << endl;
|
strcmp(tableFound, "NDB$BLOB_2_3") != 0 &&
|
||||||
return NDBT_FAILED;
|
strcmp(tableFound, "ndb_schema") != 0){
|
||||||
|
if(pDict->dropTable(tableFound) != 0){
|
||||||
|
g_err << "Failed to drop table: " << tableFound << pDict->getNdbError() << endl;
|
||||||
|
return NDBT_FAILED;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tableFound = 0;
|
tableFound = 0;
|
||||||
|
Reference in New Issue
Block a user