diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-09-12 19:23:47 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-09-12 19:23:47 +0300 |
| commit | 61663eaa1882d2cdaab6dcd75e6515646adc500b (patch) | |
| tree | 338d509c4ce0bb5b6d64d0da72995eeecb49933e /sql | |
| parent | 11930efba69eb4d0d76affe34a1323cdd5b5bd79 (diff) | |
| parent | 67dafb011724bcd2ea5762aa6ed36daeffb2aba3 (diff) | |
| download | mariadb-git-61663eaa1882d2cdaab6dcd75e6515646adc500b.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b84a21b1440..4046aef892b 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5267,9 +5267,12 @@ optional_order_or_limit: SELECT_LEX *sel= lex->current_select; SELECT_LEX_UNIT *unit= sel->master_unit(); SELECT_LEX *fake= unit->fake_select_lex; - unit->global_parameters= fake; - fake->no_table_names_allowed= 1; - lex->current_select= fake; + if (fake) + { + unit->global_parameters= fake; + fake->no_table_names_allowed= 1; + lex->current_select= fake; + } thd->where= "global ORDER clause"; } order_or_limit |