summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster_binlog.cc
diff options
context:
space:
mode:
authorunknown <mats@mysql.com>2006-02-23 13:34:03 +0100
committerunknown <mats@mysql.com>2006-02-23 13:34:03 +0100
commit7d4c684633529650ae3bf3654d6b9845c86c44d7 (patch)
tree0d048b8b6b10018581813f4160f3159a67c538e0 /sql/ha_ndbcluster_binlog.cc
parentb5e971dd1f5e6657c8d5b1a157efe8dcae743227 (diff)
downloadmariadb-git-7d4c684633529650ae3bf3654d6b9845c86c44d7.tar.gz
Bug#17181 (mysqlslap test server crash):
Moving assignments to table_map_id for thread-safe handling of table shares. sql/ha_ndbcluster_binlog.cc: Assign_new_table_id() now takes table share instead of table. sql/mysql_priv.h: New protptype for assign_new_table_id(). sql/sql_base.cc: Assign_new_table_id() now takes a table share instead of a table. Moving call to assign_new_table_id() into get_table_share(). sql/table.cc: Setting default values of table_map_id and table_map_version inside alloc_table_share() and init_tmp_table_share(). Removing the settings from open_table_from_share().
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
-rw-r--r--sql/ha_ndbcluster_binlog.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index 06f946b013c..2c2624358af 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -310,7 +310,7 @@ void ndbcluster_binlog_init_share(NDB_SHARE *share, TABLE *_table)
table= 0;
break;
}
- assign_new_table_id(table);
+ assign_new_table_id(table_share);
if (!table->record[1] || table->record[1] == table->record[0])
{
table->record[1]= alloc_root(&table->mem_root,