diff options
| author | unknown <pekka@mysql.com> | 2006-02-16 17:27:47 +0100 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2006-02-16 17:27:47 +0100 |
| commit | ed8b7459096048e14b4f4f50117bc1bde856eefc (patch) | |
| tree | ea45b36eb21eada4b77bd3947ce456d24c37cbc5 /sql | |
| parent | e0cbeea11f2c98abc20ea706eb7caa627556610c (diff) | |
| parent | 22b4ced45ecc87148abf1236d820f1064fe1b358 (diff) | |
| download | mariadb-git-ed8b7459096048e14b4f4f50117bc1bde856eefc.tar.gz | |
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/space/pekka/ndb/version/my51
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index cd37e830952..714de69d1ec 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -5524,14 +5524,17 @@ int ndbcluster_find_all_files(THD *thd) for (uint i= 0 ; i < list.count ; i++) { NDBDICT::List::Element& elmt= list.elements[i]; + int do_handle_table= 0; if (IS_TMP_PREFIX(elmt.name)) { DBUG_PRINT("info", ("Skipping %s.%s in NDB", elmt.database, elmt.name)); continue; } DBUG_PRINT("info", ("Found %s.%s in NDB", elmt.database, elmt.name)); - if (!(elmt.state == NDBOBJ::StateBuilding || - elmt.state == NDBOBJ::StateOnline)) + if (elmt.state == NDBOBJ::StateOnline || + elmt.state == NDBOBJ::StateBackup) + do_handle_table= 1; + else if (!(elmt.state == NDBOBJ::StateBuilding)) { sql_print_information("NDB: skipping setup table %s.%s, in state %d", elmt.database, elmt.name, elmt.state); @@ -5543,7 +5546,7 @@ int ndbcluster_find_all_files(THD *thd) if (!(ndbtab= dict->getTable(elmt.name))) { - if (elmt.state == NDBOBJ::StateOnline) + if (do_handle_table) sql_print_error("NDB: failed to setup table %s.%s, error: %d, %s", elmt.database, elmt.name, dict->getNdbError().code, |