diff options
author | heikki@hundin.mysql.fi <> | 2005-02-13 21:05:18 +0200 |
---|---|---|
committer | heikki@hundin.mysql.fi <> | 2005-02-13 21:05:18 +0200 |
commit | 961d8b0ebf427ff4a3a4d2f32c06579198642303 (patch) | |
tree | 94f0841be5c9e51b46e9ec0efb97c1842e87c73d /sql/sql_cache.cc | |
parent | 21f1b24c293109994ab38c64942d9d3c90742608 (diff) | |
parent | 548f7dbada385ca42b78cc6c32639174464a0800 (diff) | |
download | mariadb-git-961d8b0ebf427ff4a3a4d2f32c06579198642303.tar.gz |
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-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 e1367412601..6eff958257b 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1421,7 +1421,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; |