diff options
author | unknown <bell@sanja.is.com.ua> | 2003-07-01 10:03:20 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2003-07-01 10:03:20 +0300 |
commit | 8db5021725c39823511d36d800299a2f4b2efda3 (patch) | |
tree | cd54e2149de2b87d2e445802361904126b9c15ef /sql/sql_lex.h | |
parent | 0a1d7d64c85894fda6ff1f6342b167d22110dbf7 (diff) | |
parent | cd01f7cda08f8cff241e02835a16fc5aca6280e2 (diff) | |
download | mariadb-git-8db5021725c39823511d36d800299a2f4b2efda3.tar.gz |
merged
sql/item_subselect.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 5cebddaf02e..faf7e16e54a 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -213,6 +213,7 @@ public: bool dependent; /* dependent from outer select subselect */ bool uncacheable; /* result of this query can't be cached */ bool no_table_names_allowed; /* used for global order by */ + bool no_error; /* suppress error message (convert it to warnings) */ static void *operator new(size_t size) { |