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 | 275110544bc8b3d28cfdec6d53520e43578e717c (patch) | |
| tree | ed3f3ff803b4c69669c7a1e83feafe9972196316 /sql/mysqld.h | |
| parent | 8602f2d77d7195c62f012293615c9136aaf475b5 (diff) | |
| parent | d7a4372fbe367d54c086f5dfe3cdddf050247868 (diff) | |
| download | mariadb-git-275110544bc8b3d28cfdec6d53520e43578e717c.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 */ |