diff options
| author | unknown <sergefp@mysql.com> | 2006-01-18 14:09:08 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2006-01-18 14:09:08 +0300 |
| commit | 18a1e69ebaa46722c49c493f23ee45c4cf847c3c (patch) | |
| tree | 125d1e6899817ba566c75f28a00bfcef1f98a7a4 /sql/sql_lex.h | |
| parent | b58c076c1898ec5f994660063df20ace2f1924e9 (diff) | |
| parent | 0f1fa93af8708ea34326039f844ddd6ac053687c (diff) | |
| download | mariadb-git-18a1e69ebaa46722c49c493f23ee45c4cf847c3c.tar.gz | |
Manual merge
mysql-test/r/partition.result:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 28ba8fbf94a..e9f653d5153 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -110,7 +110,7 @@ enum enum_sql_command { #define DESCRIBE_NORMAL 1 #define DESCRIBE_EXTENDED 2 /* - This is not #ifdef'ed because we want "EXPLAIN PARTITIONS ..." to produce + This is not within #ifdef because we want "EXPLAIN PARTITIONS ..." to produce additional "partitions" column even if partitioning is not compiled in. */ #define DESCRIBE_PARTITIONS 4 |