diff options
| author | unknown <monty@mysql.com> | 2005-02-25 17:12:06 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-25 17:12:06 +0200 |
| commit | 08b3e79e409c79e09751ac8fd684898e390737d3 (patch) | |
| tree | 6fc367f3ae7c8968bf852d78cccec9f8c03ab417 /sql/sql_yacc.yy | |
| parent | c5d4d50ab703d9b3cb087ea5e721baed6fbdab8c (diff) | |
| parent | 248e44945161ec6a84072c8684447aeb702e5bd7 (diff) | |
| download | mariadb-git-08b3e79e409c79e09751ac8fd684898e390737d3.tar.gz | |
Merge with global tree
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/examples/ha_archive.cc:
Merge with global tree
(Use my changes)
sql/sql_parse.cc:
Remove 'tmp' fix to be able to run tests
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; |