diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-10-23 23:54:21 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-10-23 23:54:21 +0300 |
| commit | e5386bcb6b439b637586adf6c492aadbe570a117 (patch) | |
| tree | dc867042337941940eb2f9556dac44abd3606799 | |
| parent | e94666f8e79c01b6ed3d7b0da482cd0a461e4092 (diff) | |
| download | mariadb-git-e5386bcb6b439b637586adf6c492aadbe570a117.tar.gz | |
added check of cardinality to IN/ALL/ANY subquery transformer
(BUG#1638)
mysql-test/r/subselect.result:
test for BUG#1638
mysql-test/t/subselect.test:
test for BUG#1638
sql/item_subselect.cc:
always check cardinality first
| -rw-r--r-- | mysql-test/r/subselect.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/subselect.test | 11 | ||||
| -rw-r--r-- | sql/item_subselect.cc | 17 |
3 files changed, 30 insertions, 5 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index aa3c1a8f5cd..110db3cfa13 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -1457,3 +1457,10 @@ dbid name -1 Valid -1 Valid 2 drop table t1,t2,t3,t4; +CREATE TABLE t1 (id int(11) default NULL) TYPE=MyISAM CHARSET=latin1; +INSERT INTO t1 VALUES (1),(5); +CREATE TABLE t2 (id int(11) default NULL) TYPE=MyISAM CHARSET=latin1; +INSERT INTO t2 VALUES (2),(6); +select * from t1 where (1,2,6) in (select * from t2); +ERROR 21000: Operand should contain 3 column(s) +DROP TABLE t1,t2; diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 79ac7d82c61..48c87f6cbd3 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -981,3 +981,14 @@ INSERT INTO `t4` (`task_id`, `description`) VALUES (1, 'Daily Check List'),(2, ' select dbid, name, (date_format(now() , '%Y-%m-%d') - INTERVAL how_often DAY) >= ifnull((SELECT date_format(max(create_date),'%Y-%m-%d') FROM t1 WHERE dbid = b.db_id AND taskid = a.taskgenid), '1950-01-01') from t3 a, t2 b, t4 WHERE dbid = - 1 AND primary_uid = '1' AND t4.task_id = taskid; SELECT dbid, name FROM t3 a, t2 b, t4 WHERE dbid = - 1 AND primary_uid = '1' AND ((date_format(now() , '%Y-%m-%d') - INTERVAL how_often DAY) >= ifnull((SELECT date_format(max(create_date),'%Y-%m-%d') FROM t1 WHERE dbid = b.db_id AND taskid = a.taskgenid), '1950-01-01')) AND t4.task_id = taskid; drop table t1,t2,t3,t4; + +# +# cardinality check +# +CREATE TABLE t1 (id int(11) default NULL) TYPE=MyISAM CHARSET=latin1; +INSERT INTO t1 VALUES (1),(5); +CREATE TABLE t2 (id int(11) default NULL) TYPE=MyISAM CHARSET=latin1; +INSERT INTO t2 VALUES (2),(6); +-- error 1240 +select * from t1 where (1,2,6) in (select * from t2); +DROP TABLE t1,t2; diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 704681dd511..6ac191af267 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -514,6 +514,12 @@ Item_in_subselect::single_value_transformer(JOIN *join, THD *thd= join->thd; thd->where= "scalar IN/ALL/ANY subquery"; + if (select_lex->item_list.elements > 1) + { + my_error(ER_OPERAND_COLUMNS, MYF(0), 1); + DBUG_RETURN(RES_ERROR); + } + if ((abort_on_null || (upper_not && upper_not->top_level())) && !select_lex->master_unit()->dependent && (func == &Item_bool_func2::gt_creator || @@ -606,11 +612,6 @@ Item_in_subselect::single_value_transformer(JOIN *join, select_lex->dependent= 1; Item *item; - if (select_lex->item_list.elements > 1) - { - my_error(ER_OPERAND_COLUMNS, MYF(0), 1); - DBUG_RETURN(RES_ERROR); - } item= (Item*) select_lex->item_list.head(); @@ -710,6 +711,12 @@ Item_in_subselect::row_value_transformer(JOIN *join, SELECT_LEX *select_lex= join->select_lex; + if (select_lex->item_list.elements != left_expr->cols()) + { + my_error(ER_OPERAND_COLUMNS, MYF(0), left_expr->cols()); + DBUG_RETURN(RES_ERROR); + } + if (!substitution) { //first call for this unit |