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

merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7

Browse Source 
Fixed conflicts in:

- binlog.binlog_unsafe
- rpl.rpl_slow_query_log
This commit is contained in:
Alfranio Correia
2009-12-17 00:09:52 +00:00
parent 42cfe5b43c d6e7402d42
commit 013cc668df
234 changed files with 5903 additions and 1591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_base.cc
View File

@ -2935,7 +2935,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));
VOID(pthread_mutex_unlock(&LOCK_open));
DBUG_RETURN(NULL);
}
}
check_unused(); // Debugging call