diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-07-13 10:39:24 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-07-13 10:39:24 +0200 |
| commit | a5d72c498cd4a76f3237a2d8f2ef6d74dc011cb5 (patch) | |
| tree | 74d63cef81d432cda2315d47976755590872f3bd /sql/sql_handler.cc | |
| parent | 5050cd7c895fbb749b19495ef6f9dd4098fd474c (diff) | |
| parent | 465e4025f7f2e1ed1bd1854333b972dc5378bd10 (diff) | |
| download | mariadb-git-a5d72c498cd4a76f3237a2d8f2ef6d74dc011cb5.tar.gz | |
merge from mysql-trunk-bugfixing
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index e49da2b0423..8e38cf5eed0 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -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); } |