diff options
| author | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-12 14:42:07 -0400 |
|---|---|---|
| committer | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-12 14:42:07 -0400 |
| commit | 3247d60da6b706de3fc5501a7548910ed0e6356c (patch) | |
| tree | 2a08a4fee6ea45b69ae57d8272bd211ec24818d1 /sql/sql_table.cc | |
| parent | 1265506376a1a630517fbb3ccb25d020fc6aa81d (diff) | |
| parent | a3170bf6b3dbabcc0c8063b24c2d20ba66ec2125 (diff) | |
| download | mariadb-git-3247d60da6b706de3fc5501a7548910ed0e6356c.tar.gz | |
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695
BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
Auto merged
mysql-test/r/partition.result:
manual merge
mysql-test/r/partition_02myisam.result:
manual merge
mysql-test/t/partition.test:
manual merge
sql/sql_partition.cc:
manual merge
sql/sql_partition.h:
manual merge
sql/sql_show.cc:
manual merge
sql/sql_table.cc:
manual merge
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index e9c89b4983d..a49b7a2cc42 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1233,7 +1233,7 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags) { if (!(part_syntax_buf= generate_partition_syntax(part_info, &syntax_len, - TRUE))) + TRUE, TRUE))) { DBUG_RETURN(TRUE); } @@ -3155,7 +3155,7 @@ bool mysql_create_table_internal(THD *thd, */ if (!(part_syntax_buf= generate_partition_syntax(part_info, &syntax_len, - TRUE))) + TRUE, TRUE))) goto err; part_info->part_info_string= part_syntax_buf; part_info->part_info_len= syntax_len; |