diff options
| author | unknown <sergefp@mysql.com> | 2006-01-19 17:05:57 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2006-01-19 17:05:57 +0300 |
| commit | ce78242859fc034a4b486f145f3c7c3e15cf77ee (patch) | |
| tree | fc887a53599fced04650498cdf48c890078784c8 /sql/sql_lex.h | |
| parent | 098af0ae1aae693829f0c9daef551f2c3571c476 (diff) | |
| parent | 9d6f47eb932ef569716287f629f4d24bf11ce2eb (diff) | |
| download | mariadb-git-ce78242859fc034a4b486f145f3c7c3e15cf77ee.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_partition.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 |