diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-06-10 15:43:32 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-06-10 15:43:32 +0400 |
| commit | 90a87cd52d340abdc0f4b3c7b449426260100db6 (patch) | |
| tree | 41f4c8d871ed17caa85406b096d767bc51481b0d /sql/ha_ndbcluster_binlog.cc | |
| parent | 47b9f64c534f51af037d1bad7b27dfa9a1d1c284 (diff) | |
| download | mariadb-git-90a87cd52d340abdc0f4b3c7b449426260100db6.tar.gz | |
A pre-requisite for WL#5419 "LOCK_open scalability:
make tdc_refresh_version an
atomic counter".
Backport the trivial changes from mysql-trunk-iplus.
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index d38544f9b9f..0db7956fe28 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -3678,7 +3678,6 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) thd->init_for_queries(); thd->command= COM_DAEMON; thd->system_thread= SYSTEM_THREAD_NDBCLUSTER_BINLOG; - thd->version= refresh_version; thd->main_security_ctx.host_or_ip= ""; thd->client_capabilities= 0; my_net_init(&thd->net, 0); @@ -3965,9 +3964,9 @@ restart: !ndb_binlog_running)) break; /* Shutting down server */ - if (ndb_binlog_index && ndb_binlog_index->s->version < refresh_version) + if (ndb_binlog_index && ndb_binlog_index->s->needs_reopen()) { - if (ndb_binlog_index->s->version < refresh_version) + if (ndb_binlog_index->s->needs_reopen()) { close_thread_tables(thd); ndb_binlog_index= 0; |