diff options
| author | monty@mashka.mysql.fi <> | 2003-09-12 04:18:07 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-09-12 04:18:07 +0300 |
| commit | 04c43fca8e91f5cb0081b10512b31f514b9557b0 (patch) | |
| tree | d50c5c2c1a243241a31006d775628dd2fcc29a03 /sql | |
| parent | 7538242e4f410f6e0586dfc6024e975e766aa4f5 (diff) | |
| download | mariadb-git-04c43fca8e91f5cb0081b10512b31f514b9557b0.tar.gz | |
Optimize thai character handling
Remove sel000xxxx tests
After merge fixes
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 91349feec39..6be8fe54854 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -875,7 +875,6 @@ void Query_log_event::print(FILE* file, bool short_form, char* last_db) int Query_log_event::exec_event(struct st_relay_log_info* rli) { int expected_error,actual_error= 0; - init_sql_alloc(&thd->mem_root, 8192,0); thd->db= (char*) rewrite_db(db); /* @@ -1589,7 +1588,6 @@ void Load_log_event::set_fields(List<Item> &field_list) int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, bool use_rli_only_for_errors) { - init_sql_alloc(&thd->mem_root, 8192,0); thd->db= (char*) rewrite_db(db); DBUG_ASSERT(thd->query == 0); thd->query = 0; // Should not be needed diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ccc6e10dee8..a3a8fe288fa 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2185,9 +2185,9 @@ add_key_fields(JOIN_TAB *stat,KEY_FIELD **key_fields,uint *and_level, if (cond_func->key_item()->real_item()->type() == Item::FIELD_ITEM && !(cond_func->used_tables() & OUTER_REF_TABLE_BIT)) add_key_field(key_fields,*and_level, - ((Item_field*) (cond_func->key_item()->real_item()))->field, 0, + ((Item_field*) (cond_func->key_item()->real_item()))-> + field, 0, cond_func->arguments()+1, cond_func->argument_count()-1, -#endif usable_tables); break; case Item_func::OPTIMIZE_OP: @@ -3356,8 +3356,11 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) OPTION_FOUND_ROWS ? HA_POS_ERROR : join->unit->select_limit_cnt)) < 0) - { /* before reporting "Impossible WHERE" for the whole query - we have to check isn't it only "impossible ON" instead */ + { + /* + Before reporting "Impossible WHERE" for the whole query + we have to check isn't it only "impossible ON" instead + */ sel->cond=orig_cond; if (!tab->on_expr || sel->test_quick_select(tab->keys, @@ -3365,8 +3368,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) (join->select_options & OPTION_FOUND_ROWS ? HA_POS_ERROR : - join->thd->select_limit)) < 0) - DBUG_RETURN(1); // Impossible WHERE + join->unit->select_limit_cnt)) < 0) + DBUG_RETURN(1); // Impossible WHERE } else sel->cond=orig_cond; |