mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

Browse source 
into sanja.is.com.ua:/home/bell/mysql/work-do-4.1


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown 2003-01-03 19:35:14 +02:00
commit 8aa2e87a78
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mysql-test/r/subselect.result
View file

@ -841,4 +841,13 @@ ROW(1, 1, 'a') IN (select b,a,c from t where c='b' or c='a')
1
select ROW(1, 1, 'a') IN (select b,a,c from t limit 2);
This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery'
drop table if exists t;
drop table t;
create table t (a int);
insert into t values (1);
do @a:=(SELECT a from t);
select @a;
@a
1
drop table t;
do (SELECT a from t);
Table 'test.t' doesn't exist

10
mysql-test/t/subselect.test
View file

@ -462,4 +462,12 @@ select ROW(1, 2, 'a') IN (select a,b,c from t where c='b' or c='a');
select ROW(1, 1, 'a') IN (select b,a,c from t where c='b' or c='a');
-- error 1235
select ROW(1, 1, 'a') IN (select b,a,c from t limit 2);
drop table if exists t;
drop table t;
create table t (a int);
insert into t values (1);
do @a:=(SELECT a from t);
select @a;
drop table t;
-- error 1146
do (SELECT a from t);

9
sql/sql_parse.cc
View file

@ -1609,7 +1609,14 @@ mysql_execute_command(THD *thd)
break;
}
case SQLCOM_DO:
res=mysql_do(thd, *lex->insert_list);
if (tables && ((res= check_table_access(thd, SELECT_ACL, tables)) ||
(res= open_and_lock_tables(thd,tables))))
break;
fix_tables_pointers(lex->all_selects_list);
res= mysql_do(thd, *lex->insert_list);
if (thd->net.report_error)
res= -1;
break;
case SQLCOM_EMPTY_QUERY: