database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

fix windows embedded

Browse Source
This commit is contained in:
Sergei Golubchik
2010-11-02 10:47:36 +01:00
parent 74711a4615
commit 9a73249161
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libmysqld/CMakeLists.txt
View File

@ -144,7 +144,8 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
../sql/multi_range_read.cc ../sql/multi_range_read.cc
../sql/opt_index_cond_pushdown.cc ../sql/opt_index_cond_pushdown.cc
../sql/opt_subselect.cc ../sql/opt_subselect.cc
../sql/create_options.cc ../sql/create_options.cc
../sql/sql_expression_cache.cc
${GEN_SOURCES} ${GEN_SOURCES}
${LIB_SOURCES}) ${LIB_SOURCES})

6
sql/sql_expression_cache.cc
View File

@ -114,10 +114,8 @@ void Expression_cache_tmptable::init()
field_counter=1; field_counter=1;
if (cache_table->alloc_keys(1) || if (cache_table->alloc_keys(1) ||
(cache_table->add_tmp_key(0, items.elements - 1, cache_table->add_tmp_key(0, items.elements - 1, &field_enumerator,
&field_enumerator, (uchar*)&field_counter, TRUE) ||
(uchar*)&field_counter,
TRUE) < 0) ||
ref.tmp_table_index_lookup_init(table_thd, cache_table->key_info, it, ref.tmp_table_index_lookup_init(table_thd, cache_table->key_info, it,
TRUE)) TRUE))
{ {