diff options
author | konstantin@mysql.com <> | 2005-07-15 00:41:58 +0400 |
---|---|---|
committer | konstantin@mysql.com <> | 2005-07-15 00:41:58 +0400 |
commit | 60e7d6ff37b496ad9d3b69978b6d3eea8f2ccaf9 (patch) | |
tree | 6270b71249876dce484df66a3dc0c69147bf2b3f /sql/sql_lex.cc | |
parent | 3274b050bcf664751c43fd46c0cd9ee20b71cf66 (diff) | |
download | mariadb-git-60e7d6ff37b496ad9d3b69978b6d3eea8f2ccaf9.tar.gz |
Post-merge fixes.
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index a4293fa76bd..630a7e950f7 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -562,7 +562,7 @@ int yylex(void *arg, void *yythd) its value in a query for the binlog, the query must stay grammatically correct. */ - else if (c == '?' && ((THD*) yythd)->command == COM_PREPARE && + else if (c == '?' && ((THD*) yythd)->command == COM_STMT_PREPARE && !ident_map[cs, yyPeek()]) return(PARAM_MARKER); return((int) c); |