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 /sql/sql_lex.cc | |
| 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
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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); |