diff options
author | monty@mysql.com <> | 2005-02-15 17:12:13 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2005-02-15 17:12:13 +0200 |
commit | 38d1a42481e960eabd302ffce1b1312199416550 (patch) | |
tree | 15b9cad34a1d5d325aaaa43172f7410440a0e70e /sql/sql_cache.cc | |
parent | 410e51c854a929a96f5e91236abe19526ddc4947 (diff) | |
parent | 44ceb84cdc86f65f9f43424ee1300bb8f162f24b (diff) | |
download | mariadb-git-38d1a42481e960eabd302ffce1b1312199416550.tar.gz |
Merge with 4.1
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r-- | sql/sql_cache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index e38e417e6df..b2f7922f1db 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1438,7 +1438,7 @@ ulong Query_cache::init_cache() init(); approx_additional_data_size = (sizeof(Query_cache) + sizeof(gptr)*(def_query_hash_size+ - def_query_hash_size)); + def_table_hash_size)); if (query_cache_size < approx_additional_data_size) goto err; |