diff options
| author | unknown <andrey@example.com> | 2006-08-17 19:09:55 +0200 |
|---|---|---|
| committer | unknown <andrey@example.com> | 2006-08-17 19:09:55 +0200 |
| commit | f7bf4adfa9bc5d98d6cfe175dc775be063d897fc (patch) | |
| tree | a72b07c504f84d3ab7a7de9ae2646e648f2c85cc /sql/sql_partition.cc | |
| parent | 10a1dffb05b52d6f469cadb7694012f147edc82b (diff) | |
| parent | 443afbd612aec129761773f28de13bc90171aac9 (diff) | |
| download | mariadb-git-f7bf4adfa9bc5d98d6cfe175dc775be063d897fc.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into example.com:/work/mysql-5.1-runtime
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
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 f1c8e099441..49ca738ae7f 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"; |