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 | 8673d2b20fe3cb1353f7b9b157e72dbf45382a48 (patch) | |
| tree | 9e8417877eab9778cb09f99e71c11401e7749bbc /sql/ha_ndbcluster.cc | |
| parent | 65d118b1a4cb3cb4d75226b9280ee80b0d644f70 (diff) | |
| parent | 5fff906edd3d7a5d999cec5403f009f33f8dfb81 (diff) | |
| download | mariadb-git-8673d2b20fe3cb1353f7b9b157e72dbf45382a48.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.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 0ec2e21056e..15b017ece81 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -680,7 +680,7 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans) bzero((char*) &table_list,sizeof(table_list)); table_list.db= m_dbname; table_list.alias= table_list.table_name= m_tabname; - close_cached_tables(thd, &table_list, FALSE); + close_cached_tables(thd, &table_list, FALSE, LONG_TIMEOUT); break; } default: @@ -8440,7 +8440,7 @@ int handle_trailing_share(NDB_SHARE *share) bzero((char*) &table_list,sizeof(table_list)); table_list.db= share->db; table_list.alias= table_list.table_name= share->table_name; - close_cached_tables(thd, &table_list, FALSE); + close_cached_tables(thd, &table_list, FALSE, LONG_TIMEOUT); mysql_mutex_lock(&ndbcluster_mutex); /* ndb_share reference temporary free */ |