Merge hundin.mysql.fi:/home/heikki/mysql-4.0

into hundin.mysql.fi:/home/heikki/mysql-4.1

2 files changed, 2 insertions, 2 deletions

diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c
index b7cd730828a..482cf698547 100644
--- a/innobase/row/row0mysql.c
+++ b/innobase/row/row0mysql.c
@@ -417,7 +417,7 @@ row_create_prebuilt(
 	prebuilt->sel_graph = NULL;
 
 	prebuilt->search_tuple = dtuple_create(heap,
-						dict_table_get_n_cols(table));
+					2 * dict_table_get_n_cols(table));
 	
 	clust_index = dict_table_get_first_index(table);
 
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;