diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-29 16:41:12 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-29 16:41:12 +0200 |
| commit | fdc094f53579877a020c78cdc4796cc0260c891b (patch) | |
| tree | 6fa96253f51373b5ea15453107fe03b27e6a2715 /sql/sql_yacc.yy | |
| parent | 4514f0b0fa7219a643fbed0e6fd6b577eae67df6 (diff) | |
| parent | 4653621909f900200c1e3238a4f5d2f58f6edf29 (diff) | |
| download | mariadb-git-fdc094f53579877a020c78cdc4796cc0260c891b.tar.gz | |
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 6c3152858ed..7cb05d6bd3c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1451,9 +1451,9 @@ select: select_init { Lex->sql_command=SQLCOM_SELECT; }; select_init: - SELECT_SYM select_part2 { Select->braces=false; } opt_union + SELECT_SYM select_part2 { Select->braces= 0; } opt_union | - '(' SELECT_SYM select_part2 ')' { Select->braces=true;} union_opt; + '(' SELECT_SYM select_part2 ')' { Select->braces= 1;} union_opt; select_part2: @@ -2366,7 +2366,7 @@ procedure_clause: lex->proc_list.elements=0; lex->proc_list.first=0; lex->proc_list.next= (byte**) &lex->proc_list.first; - if (add_proc_to_list(new Item_field(NULL,NULL,$2.str))) + if (add_proc_to_list(lex->thd, new Item_field(NULL,NULL,$2.str))) YYABORT; current_thd->safe_to_cache_query=0; } @@ -2384,10 +2384,11 @@ procedure_list2: procedure_item: remember_name expr { - if (add_proc_to_list($2)) + LEX *lex= Lex; + if (add_proc_to_list(lex->thd, $2)) YYABORT; if (!$2->name) - $2->set_name($1,(uint) ((char*) Lex->tok_end - $1)); + $2->set_name($1,(uint) ((char*) lex->tok_end - $1)); }; opt_into: |