diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-02 10:47:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-02 10:47:36 +0100 |
| commit | 9a73249161f5d49626efb80364bed02419b044be (patch) | |
| tree | 589cdb52abdd72f863d995608c4438af99cf1434 | |
| parent | 74711a46153088e5e9159977b42ba7615a3af2df (diff) | |
| download | mariadb-git-9a73249161f5d49626efb80364bed02419b044be.tar.gz | |
fix windows embedded
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sql/sql_expression_cache.cc | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index e4f8aa96312..cbae0ed7187 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -144,7 +144,8 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/multi_range_read.cc ../sql/opt_index_cond_pushdown.cc ../sql/opt_subselect.cc - ../sql/create_options.cc + ../sql/create_options.cc + ../sql/sql_expression_cache.cc ${GEN_SOURCES} ${LIB_SOURCES}) diff --git a/sql/sql_expression_cache.cc b/sql/sql_expression_cache.cc index 440d6cdc80f..50fd7c7ee4d 100644 --- a/sql/sql_expression_cache.cc +++ b/sql/sql_expression_cache.cc @@ -114,10 +114,8 @@ void Expression_cache_tmptable::init() field_counter=1; if (cache_table->alloc_keys(1) || - (cache_table->add_tmp_key(0, items.elements - 1, - &field_enumerator, - (uchar*)&field_counter, - TRUE) < 0) || + cache_table->add_tmp_key(0, items.elements - 1, &field_enumerator, + (uchar*)&field_counter, TRUE) || ref.tmp_table_index_lookup_init(table_thd, cache_table->key_info, it, TRUE)) { |