summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2003-09-09 15:23:38 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2003-09-09 15:23:38 +0300
commitb2a6994b22bff1ee9cb9afd730bd0b88eff978ba (patch)
treeaf5b9d9e7a58ba397cfd79cb87978e30ac54b584 /sql
parentd2008574d618db0fb1eafddb3ea99ddd3f0529d3 (diff)
downloadmariadb-git-b2a6994b22bff1ee9cb9afd730bd0b88eff978ba.tar.gz
Fix for a bug #1226.
Happens when braces are used on a single select, which leads to the uninitialized global parameters structure.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_yacc.yy5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index c753123b2be..b84a21b1440 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -2012,8 +2012,9 @@ select_init:
YYABORT;
}
/* select in braces, can't contain global parameters */
- sel->master_unit()->global_parameters=
- sel->master_unit()->fake_select_lex;
+ if (sel->master_unit()->fake_select_lex)
+ sel->master_unit()->global_parameters=
+ sel->master_unit()->fake_select_lex;
} union_opt;
select_init2: