diff options
| -rw-r--r-- | mysql-test/t/user_var.test | 8 | ||||
| -rw-r--r-- | sql/sql_class.cc | 43 | ||||
| -rw-r--r-- | sql/sql_class.h | 1 |
3 files changed, 7 insertions, 45 deletions
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test index c6c4e4d9d2f..147eec6e21d 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -416,14 +416,6 @@ DROP TRIGGER trg1; DROP TABLE t1; ---echo # ---echo # Bug #12408412: GROUP_CONCAT + ORDER BY + INPUT/OUTPUT ---echo # SAME USER VARIABLE = CRASH ---echo # - -SET @bug12408412=1; -SELECT GROUP_CONCAT(@bug12408412 ORDER BY 1) INTO @bug12408412; - # # MDEV-616 LP BUG#1002126 # Bug #11764371 57196: MORE FUN WITH ASSERTION: !TABLE->FILE || diff --git a/sql/sql_class.cc b/sql/sql_class.cc index c5005c8ad5c..27c80967c2b 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3110,42 +3110,13 @@ int select_exists_subselect::send_data(List<Item> &items) int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u) { unit= u; - List_iterator_fast<my_var> var_li(var_list); - List_iterator_fast<Item> it(list); - Item *item; - my_var *mv; - Item_func_set_user_var **suv; if (var_list.elements != list.elements) { my_message(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT, ER(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT), MYF(0)); return 1; - } - - /* - Iterate over the destination variables and mark them as being - updated in this query. - We need to do this at JOIN::prepare time to ensure proper - const detection of Item_func_get_user_var that is determined - by the presence of Item_func_set_user_vars - */ - - suv= set_var_items= (Item_func_set_user_var **) - sql_alloc(sizeof(Item_func_set_user_var *) * list.elements); - - while ((mv= var_li++) && (item= it++)) - { - if (!mv->local) - { - *suv= new Item_func_set_user_var(mv->s, item); - (*suv)->fix_fields(thd, 0); - } - else - *suv= NULL; - suv++; - } - + } return 0; } @@ -3465,7 +3436,6 @@ int select_dumpvar::send_data(List<Item> &items) List_iterator<Item> it(items); Item *item; my_var *mv; - Item_func_set_user_var **suv; DBUG_ENTER("select_dumpvar::send_data"); if (unit->offset_limit_cnt) @@ -3478,19 +3448,20 @@ int select_dumpvar::send_data(List<Item> &items) my_message(ER_TOO_MANY_ROWS, ER(ER_TOO_MANY_ROWS), MYF(0)); DBUG_RETURN(1); } - for (suv= set_var_items; ((mv= var_li++) && (item= it++)); suv++) + while ((mv= var_li++) && (item= it++)) { if (mv->local) { - DBUG_ASSERT(!*suv); if (thd->spcont->set_variable(thd, mv->offset, &item)) DBUG_RETURN(1); } else { - DBUG_ASSERT(*suv); - (*suv)->save_item_result(item); - if ((*suv)->update()) + Item_func_set_user_var *suv= new Item_func_set_user_var(mv->s, item); + if (suv->fix_fields(thd, 0)) + DBUG_RETURN (1); + suv->save_item_result(item); + if (suv->update()) DBUG_RETURN (1); } } diff --git a/sql/sql_class.h b/sql/sql_class.h index 3ce49c52a86..ba410354df9 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -4025,7 +4025,6 @@ public: class select_dumpvar :public select_result_interceptor { ha_rows row_count; - Item_func_set_user_var **set_var_items; public: List<my_var> var_list; select_dumpvar() { var_list.empty(); row_count= 0;} |