diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 23:05:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 23:05:26 +0200 |
| commit | 872649c7baab3a9f7efdda78e49c4bc7dd481d91 (patch) | |
| tree | 4fffb1a99ca36ccea65e64bcaa81293c40e7539f /sql/mysqld.h | |
| parent | 4995bcffaded6a02106632fb8f259cd3d9048dc4 (diff) | |
| parent | 4f1ad43992d75676687f29da96dd7c4147247a8f (diff) | |
| download | mariadb-git-872649c7baab3a9f7efdda78e49c4bc7dd481d91.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 673ef71cb7a..dbc65cd2a43 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. - Copyright (c) 2010, 2015, MariaDB +/* Copyright (c) 2006, 2016, 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 @@ -623,7 +623,13 @@ enum enum_query_type /// Without character set introducers. QT_WITHOUT_INTRODUCERS= (1 << 1), /// view internal representation (like QT_ORDINARY except ORDER BY clause) - QT_VIEW_INTERNAL= (1 << 2) + QT_VIEW_INTERNAL= (1 << 2), + /** + If an expression is constant, print the expression, not the value + it evaluates to. Should be used for error messages, so that they + don't reveal values. + */ + QT_NO_DATA_EXPANSION= (1 << 9), }; /* query_id */ |