diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-29 14:16:28 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-29 14:16:28 +0200 |
| commit | 09f1a84206b08957035aac1a641b4e3db579c88d (patch) | |
| tree | 6e9e7a8082984b7d7cbea99aa7de3bc5fc9a94df /sql/sql_yacc.yy | |
| parent | ff0f7dc5616fb9a4010f22e9ad2872a9bc601c38 (diff) | |
| parent | a5c60b3f29953e9da891ca39a709cff23f2fa1d5 (diff) | |
| download | mariadb-git-09f1a84206b08957035aac1a641b4e3db579c88d.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
sql/sql_yacc.yy:
Auto merged
mysql-test/r/rpl_ignore_table.result:
Merge
mysql-test/t/rpl_ignore_table.test:
Merge, add a connection master to run following test on master
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 3e9c7ba7344..45c2b663a05 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -9054,7 +9054,8 @@ grant_ident: | table_ident { LEX *lex=Lex; - if (!lex->current_select->add_table_to_list(lex->thd, $1,NULL,0)) + if (!lex->current_select->add_table_to_list(lex->thd, $1,NULL, + TL_OPTION_UPDATING)) MYSQL_YYABORT; if (lex->grant == GLOBAL_ACLS) lex->grant = TABLE_ACLS & ~GRANT_ACL; |