diff options
| author | unknown <mats@mysql.com> | 2006-02-27 17:23:20 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-02-27 17:23:20 +0100 |
| commit | 594ba86bc534f1f81cdb897a9a414ba8248a0aad (patch) | |
| tree | c82517ad004bf99658f35a40adf59c0f4c03bc05 /sql/ha_ndbcluster_binlog.cc | |
| parent | 9a26412c5f280a79bc1d2e95c19e5f83866baf62 (diff) | |
| download | mariadb-git-594ba86bc534f1f81cdb897a9a414ba8248a0aad.tar.gz | |
Post-merge fixes.
sql/ha_ndbcluster_binlog.cc:
Correcting use of bad variable in merge.
sql/sql_base.cc:
Removing assertion check for mutex in table share.
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index c7d7c342ed0..889ccbea785 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -261,7 +261,7 @@ ndbcluster_binlog_open_table(THD *thd, NDB_SHARE *share, my_free((gptr) table, MYF(0)); DBUG_RETURN(error); } - assign_new_table_id(share); + assign_new_table_id(table_share); if (!table->record[1] || table->record[1] == table->record[0]) { table->record[1]= alloc_root(&table->mem_root, |