diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-02-13 21:05:18 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-02-13 21:05:18 +0200 |
| commit | 0d57871425c1a4a2b469cecad92e1ce41ba9b572 (patch) | |
| tree | 94f0841be5c9e51b46e9ec0efb97c1842e87c73d /sql/sql_cache.cc | |
| parent | 95d3d98b0007b70ae51726a084cda369f6d44469 (diff) | |
| parent | 4c21a10f27c6a15690b5640352d23f1c111ac729 (diff) | |
| download | mariadb-git-0d57871425c1a4a2b469cecad92e1ce41ba9b572.tar.gz | |
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1
innobase/row/row0mysql.c:
Auto merged
sql/sql_cache.cc:
Auto merged
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; |