mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
9a833dc688
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.
75 lines
2.4 KiB
Text
75 lines
2.4 KiB
Text
set names utf8;
|
|
create table t1 (a varchar(2) character set cp1250)
|
|
partition by list columns (a)
|
|
( partition p0 values in (0x81));
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` varchar(2) CHARACTER SET cp1250 DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
PARTITION BY LIST COLUMNS(`a`)
|
|
(PARTITION `p0` VALUES IN (_cp1250 0x81) ENGINE = MyISAM)
|
|
drop table t1;
|
|
create table t1 (a varchar(2) character set cp1250)
|
|
partition by list columns (a)
|
|
( partition p0 values in (0x80));
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` varchar(2) CHARACTER SET cp1250 DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
PARTITION BY LIST COLUMNS(`a`)
|
|
(PARTITION `p0` VALUES IN ('€') ENGINE = MyISAM)
|
|
drop table t1;
|
|
create table t1 (a varchar(1500), b varchar(1570))
|
|
partition by list columns(a,b)
|
|
( partition p0 values in (('a','b')));
|
|
ERROR HY000: The total length of the partitioning fields is too large
|
|
create table t1 (a varchar(1023) character set utf8 collate utf8_spanish2_ci)
|
|
partition by range columns(a)
|
|
( partition p0 values less than ('CZ'),
|
|
partition p1 values less than ('CH'),
|
|
partition p2 values less than ('D'));
|
|
insert into t1 values ('czz'),('chi'),('ci'),('cg');
|
|
select * from t1 where a between 'cg' AND 'ci';
|
|
a
|
|
ci
|
|
cg
|
|
drop table t1;
|
|
create table t1 (a varchar(2) character set ucs2)
|
|
partition by list columns (a)
|
|
(partition p0 values in (0x2020),
|
|
partition p1 values in (''));
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` varchar(2) CHARACTER SET ucs2 DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
PARTITION BY LIST COLUMNS(`a`)
|
|
(PARTITION `p0` VALUES IN ('†') ENGINE = MyISAM,
|
|
PARTITION `p1` VALUES IN ('') ENGINE = MyISAM)
|
|
insert into t1 values ('');
|
|
insert into t1 values (_ucs2 0x2020);
|
|
drop table t1;
|
|
#
|
|
# Start of 10.5 tests
|
|
#
|
|
#
|
|
# MDEV-20856 Bad values in metadata views for partitions on VARBINARY
|
|
#
|
|
CREATE TABLE t1 (a VARBINARY(10)) CHARACTER SET utf8
|
|
PARTITION BY LIST COLUMNS (a) (PARTITION p0 VALUES IN (0xFF));
|
|
SHOW CREATE TABLE t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` varbinary(10) DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8
|
|
PARTITION BY LIST COLUMNS(`a`)
|
|
(PARTITION `p0` VALUES IN (_binary 0xff) ENGINE = MyISAM)
|
|
SELECT PARTITION_DESCRIPTION FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME='t1';
|
|
PARTITION_DESCRIPTION
|
|
_binary 0xff
|
|
DROP TABLE t1;
|
|
#
|
|
# End of 10.5 tests
|
|
#
|