diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-11-02 14:49:26 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-11-02 14:49:26 +0100 |
| commit | 296a0fdcca82503976b2c7279341f275bfcc3f19 (patch) | |
| tree | 838f6e5fc076209096b887360145850f326f706b /sql/sql_partition.h | |
| parent | 3a2d15730b6be272dd7c9f05dd5089d12fc4a930 (diff) | |
| download | mariadb-git-296a0fdcca82503976b2c7279341f275bfcc3f19.tar.gz | |
Fixed a few bugs in hex string generation, in call to val_str for partition expressions, also made code reusable for DEFAULT handling to fix BUG#48464 by introducing function get_cs_converted_string_value, added partition_utf8 test case for UTF8 outputs
Diffstat (limited to 'sql/sql_partition.h')
| -rw-r--r-- | sql/sql_partition.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_partition.h b/sql/sql_partition.h index 97b361c4b43..6e1bf8b5728 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -75,11 +75,12 @@ void get_partition_set(const TABLE *table, uchar *buf, const uint index, const key_range *key_spec, part_id_range *part_spec); uint get_partition_field_store_length(Field *field); -int get_converted_part_value_from_string(Item *item, - String *res, - CHARSET_INFO *cs, - String *val_conv, - bool use_hex); +int get_cs_converted_part_value_from_string(THD *thd, + Item *item, + String *input_str, + String *output_str, + CHARSET_INFO *cs, + bool use_hex); void get_full_part_id_from_key(const TABLE *table, uchar *buf, KEY *key_info, const key_range *key_spec, |