database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

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


innobase/row/row0mysql.c:
  Auto merged
sql/sql_cache.cc:
  Auto merged
This commit is contained in:
unknown
2005-02-13 21:05:18 +02:00
parent 95d3d98b00 4c21a10f27
commit 0d57871425
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
innobase/row/row0mysql.c
View File

@ -417,7 +417,7 @@ row_create_prebuilt(
prebuilt->sel_graph = NULL; prebuilt->sel_graph = NULL;
prebuilt->search_tuple = dtuple_create(heap, 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); clust_index = dict_table_get_first_index(table);

2
sql/sql_cache.cc
View File

@ -1421,7 +1421,7 @@ ulong Query_cache::init_cache()
init(); init();
approx_additional_data_size = (sizeof(Query_cache) + approx_additional_data_size = (sizeof(Query_cache) +
sizeof(gptr)*(def_query_hash_size+ sizeof(gptr)*(def_query_hash_size+
def_query_hash_size)); def_table_hash_size));
if (query_cache_size < approx_additional_data_size) if (query_cache_size < approx_additional_data_size)
goto err; goto err;