diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-11-23 20:40:16 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-11-23 20:40:16 +0200 |
| commit | b99dec07b08cc6c54d91b7ee6b0607abc62b9a8c (patch) | |
| tree | 040b622960fc14c65dcbf3a454f0455725af4c3b | |
| parent | 96b338f7dfd123e93d0c3bc31dca1e7c10db5c77 (diff) | |
| download | mariadb-git-b99dec07b08cc6c54d91b7ee6b0607abc62b9a8c.tar.gz | |
after merging fix (update SCRUM?)
mysql-test/t/subselect.test:
after merging fix
sql/sql_lex.cc:
after merging fix
sql/sql_update.cc:
after merging fix
sql/sql_yacc.yy:
after merging fix
| -rw-r--r-- | mysql-test/t/subselect.test | 2 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 2 | ||||
| -rw-r--r-- | sql/sql_update.cc | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 75ae1a74125..c86a6e58b1a 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -114,6 +114,7 @@ EXPLAIN SELECT DISTINCT date FROM searchconthardwarefr3 WHERE date='2002-08-03'; EXPLAIN SELECT (SELECT DISTINCT date FROM searchconthardwarefr3 WHERE date='2002-08-03'); SELECT DISTINCT date FROM searchconthardwarefr3 WHERE date='2002-08-03'; SELECT (SELECT DISTINCT date FROM searchconthardwarefr3 WHERE date='2002-08-03'); +SELECT 1 FROM searchconthardwarefr3 WHERE 1=(SELECT 1 UNION SELECT 1) UNION ALL SELECT 1; -- error 1240 SELECT 1 FROM searchconthardwarefr3 WHERE 1=(SELECT 1 UNION ALL SELECT 1) UNION SELECT 1; EXPLAIN SELECT 1 FROM searchconthardwarefr3 WHERE 1=(SELECT 1 UNION SELECT 1); @@ -181,7 +182,6 @@ EXPLAIN SELECT numreponse FROM threadhardwarefr7 WHERE numeropost='1' AND numrep EXPLAIN SELECT MAX(numreponse) FROM threadhardwarefr7 WHERE numeropost='1'; EXPLAIN SELECT numreponse FROM threadhardwarefr7 WHERE numeropost='1' AND numreponse=(SELECT MAX(numreponse) FROM threadhardwarefr7 WHERE numeropost='1'); drop table if exists threadhardwarefrtest7; -drop table searchconthardwarefr3; #update with subselects create table t1 (a int NOT NULL, b int, primary key (a)); diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 5adc1bec539..cf7d866915e 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -149,7 +149,7 @@ LEX *lex_start(THD *thd, uchar *buf,uint length) lex->select_lex.expr_list.empty(); lex->select_lex.ftfunc_list_alloc.empty(); lex->select_lex.ftfunc_list= &lex->select_lex.ftfunc_list_alloc; - lex->select= &lex->select_lex; + lex->current_select= &lex->select_lex; lex->convert_set= (lex->thd= thd)->variables.convert_set; lex->yacc_yyss=lex->yacc_yyvs=0; lex->ignore_space=test(thd->sql_mode & MODE_IGNORE_SPACE); diff --git a/sql/sql_update.cc b/sql/sql_update.cc index ece2ed3df41..d4dc394ec9b 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -68,7 +68,6 @@ int mysql_update(THD *thd, LINT_INIT(used_index); LINT_INIT(timestamp_query_id); - table_list->lock_type= lock_type; if ((open_and_lock_tables(thd, table_list))) DBUG_RETURN(-1); fix_tables_pointers(&thd->lex.select_lex); diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index e5ec86e6658..df343714e55 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1631,7 +1631,7 @@ select_init: select_part2: { LEX *lex=Lex; - if (lex->select == &lex->select_lex) + if (lex->current_select == &lex->select_lex) lex->lock_option= TL_READ; /* Only for global SELECT */ mysql_init_select(lex); } |