mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
c4f5326bb7
The problem was that my_hash_sort didn't properly delete end-space characters properly, so strings that should compare identically was seen as different strings. (Space was handled correctly, but not NBSP) This caused duplicate key errors when a heap table was converted to Aria as part of overflow in group by. Fixed by removing all characters that compares as end space when creating a hash. Other things: - Fixed that --sorted_results also works for errors in mysqltest. - Speed up hash by not comparing strings that has different hash. - Speed up many my_hash_sort functions by using registers to calculate hash instead of pointers. This was previously done for some functions, but not for all. - Made a macro of the hash function, to simplify code and to be able to experiment with new hash functions. client/mysqltest.cc: Fixed that --sorted_results also works for error messages. mysql-test/r/ctype_partitions.result: New test to ensure that partitions on hash works mysql-test/suite/multi_source/gtid.result: Updated result mysql-test/suite/multi_source/gtid.test: Test that --sorted_result works for error messages mysql-test/suite/multi_source/gtid_ignore_duplicates.result: Updated result mysql-test/suite/multi_source/gtid_ignore_duplicates.test: Updated result mysql-test/suite/multi_source/load_data.result: Updated result mysql-test/suite/multi_source/load_data.test: Updated result mysql-test/t/ctype_partitions.test: New test to ensure that partitions on hash works storage/heap/hp_write.c: Speed up hash by not comparing strings that has different hash. storage/maria/ma_check.c: Extra debug strings/ctype-bin.c: Use macro for hash function strings/ctype-latin1.c: Use macro for hash function Use registers to calculate hash (speedup) strings/ctype-mb.c: Use macro for hash function Use registers to calculate hash (speedup) strings/ctype-simple.c: Use macro for hash function Use same variable names as in other my_hash_sort functions. Update my_hash_sort_simple() to properly remove end space (patch by Bar) strings/ctype-uca.c: Ignore duplicated space inside strings and end space in my_hash_sort_uca(). This fixed MDEV-6255 Use macro for hash function Use registers to calculate hash (speedup) strings/ctype-ucs2.c: Use macro for hash function Use registers to calculate hash (speedup) strings/ctype-utf8.c: Use macro for hash function Use registers to calculate hash (speedup) strings/strings_def.h: Made a macro of the hash function, to simplify code and to be able to experiment with new hash functions.
30 lines
970 B
Text
30 lines
970 B
Text
change master '' to master_port=MYPORT_1, master_host='127.0.0.1', master_user='root';
|
|
change master 'master2' to master_port=MYPORT_2, master_host='127.0.0.1', master_user='root';
|
|
start all slaves;
|
|
Warnings:
|
|
Note 1937 SLAVE 'master2' started
|
|
Note 1937 SLAVE '' started
|
|
set default_master_connection = '';
|
|
include/wait_for_slave_to_start.inc
|
|
set default_master_connection = 'master2';
|
|
include/wait_for_slave_to_start.inc
|
|
set default_master_connection = '';
|
|
create table t1 (a varchar(10) character set utf8);
|
|
load data infile '../../std_data/loaddata6.dat' into table t1;
|
|
create table t2 (a varchar(10) character set utf8);
|
|
load data infile '../../std_data/loaddata6.dat' into table t2;
|
|
select count(*) from t1;
|
|
count(*)
|
|
1
|
|
select count(*) from t2;
|
|
count(*)
|
|
1
|
|
drop table t1;
|
|
drop table t2;
|
|
stop all slaves;
|
|
Warnings:
|
|
Note 1938 SLAVE '' stopped
|
|
Note 1938 SLAVE 'master2' stopped
|
|
include/reset_master_slave.inc
|
|
include/reset_master_slave.inc
|
|
include/reset_master_slave.inc
|