Commit 9a732491 authored by Sergei Golubchik's avatar Sergei Golubchik

fix windows embedded

parent 74711a46
...@@ -144,7 +144,8 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ...@@ -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})
......
...@@ -114,10 +114,8 @@ void Expression_cache_tmptable::init() ...@@ -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))
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment