diff options
| author | unknown <sergefp@mysql.com> | 2005-12-26 14:56:15 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-12-26 14:56:15 +0300 |
| commit | e6cf611fe2382e2b2679dcbc7fca20f3e718c4d2 (patch) | |
| tree | 3a28c9b3bd246795cf59f2badf4b64058cbad745 /sql/sql_lex.h | |
| parent | 66f962d808111c63e4aa03371b5520beb72c3a73 (diff) | |
| parent | b3abc9773e9944fb8b0c70c63ff2a6b1d4210366 (diff) | |
| download | mariadb-git-e6cf611fe2382e2b2679dcbc7fca20f3e718c4d2.tar.gz | |
Merge newbox:mysql-5.1-ppruning-r4
into pylon.mylan:/home/psergey/mysql-5.1-26dec-merge
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/handler.h:
Merge
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 00ba075e922..eb2be2691b3 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -103,6 +103,11 @@ enum enum_sql_command { // describe/explain types #define DESCRIBE_NORMAL 1 #define DESCRIBE_EXTENDED 2 +/* + This is not #ifdef'ed because we want "EXPLAIN PARTITIONS ..." to produce + additional "partitions" column even if partitioning is not compiled in. +*/ +#define DESCRIBE_PARTITIONS 4 enum enum_sp_suid_behaviour { |