1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Local merge

This commit is contained in:
Marc Alff
2011-03-10 09:43:55 +01:00
86 changed files with 1557 additions and 379 deletions

View File

@ -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 */