diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-02-24 10:27:23 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-24 10:27:23 +0100 |
commit | d044507dc53731e604f3137ed7423c6b94e83aba (patch) | |
tree | d55e8fb2d4a985c308485cd5b71eadcda5d6f5e3 /sql/sql_lex.h | |
parent | ff2d92b17d600f83b9ad4baaa96ede7c9c08801a (diff) | |
parent | 5a4ec8e60b10c176af1dd84157e1d15cf905637b (diff) | |
download | mariadb-git-d044507dc53731e604f3137ed7423c6b94e83aba.tar.gz |
Merge branch 'bb-10.1-serg' into 10.1
10.0 merge
10.0-galera merge
connect/10.1 merge
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 72a9ac14936..4427a88ac3f 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2010, 2015, MariaDB +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. + Copyright (c) 2010, 2016, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1076,6 +1076,13 @@ private: index_clause_map current_index_hint_clause; /* a list of USE/FORCE/IGNORE INDEX */ List<Index_hint> *index_hints; + +public: + inline void add_where_field(st_select_lex *sel) + { + DBUG_ASSERT(this != sel); + select_n_where_fields+= sel->select_n_where_fields; + } }; typedef class st_select_lex SELECT_LEX; @@ -1411,6 +1418,11 @@ public: return get_stmt_unsafe_flags() != 0; } + inline bool is_stmt_unsafe(enum_binlog_stmt_unsafe unsafe) + { + return binlog_stmt_flags & (1 << unsafe); + } + /** Flag the current (top-level) statement as unsafe. The flag will be reset after the statement has finished. |