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

merge from mysql-trunk-bugfixing

Browse Source
This commit is contained in:
Jon Olav Hauglid
2010-07-13 10:39:24 +02:00
parent 5050cd7c89 465e4025f7
commit a5d72c498c
288 changed files with 8247 additions and 3729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_handler.cc
View File

@@ -109,7 +109,7 @@ static char *mysql_ha_hash_get_key(TABLE_LIST *tables, size_t *key_len_p,
static void mysql_ha_hash_free(TABLE_LIST *tables)
{
my_free((char*) tables, MYF(0));
my_free(tables);
}
/**
@@ -259,7 +259,7 @@ bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen)
/* add to hash */
if (my_hash_insert(&thd->handler_tables_hash, (uchar*) hash_tables))
{
my_free((char*) hash_tables, MYF(0));
my_free(hash_tables);
DBUG_PRINT("exit",("ERROR"));
DBUG_RETURN(TRUE);
}