1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge with 4.1

This commit is contained in:
monty@mysql.com
2005-02-15 17:12:13 +02:00
28 changed files with 231 additions and 78 deletions

View File

@@ -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;