diff options
| author | unknown <pem@mysql.com> | 2005-05-30 11:06:31 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-05-30 11:06:31 +0200 |
| commit | 4701bd908ba760fe28b476a0ac7bfea7db67c55d (patch) | |
| tree | a145f81cb2f14d8988bae58a9bcbabb2ec0d103d /sql/sql_yacc.yy | |
| parent | 1c7b61e3aef5227165a9957ead000e67935708b2 (diff) | |
| parent | 166accffda5d2019804c842a91b33e7d1a65f6ac (diff) | |
| download | mariadb-git-4701bd908ba760fe28b476a0ac7bfea7db67c55d.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8181521969a..708dcb7a0d9 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6511,6 +6511,11 @@ flush: FLUSH_SYM opt_no_write_to_binlog { LEX *lex=Lex; + if (lex->sphead && lex->sphead->m_type == TYPE_ENUM_FUNCTION) + { + my_error(ER_SP_BADSTATEMENT, MYF(0), "FLUSH"); + YYABORT; + } lex->sql_command= SQLCOM_FLUSH; lex->type=0; lex->no_write_to_binlog= $2; } |