diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-17 08:34:48 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-17 08:34:48 +0200 |
| commit | 1d83b61b97dc4c805e3fda176a282132488de224 (patch) | |
| tree | 61521c9eba2772cb22256546d99f75352134793c /sql/ha_ndbcluster_binlog.cc | |
| parent | 39ad30a46c275401101e4b799e137fce8dda5130 (diff) | |
| download | mariadb-git-1d83b61b97dc4c805e3fda176a282132488de224.tar.gz | |
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
sql/ha_ndbcluster_binlog.cc:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- small correction of previous patch
storage/ndb/src/ndbapi/DictCache.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- cache not released properly
storage/ndb/tools/desc.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- added retry option so that ndb_desc can be used to wait for a table to be created
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 515b53d84db..bae2a3cbd9f 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -3318,6 +3318,7 @@ restart: schema_res= s_ndb->pollEvents(100, &schema_gci); } // now check that we have epochs consistant with what we had before the restart + DBUG_PRINT("info", ("schema_res: %d schema_gci: %d", schema_res, schema_gci)); if (schema_res > 0) { if (schema_gci < ndb_latest_handled_binlog_epoch) @@ -3681,7 +3682,7 @@ restart: *root_ptr= old_root; ndb_latest_handled_binlog_epoch= ndb_latest_received_binlog_epoch; } - if (do_ndbcluster_binlog_close_connection != BCCC_exit) + if (do_ndbcluster_binlog_close_connection == BCCC_restart) goto restart; err: DBUG_PRINT("info",("Shutting down cluster binlog thread")); |