diff options
| author | unknown <kostja@bodhi.(none)> | 2007-12-15 16:59:43 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-12-15 16:59:43 +0300 |
| commit | cb48c979e506b1df3e314745bb5974e1b6cfeb41 (patch) | |
| tree | 478d4e5aed82ca23a53a9264eb04f9131c5a43f9 /sql/ha_ndbcluster.cc | |
| parent | cfd4951d1f33334b529dbb1ca0b1a1bed28cfbb3 (diff) | |
| parent | 0a578711a2e44dcb6bfe6c1491b3b8e799ae13b8 (diff) | |
| download | mariadb-git-cb48c979e506b1df3e314745bb5974e1b6cfeb41.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/mysqld.cc:
Auto merged
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 b9d7e846d84..f72aa7cffea 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -577,7 +577,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, 0, &table_list); + close_cached_tables(thd, &table_list, FALSE, FALSE, FALSE); break; } default: @@ -8125,7 +8125,7 @@ int handle_trailing_share(NDB_SHARE *share) table_list.db= share->db; table_list.alias= table_list.table_name= share->table_name; safe_mutex_assert_owner(&LOCK_open); - close_cached_tables(thd, 0, &table_list, TRUE); + close_cached_tables(thd, &table_list, TRUE, FALSE, FALSE); pthread_mutex_lock(&ndbcluster_mutex); /* ndb_share reference temporary free */ |