diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-25 11:09:12 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-25 11:09:12 -0200 |
| commit | 7ed8cff9e5defbd38a7ef68680c3c63357f37947 (patch) | |
| tree | f13519c84a430a7a4ace8577cfb5bd7f4f16ce63 /sql/rpl_tblmap.cc | |
| parent | e0d658335205f42ace20c81e5f9b5eb40408bdc1 (diff) | |
| parent | 477a50060fd0aee1d6396c9278e540be9d9e9d23 (diff) | |
| download | mariadb-git-7ed8cff9e5defbd38a7ef68680c3c63357f37947.tar.gz | |
Automerge.
Diffstat (limited to 'sql/rpl_tblmap.cc')
| -rw-r--r-- | sql/rpl_tblmap.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/rpl_tblmap.cc b/sql/rpl_tblmap.cc index a004c354263..6ef9a8623fe 100644 --- a/sql/rpl_tblmap.cc +++ b/sql/rpl_tblmap.cc @@ -119,7 +119,13 @@ int table_mapping::set_table(ulong table_id, TABLE* table) } e->table_id= table_id; e->table= table; - my_hash_insert(&m_table_ids,(uchar *)e); + if (my_hash_insert(&m_table_ids,(uchar *)e)) + { + /* we add this entry to the chain of free (free for use) entries */ + e->next= m_free; + m_free= e; + DBUG_RETURN(ERR_MEMORY_ALLOCATION); + } DBUG_PRINT("info", ("tid %lu -> table 0x%lx (%s)", table_id, (long) e->table, |