database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc

Browse Source
This commit is contained in:
Marc Alff
2009-12-16 15:48:55 -07:00
parent 0531f85e16 5cd3dffebb
commit 0d99234dba
242 changed files with 5392 additions and 1733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_base.cc
View File

@ -2966,7 +2966,12 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
DBUG_PRINT("info", ("inserting table '%s'.'%s' 0x%lx into the cache",
table->s->db.str, table->s->table_name.str,
(long) table));
(void) my_hash_insert(&open_cache,(uchar*) table);
if (my_hash_insert(&open_cache,(uchar*) table))
{
my_free(table, MYF(0));
mysql_mutex_unlock(&LOCK_open);
DBUG_RETURN(NULL);
}
}
check_unused(); // Debugging call