mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
3c46af6cf4
Don't read character set files if we are using only the default charset. In most cases the user will not anymore get a warning about missing character set files Compare strings with space extend instead of space strip. Now the following comparisons holds: "a" == "a " and "a\t" < "a". (Bug #3152). Note: Because of the above fix, one has to do a REPAIR on any table that has an ascii character < 32 last in a CHAR/VARCHAR/TEXT columns. heap/hp_hash.c: Comments and DBUG information include/my_handler.h: Updated prototype for mi_compare_text myisam/ft_boolean_search.c: Updated calls to mi_compare_text myisam/ft_nlq_search.c: Updated calls to mi_compare_text myisam/ft_parser.c: Updated calls to mi_compare_text myisam/ft_stopwords.c: Updated calls to mi_compare_text myisam/ft_update.c: Updated calls to mi_compare_text myisam/mi_check.c: Updated calls to mi_compare_text myisam/mi_search.c: Changed all string comparisons that removed end space to instead extend the shorter string with space myisam/mi_unique.c: Updated calls to mi_compare_text myisam/mi_write.c: Updated calls to mi_compare_text myisam/myisam_ftdump.c: Removed compiler warning mysql-test/r/ctype_collate.result: Fixed wrong result mysql-test/r/heap_btree.result: More tests mysql-test/t/heap_btree.test: more tests mysys/charset.c: Don't read charsets if we are only using default charset Don't require 'init_available_charsets' to succeed. mysys/my_handler.c: Compare strings with space extend instead of space strip mysys/tree.c: Fixed code to get better results for range optimzier sql/field.cc: Compare strings with space extend instead of space strip sql/filesort.cc: Compare strings with space extend instead of space strip sql/ha_heap.cc: Created bit map for keys that are using BTREE. This allows the optimzer to use BTREE's for sorting sql/ha_heap.h: Created bit map for keys that are using BTREE. This allows the optimzer to use BTREE's for sorting strings/ctype-big5.c: Compare strings with space extend instead of space strip strings/ctype-czech.c: Indentation cleanup. Should be fixed to use space extend strings/ctype-gbk.c: Compare strings with space extend instead of space strip strings/ctype-latin1.c: Compare strings with space extend instead of space strip Added missing my_hash_sort_latin1_de function strings/ctype-mb.c: For binary strings, don't remove end space when comparing strings/ctype-simple.c: Compare strings with space extend instead of space strip strings/ctype-sjis.c: Compare strings with space extend instead of space strip strings/ctype-tis620.c: Added comments that we should fix end space handling strings/ctype-ucs2.c: indentation fixes strings/ctype-utf8.c: Added comments that we should fix end space handling strings/ctype-win1250ch.c: Added comments that we should fix end space handling
96 lines
3.8 KiB
Text
96 lines
3.8 KiB
Text
#
|
|
# Test problem with characters < ' ' at end of strings (Bug #3152)
|
|
#
|
|
|
|
-- source include/have_innodb.inc
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
select 'a' = 'a', 'a' = 'a ', 'a ' = 'a';
|
|
select 'a\0' = 'a', 'a\0' < 'a', 'a\0' > 'a';
|
|
select 'a' = 'a\0', 'a' < 'a\0', 'a' > 'a\0';
|
|
select 'a\0' = 'a ', 'a\0' < 'a ', 'a\0' > 'a ';
|
|
select 'a ' = 'a\0', 'a ' < 'a\0', 'a ' > 'a\0';
|
|
select 'a a' > 'a', 'a \0' < 'a';
|
|
select binary 'a a' > 'a', binary 'a \0' > 'a', binary 'a\0' > 'a';
|
|
|
|
#
|
|
# Test MyISAM tables.
|
|
#
|
|
|
|
create table t1 (text1 varchar(32) not NULL, KEY key1 (text1));
|
|
insert into t1 values ('teststring'), ('nothing'), ('teststring\t');
|
|
check table t1;
|
|
select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';
|
|
select * from t1 where text1='teststring' or text1 like 'teststring_%';
|
|
select * from t1 where text1='teststring' or text1 > 'teststring\t';
|
|
select * from t1 order by text1;
|
|
explain select * from t1 order by text1;
|
|
|
|
alter table t1 modify text1 char(32) binary not null;
|
|
check table t1;
|
|
select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';
|
|
select * from t1 where text1='teststring' or text1 like 'teststring_%';
|
|
select * from t1 where text1='teststring' or text1 > 'teststring\t';
|
|
select text1, length(text1) from t1 order by text1;
|
|
select text1, length(text1) from t1 order by binary text1;
|
|
|
|
alter table t1 modify text1 blob not null, drop key key1, add key key1 (text1(20));
|
|
insert into t1 values ('teststring ');
|
|
select concat('|', text1, '|') from t1 order by text1;
|
|
|
|
alter table t1 modify text1 text not null, pack_keys=1;
|
|
select * from t1 where text1 like 'teststring_%';
|
|
select * from t1 where text1='teststring' or text1 like 'teststring_%';
|
|
select * from t1 where text1='teststring' or text1 > 'teststring\t';
|
|
select concat('|', text1, '|') from t1 order by text1;
|
|
drop table t1;
|
|
|
|
create table t1 (text1 varchar(32) not NULL, KEY key1 (text1)) pack_keys=0;
|
|
insert into t1 values ('teststring'), ('nothing'), ('teststring\t');
|
|
select * from t1 where text1='teststring' or text1 like 'teststring_%';
|
|
select * from t1 where text1='teststring' or text1 >= 'teststring\t';
|
|
drop table t1;
|
|
|
|
# Test HEAP tables (with BTREE keys)
|
|
|
|
create table t1 (text1 varchar(32) not NULL, KEY key1 using BTREE (text1)) engine=heap;
|
|
insert into t1 values ('teststring'), ('nothing'), ('teststring\t');
|
|
select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';
|
|
select * from t1 where text1='teststring' or text1 like 'teststring_%';
|
|
select * from t1 where text1='teststring' or text1 >= 'teststring\t';
|
|
select * from t1 order by text1;
|
|
explain select * from t1 order by text1;
|
|
|
|
alter table t1 modify text1 char(32) binary not null;
|
|
select * from t1 order by text1;
|
|
drop table t1;
|
|
|
|
#
|
|
# Test InnoDB tables
|
|
#
|
|
|
|
create table t1 (text1 varchar(32) not NULL, KEY key1 (text1)) engine=innodb;
|
|
insert into t1 values ('teststring'), ('nothing'), ('teststring\t');
|
|
check table t1;
|
|
select * from t1 where text1='teststring' or text1 like 'teststring_%';
|
|
select * from t1 where text1='teststring' or text1 > 'teststring\t';
|
|
select * from t1 order by text1;
|
|
explain select * from t1 order by text1;
|
|
|
|
alter table t1 modify text1 char(32) binary not null;
|
|
select * from t1 order by text1;
|
|
|
|
alter table t1 modify text1 blob not null, drop key key1, add key key1 (text1(20));
|
|
insert into t1 values ('teststring ');
|
|
select concat('|', text1, '|') from t1 order by text1;
|
|
|
|
alter table t1 modify text1 text not null, pack_keys=1;
|
|
select * from t1 where text1 like 'teststring_%';
|
|
|
|
# The following gives wrong result in InnoDB
|
|
select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%';
|
|
select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
|
|
select concat('|', text1, '|') from t1 order by text1;
|
|
drop table t1;
|