diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-10-10 15:29:06 +0500 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-10-10 15:29:06 +0500 |
| commit | 98bb6fd4babb76b2c539614d66d08ee4d83004dd (patch) | |
| tree | ba9dfdeb5fd841bde4e169141ab9d2750494957f | |
| parent | cb81894a354e098508965e444de8313150822295 (diff) | |
| download | mariadb-git-98bb6fd4babb76b2c539614d66d08ee4d83004dd.tar.gz | |
clean-up, indentation fixes.
mysql-test/t/outfile.test:
this 'drop...' not needed anymore
sql/sql_yacc.yy:
indentation fixes
| -rw-r--r-- | mysql-test/t/outfile.test | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 20 |
2 files changed, 10 insertions, 11 deletions
diff --git a/mysql-test/t/outfile.test b/mysql-test/t/outfile.test index 28d5ebfaf99..59ce6cc56fe 100644 --- a/mysql-test/t/outfile.test +++ b/mysql-test/t/outfile.test @@ -8,7 +8,6 @@ drop table if exists t1; # We need to check that we have 'file' privilege. -#drop table if exists t1; #create table t1 (`a` blob); #insert into t1 values("hello world"),("Hello mars"),(NULL); #select * into outfile "/tmp/select-test.1" from t1; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index c040357a5da..c1513dd55e2 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3870,7 +3870,7 @@ select_var_ident: '@' ident_or_text into: INTO OUTFILE TEXT_STRING_sys { - LEX *lex= Lex; + LEX *lex= Lex; lex->uncacheable(UNCACHEABLE_SIDEEFFECT); if (!(lex->exchange= new sql_exchange($3.str, 0)) || !(lex->result= new select_export(lex->exchange))) @@ -4724,17 +4724,17 @@ field_term: } | OPTIONALLY ENCLOSED BY text_string { - LEX *lex= Lex; + LEX *lex= Lex; DBUG_ASSERT(lex->exchange); - lex->exchange->enclosed= $4; - lex->exchange->opt_enclosed= 1; + lex->exchange->enclosed= $4; + lex->exchange->opt_enclosed= 1; } - | ENCLOSED BY text_string + | ENCLOSED BY text_string { DBUG_ASSERT(Lex->exchange); Lex->exchange->enclosed= $3; } - | ESCAPED BY text_string + | ESCAPED BY text_string { DBUG_ASSERT(Lex->exchange); Lex->exchange->escaped= $3; @@ -4749,12 +4749,12 @@ line_term_list: | line_term; line_term: - TERMINATED BY text_string + TERMINATED BY text_string { DBUG_ASSERT(Lex->exchange); Lex->exchange->line_term= $3; } - | STARTING BY text_string + | STARTING BY text_string { DBUG_ASSERT(Lex->exchange); Lex->exchange->line_start= $3; @@ -4762,8 +4762,8 @@ line_term: opt_ignore_lines: /* empty */ - | IGNORE_SYM NUM LINES - { + | IGNORE_SYM NUM LINES + { DBUG_ASSERT(Lex->exchange); Lex->exchange->skip_lines= atol($2.str); }; |