diff options
| author | unknown <monty@mysql.com> | 2004-10-27 21:56:17 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-27 21:56:17 +0300 |
| commit | 8ace53109ecc69efc166816b01470ed7333bd862 (patch) | |
| tree | 66328d72ad0e0bfc349cb02b61f845b1c7f2949a /sql/sql_cache.cc | |
| parent | e646f8f2d19fbfd24c8cc4ce62322691e88d12d1 (diff) | |
| download | mariadb-git-8ace53109ecc69efc166816b01470ed7333bd862.tar.gz | |
Fixed access to freed memory
innobase/srv/srv0srv.c:
after merge fix
sql/set_var.cc:
after merge fix
sql/sql_cache.cc:
after merge fix
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index be50b48d264..1bf8d179770 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1037,9 +1037,9 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) */ for (tmptable= thd->temporary_tables; tmptable ; tmptable= tmptable->next) { - if (tmptable->key_length - TMP_TABLE_KEY_EXTRA == table->key_len() && + if (tmptable->key_length - TMP_TABLE_KEY_EXTRA == table->key_length() && !memcmp(tmptable->table_cache_key, table->data(), - table->key_len())) + table->key_length())) { DBUG_PRINT("qcache", ("Temporary table detected: '%s.%s'", @@ -1050,7 +1050,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) temporary tables => assign following variable to make check faster. */ - thd->safe_to_cache_query=0; + thd->lex->safe_to_cache_query=0; BLOCK_UNLOCK_RD(query_block); DBUG_RETURN(-1); } |