1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#20836 Selecting into variables results in wrong results being returned

Browse Source 
- Post-merge cleanup.
- Disabled this bug's test for 5.x until 16861 is resolved.


mysql-test/r/distinct.result:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Remove results for this bug.  When bug number 16861 is resolved, the result
  should match the 4.1 result.
mysql-test/t/distinct.test:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Disable the test for 20836.  This test should remain disabled until bug 16861
  is fixed.  The results for the test should be the same as in 4.1.
sql/sql_class.cc:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Post-merge cleanup.
This commit is contained in:
unknown 2006-11-30 13:09:48 -05:00
parent 0e6675479d
commit 1c49e88e4c
3 changed files with 68 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
mysql-test/r/distinct.result
View File

@ -607,62 +607,3 @@ id select_type table type possible_keys key key_len ref rows Extra
SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a; SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;
a a a a
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (id INT NOT NULL, fruit_id INT NOT NULL, fruit_name varchar(20)
default NULL);
INSERT INTO t1 VALUES (1,1,'ORANGE');
INSERT INTO t1 VALUES (2,2,'APPLE');
INSERT INTO t1 VALUES (3,2,'APPLE');
INSERT INTO t1 VALUES (4,3,'PEAR');
SELECT DISTINCT fruit_id, fruit_name INTO @v1, @v2 FROM t1 WHERE fruit_name =
'APPLE';
SELECT @v1, @v2;
@v1 @v2
2 APPLE
SELECT DISTINCT fruit_id, fruit_name INTO @v3, @v4 FROM t1 GROUP BY fruit_id,
fruit_name HAVING fruit_name = 'APPLE';
SELECT @v3, @v4;
@v3 @v4
2 APPLE
SELECT DISTINCT @v5:= fruit_id, @v6:= fruit_name INTO @v7, @v8 FROM t1 WHERE
fruit_name = 'APPLE';
SELECT @v5, @v6, @v7, @v8;
@v5 @v6 @v7 @v8
2 APPLE 2 APPLE
SELECT DISTINCT @v5 + fruit_id, CONCAT(@v6, fruit_name) INTO @v9, @v10 FROM t1
WHERE fruit_name = 'APPLE';
SELECT @v5, @v6, @v7, @v8, @v9, @v10;
@v5 @v6 @v7 @v8 @v9 @v10
2 APPLE 2 APPLE 4 APPLEAPPLE
SELECT DISTINCT @v11:= @v5 + fruit_id, @v12:= CONCAT(@v6, fruit_name) INTO
@v13, @v14 FROM t1 WHERE fruit_name = 'APPLE';
SELECT @v11, @v12, @v13, @v14;
@v11 @v12 @v13 @v14
4 APPLEAPPLE 4 APPLEAPPLE
SELECT DISTINCT @v13, @v14 INTO @v15, @v16 FROM t1 WHERE fruit_name = 'APPLE';
SELECT @v15, @v16;
@v15 @v16
4 APPLEAPPLE
SELECT DISTINCT 2 + 2, 'Bob' INTO @v17, @v18 FROM t1 WHERE fruit_name =
'APPLE';
SELECT @v17, @v18;
@v17 @v18
4 Bob
DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20)
default NULL);
SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE
'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE
'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;
SELECT @v19, @v20;
@v19 @v20
2 APPLE
SELECT * FROM t2;
fruit_id fruit_name
2 APPLE
2 APPLE
DROP TABLE t1;
DROP TABLE t2;

124
mysql-test/t/distinct.test
View File

@ -437,68 +437,70 @@ EXPLAIN SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;
SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a; SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;
DROP TABLE t1; DROP TABLE t1;
# The test case for bug#20836 should be re-enabled when bug#16861 is resolved
# The results for the test should be the same as in 4.1.
# #
#Bug #20836: Selecting into variables results in wrong results being returned #Bug #20836: Selecting into variables results in wrong results being returned
# #
--disable_warnings #--disable_warnings
DROP TABLE IF EXISTS t1; #DROP TABLE IF EXISTS t1;
--enable_warnings #--enable_warnings
#
CREATE TABLE t1 (id INT NOT NULL, fruit_id INT NOT NULL, fruit_name varchar(20) #CREATE TABLE t1 (id INT NOT NULL, fruit_id INT NOT NULL, fruit_name varchar(20)
default NULL); #default NULL);
#
INSERT INTO t1 VALUES (1,1,'ORANGE'); #INSERT INTO t1 VALUES (1,1,'ORANGE');
INSERT INTO t1 VALUES (2,2,'APPLE'); #INSERT INTO t1 VALUES (2,2,'APPLE');
INSERT INTO t1 VALUES (3,2,'APPLE'); #INSERT INTO t1 VALUES (3,2,'APPLE');
INSERT INTO t1 VALUES (4,3,'PEAR'); #INSERT INTO t1 VALUES (4,3,'PEAR');
#
SELECT DISTINCT fruit_id, fruit_name INTO @v1, @v2 FROM t1 WHERE fruit_name = #SELECT DISTINCT fruit_id, fruit_name INTO @v1, @v2 FROM t1 WHERE fruit_name =
'APPLE'; #'APPLE';
SELECT @v1, @v2; #SELECT @v1, @v2;
#
SELECT DISTINCT fruit_id, fruit_name INTO @v3, @v4 FROM t1 GROUP BY fruit_id, #SELECT DISTINCT fruit_id, fruit_name INTO @v3, @v4 FROM t1 GROUP BY fruit_id,
fruit_name HAVING fruit_name = 'APPLE'; #fruit_name HAVING fruit_name = 'APPLE';
SELECT @v3, @v4; #SELECT @v3, @v4;
#
SELECT DISTINCT @v5:= fruit_id, @v6:= fruit_name INTO @v7, @v8 FROM t1 WHERE #SELECT DISTINCT @v5:= fruit_id, @v6:= fruit_name INTO @v7, @v8 FROM t1 WHERE
fruit_name = 'APPLE'; #fruit_name = 'APPLE';
SELECT @v5, @v6, @v7, @v8; #SELECT @v5, @v6, @v7, @v8;
#
SELECT DISTINCT @v5 + fruit_id, CONCAT(@v6, fruit_name) INTO @v9, @v10 FROM t1 #SELECT DISTINCT @v5 + fruit_id, CONCAT(@v6, fruit_name) INTO @v9, @v10 FROM t1
WHERE fruit_name = 'APPLE'; #WHERE fruit_name = 'APPLE';
SELECT @v5, @v6, @v7, @v8, @v9, @v10; #SELECT @v5, @v6, @v7, @v8, @v9, @v10;
#
SELECT DISTINCT @v11:= @v5 + fruit_id, @v12:= CONCAT(@v6, fruit_name) INTO #SELECT DISTINCT @v11:= @v5 + fruit_id, @v12:= CONCAT(@v6, fruit_name) INTO
@v13, @v14 FROM t1 WHERE fruit_name = 'APPLE'; #@v13, @v14 FROM t1 WHERE fruit_name = 'APPLE';
SELECT @v11, @v12, @v13, @v14; #SELECT @v11, @v12, @v13, @v14;
#
SELECT DISTINCT @v13, @v14 INTO @v15, @v16 FROM t1 WHERE fruit_name = 'APPLE'; #SELECT DISTINCT @v13, @v14 INTO @v15, @v16 FROM t1 WHERE fruit_name = 'APPLE';
SELECT @v15, @v16; #SELECT @v15, @v16;
#
SELECT DISTINCT 2 + 2, 'Bob' INTO @v17, @v18 FROM t1 WHERE fruit_name = #SELECT DISTINCT 2 + 2, 'Bob' INTO @v17, @v18 FROM t1 WHERE fruit_name =
'APPLE'; #'APPLE';
SELECT @v17, @v18; #SELECT @v17, @v18;
#
--disable_warnings #--disable_warnings
DROP TABLE IF EXISTS t2; #DROP TABLE IF EXISTS t2;
--enable_warnings #--enable_warnings
#
CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20) #CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20)
default NULL); #default NULL);
#
SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE #SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE
'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE'; #'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2; #LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
--exec rm $MYSQL_TEST_DIR/var/tmp/data1.tmp #--exec rm $MYSQL_TEST_DIR/var/tmp/data1.tmp
#
SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE #SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE
'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE'; #'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2; #LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;
--exec rm $MYSQL_TEST_DIR/var/tmp/data2.tmp #--exec rm $MYSQL_TEST_DIR/var/tmp/data2.tmp
#
SELECT @v19, @v20; #SELECT @v19, @v20;
SELECT * FROM t2; #SELECT * FROM t2;
#
DROP TABLE t1; #DROP TABLE t1;
DROP TABLE t2; #DROP TABLE t2;

12
sql/sql_class.cc
View File

@ -1853,13 +1853,12 @@ bool select_dumpvar::send_data(List<Item> &items)
{ {
if (mv->local) if (mv->local)
{ {
if (thd->spcont->set_variable(current_thd, yy->get_var_idx(), if (thd->spcont->set_variable(thd, mv->offset, &item))
it.ref())) DBUG_RETURN(1);
DBUG_RETURN(1);
} }
else else
{ {
Item_func_set_user_var *suv= new Item_func_set_user_var(*ls, item); Item_func_set_user_var *suv= new Item_func_set_user_var(mv->s, item);
/* /*
Item_func_set_user_var can't substitute something else on its Item_func_set_user_var can't substitute something else on its
@ -1868,9 +1867,8 @@ bool select_dumpvar::send_data(List<Item> &items)
we do not check var->fixed we do not check var->fixed
*/ */
suv->fix_fields(thd, (TABLE_LIST *) thd->lex->select_lex.table_list.first, suv->fix_fields(thd, 0);
0); suv->check(0);
suv->check();
suv->update(); suv->update();
} }
} }