diff options
| author | unknown <brian@zim.tangent.org> | 2006-02-11 17:26:32 -0800 |
|---|---|---|
| committer | unknown <brian@zim.tangent.org> | 2006-02-11 17:26:32 -0800 |
| commit | dc11d498b25d6b2fd909b344f3f2837571cb38b0 (patch) | |
| tree | 1e483de698a9543c4360218d2bc09927fb27671a /sql/lex.h | |
| parent | d49527b6099c71b2973daf188b43b33feefc7c7d (diff) | |
| parent | 88aa9b13102aa2d2676128b66caf532720cb8e8a (diff) | |
| download | mariadb-git-dc11d498b25d6b2fd909b344f3f2837571cb38b0.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.tangent.org:/home/brian/raid/mysql-5.1-new
sql/ha_myisam.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/lex.h b/sql/lex.h index 3dfaa0cf6cb..b52be29457f 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -410,10 +410,6 @@ static SYMBOL symbols[] = { { "QUARTER", SYM(QUARTER_SYM)}, { "QUERY", SYM(QUERY_SYM)}, { "QUICK", SYM(QUICK)}, - { "RAID0", SYM(RAID_0_SYM)}, - { "RAID_CHUNKS", SYM(RAID_CHUNKS)}, - { "RAID_CHUNKSIZE", SYM(RAID_CHUNKSIZE)}, - { "RAID_TYPE", SYM(RAID_TYPE)}, { "RANGE", SYM(RANGE_SYM)}, { "READ", SYM(READ_SYM)}, { "READ_ONLY", SYM(READ_ONLY_SYM)}, @@ -512,7 +508,6 @@ static SYMBOL symbols[] = { { "STORAGE", SYM(STORAGE_SYM)}, { "STRAIGHT_JOIN", SYM(STRAIGHT_JOIN)}, { "STRING", SYM(STRING_SYM)}, - { "STRIPED", SYM(RAID_STRIPED_SYM)}, { "SUBJECT", SYM(SUBJECT_SYM)}, { "SUBPARTITION", SYM(SUBPARTITION_SYM)}, { "SUBPARTITIONS", SYM(SUBPARTITIONS_SYM)}, |