diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-08-26 06:14:05 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-08-26 06:14:05 -0400 |
| commit | bfa81464ca238234c2a58a8a364fecbb574e02fe (patch) | |
| tree | e9d0b98814793c3b53d10df6892f7bbe1cd7dc43 /sql/sql_partition.cc | |
| parent | 13133087e4089fa4313b367eacaee73ae5e2369f (diff) | |
| parent | c752d7dbf326743c68bd454ec12c7c95d2f3a8c5 (diff) | |
| download | mariadb-git-bfa81464ca238234c2a58a8a364fecbb574e02fe.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into dator5.(none):/home/pappa/bug21388
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/item.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index f5a30994f7d..d38ee41e6c3 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -46,12 +46,12 @@ */ const LEX_STRING partition_keywords[]= { - { (char *) STRING_WITH_LEN("HASH") }, - { (char *) STRING_WITH_LEN("RANGE") }, - { (char *) STRING_WITH_LEN("LIST") }, - { (char *) STRING_WITH_LEN("KEY") }, - { (char *) STRING_WITH_LEN("MAXVALUE") }, - { (char *) STRING_WITH_LEN("LINEAR ") } + { C_STRING_WITH_LEN("HASH") }, + { C_STRING_WITH_LEN("RANGE") }, + { C_STRING_WITH_LEN("LIST") }, + { C_STRING_WITH_LEN("KEY") }, + { C_STRING_WITH_LEN("MAXVALUE") }, + { C_STRING_WITH_LEN("LINEAR ") } }; static const char *part_str= "PARTITION"; static const char *sub_str= "SUB"; |