1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed LP bug #697557.

Browse Source 
When stored in a key buffer any varchar field has a length prefix
that always takes 2 bytes.
This commit is contained in:
Igor Babaev 2011-01-05 15:03:30 -08:00
parent 77cbad4b31
commit cb4fa7f401
3 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/r/join_cache.result
View File

@ -6200,4 +6200,24 @@ a a b
2 NULL 42 2 NULL 42
SET SESSION join_cache_level = DEFAULT; SET SESSION join_cache_level = DEFAULT;
DROP TABLE t1,t2; DROP TABLE t1,t2;
#
# Bug #697557: hash join on a varchar field
#
CREATE TABLE t1 ( f1 varchar(10) , f2 int(11) , KEY (f1));
INSERT INTO t1 VALUES ('r',1), ('m',2);
CREATE TABLE t2 ( f1 varchar(10) , f2 int(11) , KEY (f1));
INSERT INTO t2 VALUES
('hgtofubn',1), ('GDOXZ',91), ('n',2), ('fggxgalh',88),
('hgtofu',1), ('GDO',101), ('n',3), ('fggxga',55),
('hgtofu',3), ('GDO',33), ('nn',3), ('fggxgarrr',77);
SET SESSION join_cache_level=3;
EXPLAIN
SELECT * FROM t1,t2 WHERE t2.f1 = t1.f1;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL f1 NULL NULL NULL 2 Using where
1 SIMPLE t2 ref f1 f1 13 test.t1.f1 2 Using join buffer (flat, BNLH join)
SELECT * FROM t1,t2 WHERE t2.f1 = t1.f1;
f1 f2 f1 f2
SET SESSION join_cache_level = DEFAULT;
DROP TABLE t1,t2;
set @@optimizer_switch=@save_optimizer_switch; set @@optimizer_switch=@save_optimizer_switch;

22
mysql-test/t/join_cache.test
View File

@ -2823,6 +2823,28 @@ SET SESSION join_cache_level = DEFAULT;
DROP TABLE t1,t2; DROP TABLE t1,t2;
--echo #
--echo # Bug #697557: hash join on a varchar field
--echo #
CREATE TABLE t1 ( f1 varchar(10) , f2 int(11) , KEY (f1));
INSERT INTO t1 VALUES ('r',1), ('m',2);
CREATE TABLE t2 ( f1 varchar(10) , f2 int(11) , KEY (f1));
INSERT INTO t2 VALUES
('hgtofubn',1), ('GDOXZ',91), ('n',2), ('fggxgalh',88),
('hgtofu',1), ('GDO',101), ('n',3), ('fggxga',55),
('hgtofu',3), ('GDO',33), ('nn',3), ('fggxgarrr',77);
SET SESSION join_cache_level=3;
EXPLAIN
SELECT * FROM t1,t2 WHERE t2.f1 = t1.f1;
SELECT * FROM t1,t2 WHERE t2.f1 = t1.f1;
SET SESSION join_cache_level = DEFAULT;
DROP TABLE t1,t2;
# this must be the last command in the file # this must be the last command in the file
set @@optimizer_switch=@save_optimizer_switch; set @@optimizer_switch=@save_optimizer_switch;

22
sql/key.cc
View File

@ -689,20 +689,12 @@ ulong key_hashnr(KEY *key_info, uint used_key_parts, const uchar *key)
pack_length= 0; pack_length= 0;
break; break;
case HA_KEYTYPE_VARTEXT1: case HA_KEYTYPE_VARTEXT1:
cs= key_part->field->charset();
length= (uint)(pos[0]);
pack_length= 1;
break;
case HA_KEYTYPE_VARBINARY1:
cs= &my_charset_bin;
length= (uint)(pos[0]);
pack_length= 1;
break;
case HA_KEYTYPE_VARTEXT2: case HA_KEYTYPE_VARTEXT2:
cs= key_part->field->charset(); cs= key_part->field->charset();
length= uint2korr(pos); length= uint2korr(pos);
pack_length= 2; pack_length= 2;
break; break;
case HA_KEYTYPE_VARBINARY1:
case HA_KEYTYPE_VARBINARY2: case HA_KEYTYPE_VARBINARY2:
cs= &my_charset_bin; cs= &my_charset_bin;
length= uint2korr(pos); length= uint2korr(pos);
@ -806,23 +798,13 @@ bool key_buf_cmp(KEY *key_info, uint used_key_parts,
pack_length= 0; pack_length= 0;
break; break;
case HA_KEYTYPE_VARTEXT1: case HA_KEYTYPE_VARTEXT1:
cs= key_part->field->charset();
length1= (uint)(pos1[0]);
length2= (uint)(pos2[0]);
pack_length= 1;
break;
case HA_KEYTYPE_VARBINARY1:
cs= &my_charset_bin;
length1= (uint)(pos1[0]);
length2= (uint)(pos2[0]);
pack_length= 1;
break;
case HA_KEYTYPE_VARTEXT2: case HA_KEYTYPE_VARTEXT2:
cs= key_part->field->charset(); cs= key_part->field->charset();
length1= uint2korr(pos1); length1= uint2korr(pos1);
length2= uint2korr(pos2); length2= uint2korr(pos2);
pack_length= 2; pack_length= 2;
break; break;
case HA_KEYTYPE_VARBINARY1:
case HA_KEYTYPE_VARBINARY2: case HA_KEYTYPE_VARBINARY2:
cs= &my_charset_bin; cs= &my_charset_bin;
length1= uint2korr(pos1); length1= uint2korr(pos1);