Merge branch '10.1' into bb-10.1-merge

This commit is contained in:
Sergei Golubchik 2014-12-03 11:37:26 +01:00
commit ec4137c62b
47 changed files with 3412 additions and 692 deletions

View file

@ -613,9 +613,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),
/// This value means focus on readability, not on ability to parse back, etc.
QT_EXPLAIN= (1 << 4)
};
/* query_id */
typedef int64 query_id_t;
extern query_id_t global_query_id;