diff options
| author | Marc Alff <marc.alff@oracle.com> | 2011-03-10 09:43:55 +0100 |
|---|---|---|
| committer | Marc Alff <marc.alff@oracle.com> | 2011-03-10 09:43:55 +0100 |
| commit | 3f2d2fe7b5a4d9af49ac503e7069c943675f563d (patch) | |
| tree | ed3f3ff803b4c69669c7a1e83feafe9972196316 /sql/mysqld.h | |
| parent | caee7f416f198a73c7aac978bfafb565f50fde03 (diff) | |
| parent | 0b7e6f81afe24f4734b3d8ce5d85411609f8d3a0 (diff) | |
| download | mariadb-git-3f2d2fe7b5a4d9af49ac503e7069c943675f563d.tar.gz | |
Local merge
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 08c83257e67..7fa09ba77ac 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -402,16 +402,16 @@ enum options_mysqld /** - Query type constants. - - QT_ORDINARY -- ordinary SQL query. - QT_IS -- SQL query to be shown in INFORMATION_SCHEMA (in utf8 and without - character set introducers). + Query type constants (usable as bitmap flags). */ enum enum_query_type { - QT_ORDINARY, - QT_IS + /// Nothing specific, ordinary SQL query. + QT_ORDINARY= 0, + /// In utf8. + QT_TO_SYSTEM_CHARSET= (1 << 0), + /// Without character set introducers. + QT_WITHOUT_INTRODUCERS= (1 << 1) }; /* query_id */ |