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

Patch adjustments

Browse Source
This commit is contained in:
MySQL Build Team 2009-11-25 23:24:18 +01:00
parent 8620b3518c
commit c360a20a40
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/range.result
View File

@ -1216,6 +1216,9 @@ select 'In following EXPLAIN the access method should be ref, #rows~=500 (and no
Z Z
In following EXPLAIN the access method should be ref, #rows~=500 (and not 2) In following EXPLAIN the access method should be ref, #rows~=500 (and not 2)
explain select * from t2 where a=1000 and b<11; explain select * from t2 where a=1000 and b<11;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref a a 5 const 502 Using where
drop table t1, t2;
# #
# Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN # Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN
# #
@ -1224,9 +1227,6 @@ INSERT INTO t1 VALUES (1), (NULL);
SELECT * FROM t1 WHERE a <> NULL and (a <> NULL or a <= NULL); SELECT * FROM t1 WHERE a <> NULL and (a <> NULL or a <= NULL);
a a
DROP TABLE t1; DROP TABLE t1;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref a a 5 const 502 Using where
drop table t1, t2;
# #
# Bug#47925: regression of range optimizer and date comparison in 5.1.39! # Bug#47925: regression of range optimizer and date comparison in 5.1.39!
# #

5
mysql-test/t/range.test
View File

@ -1043,6 +1043,8 @@ alter table t2 add index (a,b);
select 'In following EXPLAIN the access method should be ref, #rows~=500 (and not 2)' Z; select 'In following EXPLAIN the access method should be ref, #rows~=500 (and not 2)' Z;
explain select * from t2 where a=1000 and b<11; explain select * from t2 where a=1000 and b<11;
drop table t1, t2;
--echo # --echo #
--echo # Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN --echo # Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN
--echo # --echo #
@ -1052,9 +1054,6 @@ INSERT INTO t1 VALUES (1), (NULL);
SELECT * FROM t1 WHERE a <> NULL and (a <> NULL or a <= NULL); SELECT * FROM t1 WHERE a <> NULL and (a <> NULL or a <= NULL);
DROP TABLE t1; DROP TABLE t1;
drop table t1, t2;
--echo # --echo #
--echo # Bug#47925: regression of range optimizer and date comparison in 5.1.39! --echo # Bug#47925: regression of range optimizer and date comparison in 5.1.39!
--echo # --echo #

5
storage/innodb_plugin/handler/ha_innodb.cc
View File

@ -3704,7 +3704,10 @@ ha_innobase::store_key_val_for_row(
} else if (mysql_type == MYSQL_TYPE_TINY_BLOB } else if (mysql_type == MYSQL_TYPE_TINY_BLOB
|| mysql_type == MYSQL_TYPE_MEDIUM_BLOB || mysql_type == MYSQL_TYPE_MEDIUM_BLOB
|| mysql_type == MYSQL_TYPE_BLOB || mysql_type == MYSQL_TYPE_BLOB
|| mysql_type == MYSQL_TYPE_LONG_BLOB) { || mysql_type == MYSQL_TYPE_LONG_BLOB
/* MYSQL_TYPE_GEOMETRY data is treated
as BLOB data in innodb. */
|| mysql_type == MYSQL_TYPE_GEOMETRY) {
CHARSET_INFO* cs; CHARSET_INFO* cs;
ulint key_len; ulint key_len;