diff options
author | Alexander Barkov <bar@mariadb.com> | 2019-10-18 08:07:40 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2019-10-18 10:15:17 +0400 |
commit | 9a833dc6881b896e65cf76c9699faa6c324e1775 (patch) | |
tree | 25b3daa904d7fb75a50c08d777ae3fce025684f2 /sql/sql_partition.h | |
parent | 9c9606152505792fcb8f4b7386e5b6a25e2790b4 (diff) | |
download | mariadb-git-9a833dc6881b896e65cf76c9699faa6c324e1775.tar.gz |
MDEV-20856 Bad values in metadata views for partitions on VARBINARY
The old code to print partition values was too complicated:
- it created new Items for character set conversion purposes.
- it mixed string conversion and partition error reporting
in the same code blocks.
Simplifying the code as follows:
- Adding helper methods String::can_be_safely_convert_to() and
String::append_introducer_and_hex().
- Adding DBUG_EXECUTE_IF("generate_partition_syntax_for_frm", push_warning...)
into generate_partition_syntax_for_frm(), to test the PARTITON
clause written to FRM. Adding test partition_utf8-debug.test for this.
- Removing functions get_cs_converted_part_value_from_string() and
get_cs_converted_string_value. Changing get_partition_column_description()
to use Type_handler::partition_field_append_value() instead.
This makes SHOW CREATE TABLE and SELECT FROM I_S.PARTITIONS
use the same code path.
- Changing Type_handler::partition_field_append_value() not to
call convert_charset_partition_constant(), to avoid creating a new Item
for string conversion pursposes.
Rewritting the code to use only String methods.
- Removing error reporting code (ER_PARTITION_FUNCTION_IS_NOT_ALLOWED)
from Type_handler::partition_field_append_value().
The error is correctly detected and reported on the caller level.
So error reporting was redundant here.
Also:
- Moving methods Type_handler::partition_field_*() from sql_partition.cc
to sql_type.cc. This fixes compilation problem with -DPLUGIN_PARTITION=NO,
earlier introduced by the patch for MDEV-20831.
Diffstat (limited to 'sql/sql_partition.h')
-rw-r--r-- | sql/sql_partition.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_partition.h b/sql/sql_partition.h index ea197a6fc2c..8732aacbbd7 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -98,12 +98,6 @@ 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_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, |