Commit 0d578714 authored by unknown's avatar unknown
Browse files

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
parents 95d3d98b 4c21a10f

innobase/row/row0mysql.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

sql/sql_cache.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;