summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-09-02 14:36:14 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-09-02 14:36:14 +0200
commit5edf3e03887142f83044ee9fcc8fcf65386c43c7 (patch)
tree179e1f56be501aeb8ed2a975ee49efad5e5144dd /sql/mysqld.h
parent32a29afea777d8bbfcea7a2b5e6e5ee674013cb5 (diff)
parentc58e184b14ccdf0b0eaeeeb7947e23b8b5fff7a7 (diff)
downloadmariadb-git-5edf3e03887142f83044ee9fcc8fcf65386c43c7.tar.gz
Merge branch '10.5' into 10.6
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index fda3a7d2ef9..cd05a66fff3 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -872,6 +872,12 @@ enum enum_query_type
QT_ITEM_SUBSELECT_ID_ONLY,
QT_SHOW_SELECT_NUMBER= (1<<10),
+
+ /// Do not print database name or table name in the identifiers (even if
+ /// this means the printout will be ambigous). It is assumed that the caller
+ /// passing this flag knows what they are doing.
+ QT_ITEM_IDENT_DISABLE_DB_TABLE_NAMES= (1 <<11),
+
/// This is used for EXPLAIN EXTENDED extra warnings / Be more detailed
/// Be more detailed than QT_EXPLAIN.
/// Perhaps we should eventually include QT_ITEM_IDENT_SKIP_CURRENT_DATABASE