mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01: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:
commit
574bce49b8
1 changed files with 7 additions and 3 deletions
|
@ -2776,9 +2776,13 @@ runDropDDObjects(NDBT_Context* ctx, NDBT_Step* step){
|
|||
case NdbDictionary::Object::UserTable:
|
||||
tableFound = list.elements[i].name;
|
||||
if(tableFound != 0){
|
||||
if(pDict->dropTable(tableFound) != 0){
|
||||
g_err << "Failed to drop table: " << pDict->getNdbError() << endl;
|
||||
return NDBT_FAILED;
|
||||
if(strcmp(tableFound, "ndb_apply_status") != 0 &&
|
||||
strcmp(tableFound, "NDB$BLOB_2_3") != 0 &&
|
||||
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;
|
||||
|
|
Loading…
Add table
Reference in a new issue