database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-308 lp:1008516 - Failing assertion: templ->mysql_col_len == len

Browse Source 
remove the offending assert.
take the test case from mysql Bug#58015
This commit is contained in:
Sergei Golubchik
2012-06-04 23:22:03 +02:00
parent 25ada13db0
commit 265d5aaa2e
5 changed files with 66 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/include/icp_tests.inc
View File

@ -874,3 +874,21 @@ show status like "Handler_icp%";
DROP TABLE t1; DROP TABLE t1;
#
# MDEV-308 lp:1008516 - Failing assertion: templ->mysql_col_len == len
#
create table t1 (a int,b char(5),primary key (a), key (b(1)));
insert into t1 values ('a','b');
select 1 from t1 where a and b >= 'aa';
drop table t1;
--echo #
--echo # Bug#58015 "Assert in row_sel_field_store_in_mysql_format
--echo # when running innodb_mrr_icp test"
--echo #
create table t1 (a char(2) charset utf8,b double, primary key (a(1)),key (b));
insert into t1 values ('',1);
select 1 from t1 where b <= 1 and a <> '';
drop table t1;

16
mysql-test/r/innodb_icp.result
View File

@ -835,5 +835,21 @@ Variable_name Value
Handler_icp_attempts 2 Handler_icp_attempts 2
Handler_icp_match 1 Handler_icp_match 1
DROP TABLE t1; DROP TABLE t1;
create table t1 (a int,b char(5),primary key (a), key (b(1)));
insert into t1 values ('a','b');
Warnings:
Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1
select 1 from t1 where a and b >= 'aa';
1
drop table t1;
#
# Bug#58015 "Assert in row_sel_field_store_in_mysql_format
# when running innodb_mrr_icp test"
#
create table t1 (a char(2) charset utf8,b double, primary key (a(1)),key (b));
insert into t1 values ('',1);
select 1 from t1 where b <= 1 and a <> '';
1
drop table t1;
set optimizer_switch=@innodb_icp_tmp; set optimizer_switch=@innodb_icp_tmp;
set storage_engine= @save_storage_engine; set storage_engine= @save_storage_engine;

16
mysql-test/r/maria_icp.result
View File

@ -841,5 +841,21 @@ Variable_name Value
Handler_icp_attempts 2 Handler_icp_attempts 2
Handler_icp_match 1 Handler_icp_match 1
DROP TABLE t1; DROP TABLE t1;
create table t1 (a int,b char(5),primary key (a), key (b(1)));
insert into t1 values ('a','b');
Warnings:
Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1
select 1 from t1 where a and b >= 'aa';
1
drop table t1;
#
# Bug#58015 "Assert in row_sel_field_store_in_mysql_format
# when running innodb_mrr_icp test"
#
create table t1 (a char(2) charset utf8,b double, primary key (a(1)),key (b));
insert into t1 values ('',1);
select 1 from t1 where b <= 1 and a <> '';
1
drop table t1;
set storage_engine= @save_storage_engine; set storage_engine= @save_storage_engine;
set optimizer_switch=@maria_icp_tmp; set optimizer_switch=@maria_icp_tmp;

16
mysql-test/r/myisam_icp.result
View File

@ -839,6 +839,22 @@ Variable_name Value
Handler_icp_attempts 2 Handler_icp_attempts 2
Handler_icp_match 1 Handler_icp_match 1
DROP TABLE t1; DROP TABLE t1;
create table t1 (a int,b char(5),primary key (a), key (b(1)));
insert into t1 values ('a','b');
Warnings:
Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1
select 1 from t1 where a and b >= 'aa';
1
drop table t1;
#
# Bug#58015 "Assert in row_sel_field_store_in_mysql_format
# when running innodb_mrr_icp test"
#
create table t1 (a char(2) charset utf8,b double, primary key (a(1)),key (b));
insert into t1 values ('',1);
select 1 from t1 where b <= 1 and a <> '';
1
drop table t1;
drop table if exists t0, t1, t1i, t1m; drop table if exists t0, t1, t1i, t1m;
# #
# BUG#826935 Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed # BUG#826935 Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed

1
storage/xtradb/row/row0sel.c
View File

@ -2674,7 +2674,6 @@ row_sel_field_store_in_mysql_format(
case DATA_DECIMAL: case DATA_DECIMAL:
/* Above are the valid column types for MySQL data. */ /* Above are the valid column types for MySQL data. */
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
ut_ad(templ->mysql_col_len == len);
memcpy(dest, data, len); memcpy(dest, data, len);
} }
} }