diff options
author | unknown <sergefp@mysql.com> | 2006-01-20 19:38:11 +0300 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2006-01-20 19:38:11 +0300 |
commit | 64416b1d8945407113fccabe8d77d4357de918c4 (patch) | |
tree | 54aa8e4f5f69e7e2e856e1401f27456791667ea4 /sql/sql_lex.h | |
parent | cf735347e5a03824a5e897582c47e31b60dd90ed (diff) | |
parent | ce78242859fc034a4b486f145f3c7c3e15cf77ee (diff) | |
download | mariadb-git-64416b1d8945407113fccabe8d77d4357de918c4.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/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
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 b0eba863235..67dc903b04b 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -112,7 +112,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 |