diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-08-12 17:50:23 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-08-12 17:50:23 +0400 |
| commit | 29c4873ad5bb0e0f3eb1faf3f22ec00f11ca5cb4 (patch) | |
| tree | 9e8417877eab9778cb09f99e71c11401e7749bbc /sql/ha_ndbcluster_binlog.cc | |
| parent | 265a6edd23cfdb69c6ac072bf01887f7aed1168c (diff) | |
| parent | 00496b7acd1f2ac8b099ba7e6a4c7bbf09178384 (diff) | |
| download | mariadb-git-29c4873ad5bb0e0f3eb1faf3f22ec00f11ca5cb4.tar.gz | |
Commit on behalf of Dmitry Lenev.
Merge his patch for Bug#52044 into 5.5, and apply
review comments.
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 72e3092f9a8..861b44f74b1 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -934,7 +934,7 @@ int ndbcluster_setup_binlog_table_shares(THD *thd) ndb_binlog_tables_inited= TRUE; if (opt_ndb_extra_logging) sql_print_information("NDB Binlog: ndb tables writable"); - close_cached_tables(NULL, NULL, FALSE); + close_cached_tables(NULL, NULL, FALSE, LONG_TIMEOUT); /* Signal injector thread that all is setup */ mysql_cond_signal(&injector_cond); } @@ -1736,7 +1736,7 @@ ndb_handle_schema_change(THD *thd, Ndb *ndb, NdbEventOperation *pOp, bzero((char*) &table_list,sizeof(table_list)); table_list.db= (char *)dbname; table_list.alias= table_list.table_name= (char *)tabname; - close_cached_tables(thd, &table_list, FALSE); + close_cached_tables(thd, &table_list, FALSE, LONG_TIMEOUT); if ((error= ndbcluster_binlog_open_table(thd, share, table_share, table, 1))) @@ -1840,7 +1840,7 @@ ndb_handle_schema_change(THD *thd, Ndb *ndb, NdbEventOperation *pOp, bzero((char*) &table_list,sizeof(table_list)); table_list.db= (char *)dbname; table_list.alias= table_list.table_name= (char *)tabname; - close_cached_tables(thd, &table_list, FALSE); + close_cached_tables(thd, &table_list, FALSE, LONG_TIMEOUT); /* ndb_share reference create free */ DBUG_PRINT("NDB_SHARE", ("%s create free use_count: %u", share->key, share->use_count)); @@ -1961,7 +1961,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, bzero((char*) &table_list,sizeof(table_list)); table_list.db= schema->db; table_list.alias= table_list.table_name= schema->name; - close_cached_tables(thd, &table_list, FALSE); + close_cached_tables(thd, &table_list, FALSE, LONG_TIMEOUT); } /* ndb_share reference temporary free */ if (share) @@ -2076,7 +2076,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, mysql_mutex_unlock(&ndb_schema_share_mutex); /* end protect ndb_schema_share */ - close_cached_tables(NULL, NULL, FALSE); + close_cached_tables(NULL, NULL, FALSE, LONG_TIMEOUT); // fall through case NDBEVENT::TE_ALTER: ndb_handle_schema_change(thd, ndb, pOp, tmp_share); @@ -2233,7 +2233,7 @@ ndb_binlog_thread_handle_schema_event_post_epoch(THD *thd, bzero((char*) &table_list,sizeof(table_list)); table_list.db= schema->db; table_list.alias= table_list.table_name= schema->name; - close_cached_tables(thd, &table_list, FALSE); + close_cached_tables(thd, &table_list, FALSE, LONG_TIMEOUT); } if (schema_type != SOT_ALTER_TABLE) break; @@ -3938,9 +3938,9 @@ restart: !ndb_binlog_running)) break; /* Shutting down server */ - if (ndb_binlog_index && ndb_binlog_index->s->needs_reopen()) + if (ndb_binlog_index && ndb_binlog_index->s->has_old_version()) { - if (ndb_binlog_index->s->needs_reopen()) + if (ndb_binlog_index->s->has_old_version()) { trans_commit_stmt(thd); close_thread_tables(thd); |