diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-09-24 10:24:55 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-09-24 10:24:55 +0300 |
| commit | 4e09f14b18ededb18aab527abe582fca34afe79c (patch) | |
| tree | 7a953ea10b82122bdf37cf7efc4cfd3fd9a20b17 /sql/sql_cache.cc | |
| parent | 48869febe61d1aef3e05af6bd17bab3e27b90f6d (diff) | |
| parent | 07001f78eca148d143ebf7fea66f4296a19a6d51 (diff) | |
| download | mariadb-git-4e09f14b18ededb18aab527abe582fca34afe79c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index f7742c6b7a7..fb86f52ab6e 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -823,7 +823,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used) Query_cache_query *header = query_block->query(); header->init_n_lock(); - if (hash_insert(&queries, (byte*) query_block)) + if (my_hash_insert(&queries, (byte*) query_block)) { refused++; DBUG_PRINT("qcache", ("insertion in query hash")); @@ -2044,7 +2044,7 @@ Query_cache::insert_table(uint key_len, char *key, Query_cache_block_table *list_root = table_block->table(0); list_root->n = 0; list_root->next = list_root->prev = list_root; - if (hash_insert(&tables, (const byte *) table_block)) + if (my_hash_insert(&tables, (const byte *) table_block)) { DBUG_PRINT("qcache", ("Can't insert table to hash")); // write_block_data return locked block |