database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into moonbone.local:/work/15538-bug-5.0-mysql
This commit is contained in:
evgen@moonbone.local
2006-01-13 14:30:20 +03:00
parent 8dbedc9ffd 41ef34356c
commit 02570c20bf
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/select.result
View File

@@ -3358,3 +3358,5 @@ select * from t1 left join t2 on f1=t2.f2 where t1.f2='a';
f1 f2 f2 f1 f2 f2
NULL a NULL NULL a NULL
drop table t1,t2; drop table t1,t2;
select * from (select * left join t on f1=f2) tt;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on f1=f2) tt' at line 1

6
mysql-test/t/select.test
View File

@@ -2829,3 +2829,9 @@ create table t2 (f2 char not null);
insert into t2 values('b'); insert into t2 values('b');
select * from t1 left join t2 on f1=t2.f2 where t1.f2='a'; select * from t1 left join t2 on f1=t2.f2 where t1.f2='a';
drop table t1,t2; drop table t1,t2;
#
# Bug#15538 unchecked table absense caused server crash.
#
--error 1064
select * from (select * left join t on f1=f2) tt;

4
sql/sql_yacc.yy
View File

@@ -5248,13 +5248,13 @@ join_table:
| table_ref LEFT opt_outer JOIN_SYM table_ref | table_ref LEFT opt_outer JOIN_SYM table_ref
ON ON
{ {
YYERROR_UNLESS($1 && $5);
/* Change the current name resolution context to a local context. */ /* Change the current name resolution context to a local context. */
if (push_new_name_resolution_context(YYTHD, $1, $5)) if (push_new_name_resolution_context(YYTHD, $1, $5))
YYABORT; YYABORT;
} }
expr expr
{ {
YYERROR_UNLESS($1 && $5);
add_join_on($5,$8); add_join_on($5,$8);
Lex->pop_context(); Lex->pop_context();
$5->outer_join|=JOIN_TYPE_LEFT; $5->outer_join|=JOIN_TYPE_LEFT;
@@ -5279,6 +5279,7 @@ join_table:
| table_ref RIGHT opt_outer JOIN_SYM table_ref | table_ref RIGHT opt_outer JOIN_SYM table_ref
ON ON
{ {
YYERROR_UNLESS($1 && $5);
/* Change the current name resolution context to a local context. */ /* Change the current name resolution context to a local context. */
if (push_new_name_resolution_context(YYTHD, $1, $5)) if (push_new_name_resolution_context(YYTHD, $1, $5))
YYABORT; YYABORT;
@@ -5286,7 +5287,6 @@ join_table:
expr expr
{ {
LEX *lex= Lex; LEX *lex= Lex;
YYERROR_UNLESS($1 && $5);
if (!($$= lex->current_select->convert_right_join())) if (!($$= lex->current_select->convert_right_join()))
YYABORT; YYABORT;
add_join_on($$, $8); add_join_on($$, $8);