diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-07-09 23:10:50 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-07-09 23:10:50 +0200 |
| commit | 9313d74e913cf7a3ce4f019d323c4689842af074 (patch) | |
| tree | 90adb4d952d048c2bf8d97e20ef78c5b0af453ec /sql/sql_yacc.yy | |
| parent | a1af64f3adc136a2874940880e3bb6ae17b10b07 (diff) | |
| parent | 006d97dc972bead95351dba20a1027d235d1b05f (diff) | |
| download | mariadb-git-9313d74e913cf7a3ce4f019d323c4689842af074.tar.gz | |
Merge main 5.0 into 5.0-build.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b6a215a2306..49b7fafcc0b 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3943,7 +3943,7 @@ alter_list_item: MYSQL_YYABORT; } if (check_table_name($3->table.str,$3->table.length) || - $3->db.str && check_db_name($3->db.str)) + ($3->db.str && check_db_name($3->db.str))) { my_error(ER_WRONG_TABLE_NAME, MYF(0), $3->table.str); MYSQL_YYABORT; @@ -4094,8 +4094,8 @@ slave_until: | UNTIL_SYM slave_until_opts { LEX *lex=Lex; - if ((lex->mi.log_file_name || lex->mi.pos) && - (lex->mi.relay_log_name || lex->mi.relay_log_pos) || + if (((lex->mi.log_file_name || lex->mi.pos) && + (lex->mi.relay_log_name || lex->mi.relay_log_pos)) || !((lex->mi.log_file_name && lex->mi.pos) || (lex->mi.relay_log_name && lex->mi.relay_log_pos))) { |