summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-01-03 23:04:52 +0200
committermonty@mysql.com <>2005-01-03 23:04:52 +0200
commit309b1a2b6ca36ed76753057cb032b6f4179bdc9b (patch)
tree0f73878fcf058ff862f3f7eb305aafae2ad3465d /sql/sql_lex.h
parenta9853184d3b69a3802984e0994282dc3a3320296 (diff)
parent530a104eec3abc0620ee6c3b649f9a425306bfe1 (diff)
downloadmariadb-git-309b1a2b6ca36ed76753057cb032b6f4179bdc9b.tar.gz
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 007a4601338..6ed5fb247dc 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -721,7 +721,7 @@ typedef struct st_lex
/* special JOIN::prepare mode: changing of query is prohibited */
bool view_prepare_mode;
bool safe_to_cache_query;
- bool subqueries;
+ bool subqueries, ignore;
bool variables_used;
ALTER_INFO alter_info;
/* Prepared statements SQL syntax:*/