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_partition.h | |
| 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_partition.h')
| -rw-r--r-- | sql/sql_partition.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_partition.h b/sql/sql_partition.h index 87f9a751ca3..7b07fd2eb53 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -69,7 +69,8 @@ bool check_partition_info(partition_info *part_info,handlerton **eng_type, bool fix_partition_func(THD *thd, const char *name, TABLE *table, bool create_table_ind); char *generate_partition_syntax(partition_info *part_info, - uint *buf_length, bool use_sql_alloc); + uint *buf_length, bool use_sql_alloc, + bool show_partition_options); bool partition_key_modified(TABLE *table, List<Item> &fields); void get_partition_set(const TABLE *table, byte *buf, const uint index, const key_range *key_spec, |