diff options
| author | unknown <monty@mysql.com> | 2005-02-25 19:51:29 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-25 19:51:29 +0200 |
| commit | 0be32e7e5a03be486c49dab46c2630c89a6e99f4 (patch) | |
| tree | e6f827904039e2af38a0130f261728726ef9dc16 /sql/sql_yacc.yy | |
| parent | 3d8aed6d83096102d8273bd238cc186e0fbbf0cb (diff) | |
| parent | 08b3e79e409c79e09751ac8fd684898e390737d3 (diff) | |
| download | mariadb-git-0be32e7e5a03be486c49dab46c2630c89a6e99f4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/sp_pcontext.cc:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ba1b999b240..3b03b66c61e 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3235,7 +3235,6 @@ alter: } sp_a_chistics { - THD *thd= YYTHD; LEX *lex=Lex; lex->sql_command= SQLCOM_ALTER_PROCEDURE; @@ -3249,7 +3248,6 @@ alter: } sp_a_chistics { - THD *thd= YYTHD; LEX *lex=Lex; lex->sql_command= SQLCOM_ALTER_FUNCTION; @@ -4480,7 +4478,6 @@ simple_expr: { $$= new Item_int((char*) "TRUE",1,1); } | ident '.' ident '(' udf_expr_list ')' { - LEX *lex= Lex; sp_name *name= new sp_name($1, $3); name->init_qname(YYTHD); @@ -6429,24 +6426,24 @@ field_term_list: field_term: TERMINATED BY text_string { - DBUG_ASSERT(Lex->exchange); + DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->field_term= $3; } | OPTIONALLY ENCLOSED BY text_string { LEX *lex= Lex; - DBUG_ASSERT(lex->exchange); + DBUG_ASSERT(lex->exchange != 0); lex->exchange->enclosed= $4; lex->exchange->opt_enclosed= 1; } | ENCLOSED BY text_string { - DBUG_ASSERT(Lex->exchange); + DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->enclosed= $3; } | ESCAPED BY text_string { - DBUG_ASSERT(Lex->exchange); + DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->escaped= $3; }; @@ -6461,12 +6458,12 @@ line_term_list: line_term: TERMINATED BY text_string { - DBUG_ASSERT(Lex->exchange); + DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->line_term= $3; } | STARTING BY text_string { - DBUG_ASSERT(Lex->exchange); + DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->line_start= $3; }; @@ -6474,7 +6471,7 @@ opt_ignore_lines: /* empty */ | IGNORE_SYM NUM LINES { - DBUG_ASSERT(Lex->exchange); + DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->skip_lines= atol($2.str); }; @@ -7306,7 +7303,6 @@ option_value: } | NAMES_SYM charset_name_or_default opt_collate { - THD *thd= YYTHD; LEX *lex= Lex; $2= $2 ? $2 : global_system_variables.character_set_client; $3= $3 ? $3 : $2; |