- commits - lists.mariadb.org

[Commits] e3d40de: Adjusted test results for MDEV-18640.
by IgorBabaev 15 Mar '19

15 Mar '19

revision-id: e3d40de4b42ba6721c47d3b98eb9a2c564504c69 (mariadb-10.4.3-71-ge3d40de) parent(s): b234f81037d79b64f46a8de1602a8a7e3a45aada author: Igor Babaev committer: Igor Babaev timestamp: 2019-03-15 09:39:34 -0700 message: Adjusted test results for MDEV-18640. --- mysql-test/main/rowid_filter_innodb.result | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result index ac7ca11..6740111 100644 --- a/mysql-test/main/rowid_filter_innodb.result +++ b/mysql-test/main/rowid_filter_innodb.result @@ -1903,6 +1903,19 @@ id select_type table type possible_keys key key_len ref rows filtered Extra Warnings: Note 1003 select 1 AS `1` from `test`.`t1` join `test`.`t2` join `test`.`t1` `t1_a` where 0 drop table t1,t2; +# +# MDEV-18640: TABLE::prune_range_rowid_filters: Conditional jump or +# move depends on uninitialized value +# +CREATE TABLE t1 ( +pk INT, i INT, PRIMARY KEY (pk), KEY (pk,i) +) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1,10), (7,70), (2,20); +SELECT * FROM t1 WHERE pk < 5; +pk i +1 10 +2 20 +DROP TABLE t1; set @@use_stat_tables=@save_use_stat_tables; # # MDEV-18755: possible RORI-plan and possible plan with range filter

1 0

[Commits] d27aa35eeeb: Disable mysql-wsrep#198
by jan 15 Mar '19

15 Mar '19

revision-id: d27aa35eeeb778ebded38126ec3b558fe3fc2e02 (mariadb-10.4.3-73-gd27aa35eeeb) parent(s): 050280ce8b0fc86e56d3a0ab72416d1bec65a966 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-15 10:20:32 +0200 message: Disable mysql-wsrep#198 --- mysql-test/suite/galera/disabled.def | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 5133a6af96a..d40b409cb33 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -51,6 +51,7 @@ galera_var_notify_cmd : MDEV-13549 Galera test failures galera_var_reject_queries : assertion in inline_mysql_socket_send galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.galera_var_retry_autocommit galera_wan : MDEV-17259: Test failure on galera.galera_wan +mysql-wsrep#198 : MDEV-18935 Galera test mysql-wsrep#198 sporaric assertion transaction.cpp:362: int wsrep::transaction::before_commit(): Assertion `state() == s_executing || state() == s_committing || state() == s_must_abort || state() == s_replaying' failed. partition : MDEV-13549 regularly showing auto_increment mismatch pxc-421: Lock timeout exceeded query_cache : MDEV-18137: Galera test failure on query_cache

1 0

[Commits] b748affcf07: Merge branch 'sysprg/MDEV-17262' of git://github.com/tempesta-tech/mariadb into tempesta-tech-sysprg/MDEV-17262
by jan 15 Mar '19

15 Mar '19

revision-id: b748affcf0724b70b6a54c13b9fa617c118aa043 (mariadb-10.2.22-72-gb748affcf07) parent(s): bb8c82c66abddf796e8d44f817518e5ab38ae6e4 85fb868e42145df90f0f0054d4e4b444c39152bb author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-15 09:48:09 +0200 message: Merge branch 'sysprg/MDEV-17262' of git://github.com/tempesta-tech/mariadb into tempesta-tech-sysprg/MDEV-17262 include/mysql/service_wsrep.h | 6 + .../galera_3nodes/r/galera_load_data_ist.result | 36 ++++++ .../suite/galera_3nodes/t/galera_load_data_ist.cnf | 4 + .../galera_3nodes/t/galera_load_data_ist.test | 124 +++++++++++++++++++++ sql/field.cc | 1 - sql/item.cc | 1 - sql/log.cc | 51 +++++++++ sql/sql_class.cc | 2 + sql/sql_class.h | 8 ++ sql/sql_load.cc | 46 +++++--- sql/sql_plugin_services.ic | 2 + sql/wsrep_dummy.cc | 6 + sql/wsrep_hton.cc | 1 + sql/wsrep_thd.cc | 9 ++ storage/innobase/handler/ha_innodb.cc | 10 ++ 15 files changed, 291 insertions(+), 16 deletions(-) diff --cc include/mysql/service_wsrep.h index ee28856ac73,f4d3be943c1..7237cccfaeb --- a/include/mysql/service_wsrep.h +++ b/include/mysql/service_wsrep.h @@@ -107,7 -107,8 +107,9 @@@ extern struct wsrep_service_st bool (*wsrep_thd_ignore_table_func)(THD *thd); long long (*wsrep_thd_trx_seqno_func)(THD *thd); struct wsrep_ws_handle * (*wsrep_thd_ws_handle_func)(THD *thd); + void (*wsrep_thd_auto_increment_variables_func)(THD *thd, unsigned long long *offset, unsigned long long *increment); + void (*wsrep_set_load_multi_commit_func)(THD *thd, bool split); + bool (*wsrep_is_load_multi_commit_func)(THD *thd); int (*wsrep_trx_is_aborting_func)(MYSQL_THD thd); int (*wsrep_trx_order_before_func)(MYSQL_THD, MYSQL_THD); void (*wsrep_unlock_rollback_func)(); @@@ -151,7 -151,8 +153,9 @@@ #define wsrep_thd_ignore_table(T) wsrep_service->wsrep_thd_ignore_table_func(T) #define wsrep_thd_trx_seqno(T) wsrep_service->wsrep_thd_trx_seqno_func(T) #define wsrep_thd_ws_handle(T) wsrep_service->wsrep_thd_ws_handle_func(T) +#define wsrep_thd_auto_increment_variables(T,O,I) wsrep_service->wsrep_thd_auto_increment_variables_func(T,O,I) + #define wsrep_set_load_multi_commit(T,S) wsrep_service->wsrep_set_load_multi_commit_func(T,S) + #define wsrep_is_load_multi_commit(T) wsrep_service->wsrep_is_load_multi_commit_func(T) #define wsrep_trx_is_aborting(T) wsrep_service->wsrep_trx_is_aborting_func(T) #define wsrep_trx_order_before(T1,T2) wsrep_service->wsrep_trx_order_before_func(T1,T2) #define wsrep_unlock_rollback() wsrep_service->wsrep_unlock_rollback_func() @@@ -205,7 -205,8 +209,9 @@@ my_bool wsrep_thd_is_BF(MYSQL_THD thd, my_bool wsrep_thd_is_wsrep(MYSQL_THD thd); struct wsrep *get_wsrep(); struct wsrep_ws_handle *wsrep_thd_ws_handle(THD *thd); +void wsrep_thd_auto_increment_variables(THD *thd, unsigned long long *offset, unsigned long long *increment); + void wsrep_set_load_multi_commit(THD *thd, bool split); + bool wsrep_is_load_multi_commit(THD *thd); void wsrep_aborting_thd_enqueue(THD *thd); void wsrep_lock_rollback(); void wsrep_post_commit(THD* thd, bool all); diff --cc sql/sql_load.cc index 8c2f17dac3f,48a49f7e614..59dae80852b --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@@ -1269,11 -1284,8 +1287,11 @@@ read_xml_field(THD *thd, COPY_INFO &inf } WSREP_LOAD_DATA_SPLIT(thd, table, info); - WRITE_RECORD(thd, table, info); + err= write_record(thd, table, &info); + table->auto_increment_field_not_null= false; + if (err) + DBUG_RETURN(1); - + /* We don't need to reset auto-increment field since we are restoring its default value at the beginning of each loop iteration. diff --cc sql/sql_plugin_services.ic index 3d6cf0a0723,2e15b3fa14d..e7de45b5ee2 --- a/sql/sql_plugin_services.ic +++ b/sql/sql_plugin_services.ic @@@ -177,7 -177,8 +177,9 @@@ static struct wsrep_service_st wsrep_ha wsrep_thd_ignore_table, wsrep_thd_trx_seqno, wsrep_thd_ws_handle, + wsrep_thd_auto_increment_variables, + wsrep_set_load_multi_commit, + wsrep_is_load_multi_commit, wsrep_trx_is_aborting, wsrep_trx_order_before, wsrep_unlock_rollback, diff --cc sql/wsrep_dummy.cc index 7297dbfe0fd,3f7136ef609..aff75cf7790 --- a/sql/wsrep_dummy.cc +++ b/sql/wsrep_dummy.cc @@@ -125,14 -125,12 +125,20 @@@ longlong wsrep_thd_trx_seqno(THD * struct wsrep_ws_handle* wsrep_thd_ws_handle(THD *) { return 0; } +void wsrep_thd_auto_increment_variables(THD *thd, + unsigned long long *offset, + unsigned long long *increment) +{ + *offset= thd->variables.auto_increment_offset; + *increment= thd->variables.auto_increment_increment; +} + + void wsrep_set_load_multi_commit(THD *thd, bool split) + { } + + bool wsrep_is_load_multi_commit(THD *thd) + { return false; } + int wsrep_trx_is_aborting(THD *) { return 0; } diff --cc sql/wsrep_thd.cc index dab9f91b381,9342032f9a0..db1b2969504 --- a/sql/wsrep_thd.cc +++ b/sql/wsrep_thd.cc @@@ -678,33 -678,12 +678,42 @@@ bool wsrep_thd_has_explicit_locks(THD * return thd->mdl_context.has_explicit_locks(); } + void wsrep_set_load_multi_commit(THD *thd, bool split) + { + thd->wsrep_split_flag= split; + } + + bool wsrep_is_load_multi_commit(THD *thd) + { + return thd->wsrep_split_flag; + } +/* + Get auto increment variables for THD. Use global settings for + applier threads. + */ +void wsrep_thd_auto_increment_variables(THD* thd, + unsigned long long* offset, + unsigned long long* increment) +{ + if (thd->wsrep_exec_mode == REPL_RECV && + thd->wsrep_conflict_state != REPLAYING) + { + *offset= global_system_variables.auto_increment_offset; + *increment= global_system_variables.auto_increment_increment; + } + else + { + *offset= thd->variables.auto_increment_offset; + *increment= thd->variables.auto_increment_increment; + } +} + +my_bool wsrep_thd_is_applier(MYSQL_THD thd) +{ + my_bool is_applier= false; + + if (thd && thd->wsrep_applier) + is_applier= true; + + return (is_applier); +}

1 0

[Commits] b234f81: MDEV-18640 TABLE::prune_range_rowid_filters: Conditional jump or move
by IgorBabaev 15 Mar '19

15 Mar '19

revision-id: b234f81037d79b64f46a8de1602a8a7e3a45aada (mariadb-10.4.3-70-gb234f81) parent(s): e3ebeebe3a4c14293a48971e0a062008a1473140 author: Igor Babaev committer: Igor Babaev timestamp: 2019-03-14 19:33:13 -0700 message: MDEV-18640 TABLE::prune_range_rowid_filters: Conditional jump or move depends on uninitialized value This problem most probably was resolved by the patch for MDEV-18816. This commit adds only the test case from the bug entry. --- mysql-test/main/rowid_filter.result | 13 +++++++++++++ mysql-test/main/rowid_filter.test | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/mysql-test/main/rowid_filter.result b/mysql-test/main/rowid_filter.result index f025305..2fdff7d 100644 --- a/mysql-test/main/rowid_filter.result +++ b/mysql-test/main/rowid_filter.result @@ -1974,4 +1974,17 @@ id select_type table type possible_keys key key_len ref rows filtered Extra Warnings: Note 1003 select 1 AS `1` from `test`.`t1` join `test`.`t2` join `test`.`t1` `t1_a` where 0 drop table t1,t2; +# +# MDEV-18640: TABLE::prune_range_rowid_filters: Conditional jump or +# move depends on uninitialized value +# +CREATE TABLE t1 ( +pk INT, i INT, PRIMARY KEY (pk), KEY (pk,i) +) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1,10), (7,70), (2,20); +SELECT * FROM t1 WHERE pk < 5; +pk i +1 10 +2 20 +DROP TABLE t1; set @@use_stat_tables=@save_use_stat_tables; diff --git a/mysql-test/main/rowid_filter.test b/mysql-test/main/rowid_filter.test index 87e8b2c..d84839b 100644 --- a/mysql-test/main/rowid_filter.test +++ b/mysql-test/main/rowid_filter.test @@ -261,4 +261,18 @@ eval explain extended $q; drop table t1,t2; +--echo # +--echo # MDEV-18640: TABLE::prune_range_rowid_filters: Conditional jump or +--echo # move depends on uninitialized value +--echo # + +CREATE TABLE t1 ( + pk INT, i INT, PRIMARY KEY (pk), KEY (pk,i) +) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1,10), (7,70), (2,20); + +SELECT * FROM t1 WHERE pk < 5; + +DROP TABLE t1; + set @@use_stat_tables=@save_use_stat_tables;

1 0

[Commits] 0dd12b4: MDEV-18896 Crash in convert_join_subqueries_to_semijoins
by IgorBabaev 15 Mar '19

15 Mar '19

revision-id: 0dd12b4f2a72245a0fb491685c172a7b0e48cbc5 (mariadb-5.5.63-9-g0dd12b4) parent(s): 8024f8c6b86b204c3475e562587640cf2b141683 author: Igor Babaev committer: Igor Babaev timestamp: 2019-03-14 17:41:35 -0700 message: MDEV-18896 Crash in convert_join_subqueries_to_semijoins If an IN-subquery is used in a table-less select the current code should never consider it as candidate for semi-join optimizations. Yet the function check_and_do_in_subquery_rewrites() improperly checked the property "to be a table-less select". As a result such select in IN subquery was used in INSERT .. SELECT then the IN subquery by mistake was registered as a semi-join subquery and convert_subq_to_sj() was called for it. However the code of this function does not assume that the parent select of the subquery could be a table-less select. --- mysql-test/r/subselect_sj.result | 7 +++++++ mysql-test/r/subselect_sj_jcl6.result | 7 +++++++ mysql-test/t/subselect_sj.test | 10 ++++++++++ sql/opt_subselect.cc | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/subselect_sj.result b/mysql-test/r/subselect_sj.result index 519d53e..73c620b 100644 --- a/mysql-test/r/subselect_sj.result +++ b/mysql-test/r/subselect_sj.result @@ -3178,5 +3178,12 @@ EXECUTE stmt; a drop view v3; drop table t1,t2,t3; +# +# MDEV-18896: IN subquery in WHERE of a table-less query used for INSERT +# +create table t1 (a1 varchar(25)); +create table t2 (a2 varchar(25)) ; +insert into t1 select 'xxx' from dual where 'xxx' in (select a2 from t2); +drop table t1,t2; # End of 5.5 test set optimizer_switch=@subselect_sj_tmp; diff --git a/mysql-test/r/subselect_sj_jcl6.result b/mysql-test/r/subselect_sj_jcl6.result index 3270406..03cf368 100644 --- a/mysql-test/r/subselect_sj_jcl6.result +++ b/mysql-test/r/subselect_sj_jcl6.result @@ -3192,6 +3192,13 @@ EXECUTE stmt; a drop view v3; drop table t1,t2,t3; +# +# MDEV-18896: IN subquery in WHERE of a table-less query used for INSERT +# +create table t1 (a1 varchar(25)); +create table t2 (a2 varchar(25)) ; +insert into t1 select 'xxx' from dual where 'xxx' in (select a2 from t2); +drop table t1,t2; # End of 5.5 test set optimizer_switch=@subselect_sj_tmp; # diff --git a/mysql-test/t/subselect_sj.test b/mysql-test/t/subselect_sj.test index 0a35a61..aabb21b 100644 --- a/mysql-test/t/subselect_sj.test +++ b/mysql-test/t/subselect_sj.test @@ -2869,6 +2869,16 @@ EXECUTE stmt; drop view v3; drop table t1,t2,t3; +--echo # +--echo # MDEV-18896: IN subquery in WHERE of a table-less query used for INSERT +--echo # + +create table t1 (a1 varchar(25)); +create table t2 (a2 varchar(25)) ; +insert into t1 select 'xxx' from dual where 'xxx' in (select a2 from t2); + +drop table t1,t2; + --echo # End of 5.5 test # The following command must be the last one the file diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index f472cf1..f82d55f 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -675,7 +675,7 @@ int check_and_do_in_subquery_rewrites(JOIN *join) select_lex->outer_select()->join && // 6 parent_unit->first_select()->leaf_tables.elements && // 7 !in_subs->has_strategy() && // 8 - select_lex->outer_select()->leaf_tables.elements && // 9 + select_lex->outer_select()->table_list.first && // 9 !((join->select_options | // 10 select_lex->outer_select()->join->select_options) // 10 & SELECT_STRAIGHT_JOIN)) // 10

1 0

[Commits] ba337dd0: Bump the version.
by jan 14 Mar '19

14 Mar '19

revision-id: ba337dd0ac281a5e9f29c652a890bd7ad2ac464e (mariadb-25.3.19-32-gba337dd0) parent(s): a4890d84092bfeb279f1c0c0feb73e4d9c383220 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-14 19:11:30 +0200 message: Bump the version. --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index e3a3e6e8..7e1566cb 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -5,7 +5,7 @@ set -eu # $Id$ # Galera library version -VERSION="26.4.1" +VERSION="26.4.2" get_cores() {

1 0

[Commits] 21a15ea673c: MDEV-16240: Assertion `0' failed in row_sel_convert_mysql_key_to_innobase
by Oleksandr Byelkin 14 Mar '19

14 Mar '19

revision-id: 21a15ea673c9cda1635ce06391b9f56d7a461186 (mariadb-10.2.22-72-g21a15ea673c) parent(s): bb8c82c66abddf796e8d44f817518e5ab38ae6e4 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-03-14 15:12:47 +0100 message: MDEV-16240: Assertion `0' failed in row_sel_convert_mysql_key_to_innobase Set table in row ID position mode before using this function. --- mysql-test/r/multi_update_innodb.result | 40 +++++++++++++++++++++ mysql-test/t/multi_update_innodb.test | 49 +++++++++++++++++++++++++ sql/handler.cc | 11 ++++-- sql/item_subselect.cc | 10 ++++-- sql/item_subselect.h | 2 +- sql/log_event.cc | 9 +++++ sql/sql_insert.cc | 64 +++++++++++++++++++++++++++------ sql/sql_load.cc | 10 ++++++ sql/sql_select.cc | 10 ++++++ sql/sql_update.cc | 4 +++ 10 files changed, 193 insertions(+), 16 deletions(-) diff --git a/mysql-test/r/multi_update_innodb.result b/mysql-test/r/multi_update_innodb.result index 5890fd24f5f..294ebfcebdf 100644 --- a/mysql-test/r/multi_update_innodb.result +++ b/mysql-test/r/multi_update_innodb.result @@ -151,3 +151,43 @@ create table t2 like t1; insert into t2 select * from t1; delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b; drop table t1,t2; +# +# MDEV-16240: Assertion `0' failed in +# row_sel_convert_mysql_key_to_innobase +# +SET @save_sql_mode=@@sql_mode; +set sql_mode=''; +CREATE TABLE `t3` ( +`f1` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE current_timestamp(), +`f2` datetime DEFAULT '2000-01-01 00:00:00' ON UPDATE current_timestamp(), +`f3` TIMESTAMP NULL DEFAULT '2000-01-01 00:00:00', +`pk` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +`f4` datetime DEFAULT current_timestamp(), +PRIMARY KEY (`pk`), +UNIQUE KEY `f2k` (`f2`), +KEY `f4k` (`f4`) +) ENGINE=InnoDB; +INSERT INTO `t3` VALUES ('2018-05-18 15:08:07','2018-05-18 17:08:07','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00'),('0000-00-00 00:00:00','0000-00-00 00:00:00','1999-12-31 23:00:00','2002-07-03 23:04:40','0000-00-00 00:00:00'); +CREATE VIEW `v1` AS +SELECT `t3`.`pk` AS `pk`, +`t3`.`f3` AS `f3`, +`t3`.`f4` AS `f4`, +`t3`.`f2` AS `f2`, +`t3`.`f1` AS `f1` +FROM `t3`; +CREATE TABLE `t4` ( +`f1` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(), +`f3` timestamp NULL DEFAULT NULL, +`f2` timestamp NULL DEFAULT '1999-12-31 23:00:00' ON UPDATE current_timestamp(), +`pk` int(11) NOT NULL, +`f4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), +PRIMARY KEY (`pk`) +) ENGINE=InnoDB; +INSERT INTO `t4` VALUES ('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,1,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,3,'2018-05-18 15:08:06'),('0000-00-00 00:00:00','0000-00-00 00:00:00',NULL,1976,'0000-00-00 00:00:00'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2000,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2001,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2002,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2003,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2004,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00','2018-05-18 15:08:06',2005,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00','2018-05-18 15:08:06',2018,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00','2018-05-18 15:08:06',2019,'2018-05-1 8 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00','2018-05-18 15:08:06',2024,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00','1999-12-31 23:00:00',2025,'2018-05-18 15:08:06'),('0000-00-00 00:00:00',NULL,'2018-05-18 15:08:06',2026,'2018-05-18 15:08:06'),('2018-05-18 17:08:07','0000-00-00 00:00:00','0000-00-00 00:00:00',2027,'0000-00-00 00:00:00'); +UPDATE `v1` t1, `t4` t2 +SET t1.`f2` = 6452736 WHERE t1.`f4` = 6272000; +ERROR 23000: Duplicate entry '0000-00-00 00:00:00' for key 'f2k' +DROP VIEW v1; +DROP TABLE t3,t4; +SET @@sql_mode=@save_sql_mode; +# End of 10.2 tests diff --git a/mysql-test/t/multi_update_innodb.test b/mysql-test/t/multi_update_innodb.test index f5f8f91edb8..2e46ee06d4d 100644 --- a/mysql-test/t/multi_update_innodb.test +++ b/mysql-test/t/multi_update_innodb.test @@ -173,3 +173,52 @@ delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b; drop table t1,t2; +--echo # +--echo # MDEV-16240: Assertion `0' failed in +--echo # row_sel_convert_mysql_key_to_innobase +--echo # + +SET @save_sql_mode=@@sql_mode; +set sql_mode=''; + +CREATE TABLE `t3` ( + `f1` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE current_timestamp(), + `f2` datetime DEFAULT '2000-01-01 00:00:00' ON UPDATE current_timestamp(), + `f3` TIMESTAMP NULL DEFAULT '2000-01-01 00:00:00', + `pk` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `f4` datetime DEFAULT current_timestamp(), + PRIMARY KEY (`pk`), + UNIQUE KEY `f2k` (`f2`), + KEY `f4k` (`f4`) + ) ENGINE=InnoDB; + +INSERT INTO `t3` VALUES ('2018-05-18 15:08:07','2018-05-18 17:08:07','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00'),('0000-00-00 00:00:00','0000-00-00 00:00:00','1999-12-31 23:00:00','2002-07-03 23:04:40','0000-00-00 00:00:00'); + +CREATE VIEW `v1` AS +SELECT `t3`.`pk` AS `pk`, + `t3`.`f3` AS `f3`, + `t3`.`f4` AS `f4`, + `t3`.`f2` AS `f2`, + `t3`.`f1` AS `f1` +FROM `t3`; + +CREATE TABLE `t4` ( + `f1` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `f3` timestamp NULL DEFAULT NULL, + `f2` timestamp NULL DEFAULT '1999-12-31 23:00:00' ON UPDATE current_timestamp(), + `pk` int(11) NOT NULL, + `f4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + PRIMARY KEY (`pk`) +) ENGINE=InnoDB; + +INSERT INTO `t4` VALUES ('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,1,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,3,'2018-05-18 15:08:06'),('0000-00-00 00:00:00','0000-00-00 00:00:00',NULL,1976,'0000-00-00 00:00:00'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2000,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2001,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2002,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2003,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00',NULL,2004,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00','2018-05-18 15:08:06',2005,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00','2018-05-18 15:08:06',2018,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00','2018-05-18 15:08:06',2019,'2018-05-1 8 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00','2018-05-18 15:08:06',2024,'2018-05-18 15:08:06'),('2018-05-18 17:08:06','0000-00-00 00:00:00','1999-12-31 23:00:00',2025,'2018-05-18 15:08:06'),('0000-00-00 00:00:00',NULL,'2018-05-18 15:08:06',2026,'2018-05-18 15:08:06'),('2018-05-18 17:08:07','0000-00-00 00:00:00','0000-00-00 00:00:00',2027,'0000-00-00 00:00:00'); + +--error ER_DUP_ENTRY +UPDATE `v1` t1, `t4` t2 +SET t1.`f2` = 6452736 WHERE t1.`f4` = 6272000; + +DROP VIEW v1; +DROP TABLE t3,t4; +SET @@sql_mode=@save_sql_mode; + +--echo # End of 10.2 tests diff --git a/sql/handler.cc b/sql/handler.cc index ae63640ae5c..d307433cf5d 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2648,8 +2648,7 @@ int handler::ha_rnd_pos(uchar *buf, uchar *pos) DBUG_ENTER("handler::ha_rnd_pos"); DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE || m_lock_type != F_UNLCK); - /* TODO: Find out how to solve ha_rnd_pos when finding duplicate update. */ - /* DBUG_ASSERT(inited == RND); */ + DBUG_ASSERT(inited == RND); TABLE_IO_WAIT(tracker, m_psi, PSI_TABLE_FETCH_ROW, MAX_KEY, 0, { result= rnd_pos(buf, pos); }) @@ -3307,6 +3306,10 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment, ulonglong nr; int error; MY_BITMAP *old_read_set; + bool rnd_inited= (inited == RND); + + if (rnd_inited && ha_rnd_end()) + return; old_read_set= table->prepare_for_keyread(table->s->next_number_index); @@ -3316,6 +3319,8 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment, DBUG_ASSERT(0); (void) extra(HA_EXTRA_NO_KEYREAD); *first_value= ULONGLONG_MAX; + if (rnd_inited) + ha_rnd_init(0); return; } @@ -3362,6 +3367,8 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment, ha_index_end(); table->restore_column_maps_after_keyread(old_read_set); *first_value= nr; + if (rnd_inited) + ha_rnd_init(0); return; } diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 8a9dd083911..cc1649b3c92 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -5855,12 +5855,17 @@ Ordered_key::cmp_keys_by_row_data_and_rownum(Ordered_key *key, } -void Ordered_key::sort_keys() +bool Ordered_key::sort_keys() { + /* Prepare table for random positioning (importent for innodb) */ + if (tbl->file->ha_rnd_init(0)) + return TRUE; my_qsort2(key_buff, (size_t) key_buff_elements, sizeof(rownum_t), (qsort2_cmp) &cmp_keys_by_row_data_and_rownum, (void*) this); /* Invalidate the current row position. */ cur_key_idx= HA_POS_ERROR; + tbl->file->ha_rnd_end(); + return FALSE; } @@ -6313,7 +6318,8 @@ subselect_rowid_merge_engine::init(MY_BITMAP *non_null_key_parts, /* Sort the keys in each of the indexes. */ for (uint i= 0; i < merge_keys_count; i++) - merge_keys[i]->sort_keys(); + if (merge_keys[i]->sort_keys()) + return TRUE; if (init_queue(&pq, merge_keys_count, 0, FALSE, subselect_rowid_merge_engine::cmp_keys_by_cur_rownum, NULL, diff --git a/sql/item_subselect.h b/sql/item_subselect.h index bd6a1bdc498..5366c759795 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -1287,7 +1287,7 @@ class Ordered_key : public Sql_alloc ++cur_key_idx; } - void sort_keys(); + bool sort_keys(); double null_selectivity(); /* diff --git a/sql/log_event.cc b/sql/log_event.cc index 8990e1953b6..c17c7ef6e06 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -12845,6 +12845,14 @@ Rows_log_event::write_row(rpl_group_info *rgi, if (table->file->ha_table_flags() & HA_DUPLICATE_POS) { DBUG_PRINT("info",("Locating offending record using rnd_pos()")); + error= table->file->ha_rnd_init(0); + if (error) + { + DBUG_PRINT("info",("rnd_init() returns error %d",error)); + table->file->print_error(error, MYF(0)); + DBUG_RETURN(error); + } + error= table->file->ha_rnd_pos(table->record[1], table->file->dup_ref); if (error) { @@ -12854,6 +12862,7 @@ Rows_log_event::write_row(rpl_group_info *rgi, table->file->print_error(error, MYF(0)); DBUG_RETURN(error); } + table->file->ha_rnd_end(); } else { diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 307473cecbd..5593580dbca 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -881,7 +881,15 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, #endif /* EMBEDDED_LIBRARY */ { if (duplic != DUP_ERROR || ignore) + { table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); + if (table->file->ha_table_flags() & HA_DUPLICATE_POS && + table->file->ha_rnd_init(0)) + { + table->file->print_error(my_errno, MYF(0)); + goto abort; + } + } /** This is a simple check for the case when the table has a trigger that reads from it, or when the statement invokes a stored function @@ -942,7 +950,10 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, { DBUG_PRINT("info", ("iteration %llu", iteration)); if (iteration && bulk_parameters_set(thd)) - goto abort; + { + error= 1; + goto values_loop_end; + } while ((values= its++)) { @@ -1094,7 +1105,11 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, error=1; } if (duplic != DUP_ERROR || ignore) + { table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); + if (table->file->ha_table_flags() & HA_DUPLICATE_POS) + table->file->ha_rnd_end(); + } transactional_table= table->file->has_transactions(); @@ -1705,6 +1720,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) goto err; if (table->file->ha_table_flags() & HA_DUPLICATE_POS) { + DBUG_ASSERT(table->file->inited == handler::RND); if (table->file->ha_rnd_pos(table->record[1],table->file->dup_ref)) goto err; } @@ -3177,6 +3193,10 @@ bool Delayed_insert::handle_inserts(void) max_rows= ULONG_MAX; // Do as much as possible } + /* Prepare table for random positioning (importent for innodb) */ + if (table->file->ha_rnd_init(0)) + goto err; + /* We can't use row caching when using the binary log because if we get a crash, then binary log will contain rows that are not yet @@ -3352,6 +3372,8 @@ bool Delayed_insert::handle_inserts(void) } } + table->file->ha_rnd_end(); + if (WSREP((&thd))) thd_proc_info(&thd, "insert done"); else @@ -3649,7 +3671,12 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u) thd->cuted_fields=0; if (info.ignore || info.handle_duplicates != DUP_ERROR) + { table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); + if (table->file->ha_table_flags() & HA_DUPLICATE_POS && + table->file->ha_rnd_init(0)) + DBUG_RETURN(1); + } if (info.handle_duplicates == DUP_REPLACE && (!table->triggers || !table->triggers->has_delete_triggers())) table->file->extra(HA_EXTRA_WRITE_CAN_REPLACE); @@ -3818,6 +3845,9 @@ bool select_insert::prepare_eof() if (!error && thd->is_error()) error= thd->get_stmt_da()->sql_errno(); + if (info.ignore || info.handle_duplicates != DUP_ERROR) + if (table->file->ha_table_flags() & HA_DUPLICATE_POS) + table->file->ha_rnd_end(); table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE); @@ -3929,6 +3959,11 @@ void select_insert::abort_result_set() { if (thd->locked_tables_mode <= LTM_LOCK_TABLES) table->file->ha_end_bulk_insert(); + if (table->file->inited) + table->file->ha_rnd_end(); + table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); + table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE); + /* If at least one row has been inserted/modified and will stay in the table (the table doesn't have transactions) we must write to @@ -4341,7 +4376,12 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u) restore_record(table,s->default_values); // Get empty record thd->cuted_fields=0; if (info.ignore || info.handle_duplicates != DUP_ERROR) + { table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); + if (table->file->ha_table_flags() & HA_DUPLICATE_POS && + table->file->ha_rnd_init(0)) + DBUG_RETURN(1); + } if (info.handle_duplicates == DUP_REPLACE && (!table->triggers || !table->triggers->has_delete_triggers())) table->file->extra(HA_EXTRA_WRITE_CAN_REPLACE); @@ -4524,9 +4564,6 @@ bool select_create::send_eof() */ exit_done= 1; // Avoid double calls - table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); - table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE); - send_ok_packet(); if (m_plock) @@ -4602,13 +4639,6 @@ void select_create::abort_result_set() thd->locked_tables_list.unlock_locked_table(thd, create_info->mdl_ticket); } - if (m_plock) - { - mysql_unlock_tables(thd, *m_plock); - *m_plock= NULL; - m_plock= NULL; - } - if (table) { bool tmp_table= table->s->tmp_table; @@ -4619,9 +4649,21 @@ void select_create::abort_result_set() thd->restore_tmp_table_share(saved_tmp_table_share); } + if (table->file->inited && + (info.ignore || info.handle_duplicates != DUP_ERROR) && + (table->file->ha_table_flags() & HA_DUPLICATE_POS)) + table->file->ha_rnd_end(); table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE); table->auto_increment_field_not_null= FALSE; + + if (m_plock) + { + mysql_unlock_tables(thd, *m_plock); + *m_plock= NULL; + m_plock= NULL; + } + drop_open_table(thd, table, create_table->db, create_table->table_name); table=0; // Safety if (thd->log_current_statement && mysql_bin_log.is_open()) diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 8c2f17dac3f..3283b962f65 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -638,6 +638,13 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, thd->abort_on_warning= !ignore && thd->is_strict_mode(); + /* Prepare table for random positioning (importent for innodb) */ + if ((table_list->table->file->ha_table_flags() & HA_DUPLICATE_POS) && + table_list->table->file->ha_rnd_init(0)) + { + error= 1; + goto err; + } thd_progress_init(thd, 2); if (table_list->table->validate_default_values_of_unset_fields(thd)) { @@ -657,6 +664,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, set_fields, set_values, read_info, *ex->enclosed, skip_lines, ignore); + if (table_list->table->file->ha_table_flags() & HA_DUPLICATE_POS) + table_list->table->file->ha_rnd_end(); + thd_proc_info(thd, "End bulk insert"); if (!error) thd_progress_next_stage(thd); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 91a6445c870..4c401ea9011 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -20317,6 +20317,12 @@ end_unique_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), table->file->print_error(error,MYF(0)); /* purecov: inspected */ DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */ } + /* Prepare table for random positioning */ + bool rnd_inited= (table->file->inited == handler::RND); + if (!rnd_inited && + ((error= table->file->ha_index_end()) || + (error= table->file->ha_rnd_init(0)))) + DBUG_RETURN(NESTED_LOOP_ERROR); if (table->file->ha_rnd_pos(table->record[1],table->file->dup_ref)) { table->file->print_error(error,MYF(0)); /* purecov: inspected */ @@ -20330,6 +20336,10 @@ end_unique_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), table->file->print_error(error,MYF(0)); /* purecov: inspected */ DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */ } + if (!rnd_inited && + ((error= table->file->ha_rnd_end()) || + (error= table->file->ha_index_init(0, 0)))) + DBUG_RETURN(NESTED_LOOP_ERROR); } if (join->thd->check_killed()) { diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 11ffa684216..6d4c11d494a 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -211,6 +211,10 @@ static void prepare_record_for_error_message(int error, TABLE *table) bitmap_union(table->read_set, &unique_map); /* Tell the engine about the new set. */ table->file->column_bitmaps_signal(); + /* Prepare table for random positioning (importent for innodb) */ + if (table->file->ha_index_or_rnd_end() || + table->file->ha_rnd_init(0)) + DBUG_VOID_RETURN; /* Read record that is identified by table->file->ref. */ (void) table->file->ha_rnd_pos(table->record[1], table->file->ref); /* Copy the newly read columns into the new record. */

1 0

[Commits] 3b49c8a81ec: c
by Oleksandr Byelkin 14 Mar '19

14 Mar '19

revision-id: 3b49c8a81ec126c3faed6ae7c4930e59be7ca9c5 (mariadb-10.2.22-72-g3b49c8a81ec) parent(s): 7c93e1c438bf9faacc0e9472cd52a41add5421b5 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-03-14 15:09:47 +0100 message: c --- sql/sql_load.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 2fd9caef575..3283b962f65 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -639,7 +639,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, thd->abort_on_warning= !ignore && thd->is_strict_mode(); /* Prepare table for random positioning (importent for innodb) */ - if (table_list->table->file->ha_rnd_init(0)) + if ((table_list->table->file->ha_table_flags() & HA_DUPLICATE_POS) && + table_list->table->file->ha_rnd_init(0)) { error= 1; goto err; @@ -663,7 +664,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, set_fields, set_values, read_info, *ex->enclosed, skip_lines, ignore); - table_list->table->file->ha_rnd_end(); + if (table_list->table->file->ha_table_flags() & HA_DUPLICATE_POS) + table_list->table->file->ha_rnd_end(); thd_proc_info(thd, "End bulk insert"); if (!error)

1 0

[Commits] 7c93e1c438b: c
by Oleksandr Byelkin 14 Mar '19

14 Mar '19

revision-id: 7c93e1c438bf9faacc0e9472cd52a41add5421b5 (mariadb-10.2.22-71-g7c93e1c438b) parent(s): 55adcb51fc716ab43f027fc35e4ff414b4e91953 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-03-14 13:39:44 +0100 message: c --- sql/log_event.cc | 9 +++++++++ sql/sql_load.cc | 8 ++++++++ sql/sql_select.cc | 11 +++++++---- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sql/log_event.cc b/sql/log_event.cc index 8990e1953b6..c17c7ef6e06 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -12845,6 +12845,14 @@ Rows_log_event::write_row(rpl_group_info *rgi, if (table->file->ha_table_flags() & HA_DUPLICATE_POS) { DBUG_PRINT("info",("Locating offending record using rnd_pos()")); + error= table->file->ha_rnd_init(0); + if (error) + { + DBUG_PRINT("info",("rnd_init() returns error %d",error)); + table->file->print_error(error, MYF(0)); + DBUG_RETURN(error); + } + error= table->file->ha_rnd_pos(table->record[1], table->file->dup_ref); if (error) { @@ -12854,6 +12862,7 @@ Rows_log_event::write_row(rpl_group_info *rgi, table->file->print_error(error, MYF(0)); DBUG_RETURN(error); } + table->file->ha_rnd_end(); } else { diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 8c2f17dac3f..2fd9caef575 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -638,6 +638,12 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, thd->abort_on_warning= !ignore && thd->is_strict_mode(); + /* Prepare table for random positioning (importent for innodb) */ + if (table_list->table->file->ha_rnd_init(0)) + { + error= 1; + goto err; + } thd_progress_init(thd, 2); if (table_list->table->validate_default_values_of_unset_fields(thd)) { @@ -657,6 +663,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, set_fields, set_values, read_info, *ex->enclosed, skip_lines, ignore); + table_list->table->file->ha_rnd_end(); + thd_proc_info(thd, "End bulk insert"); if (!error) thd_progress_next_stage(thd); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 40b14e33480..4c401ea9011 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -20318,8 +20318,10 @@ end_unique_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */ } /* Prepare table for random positioning */ - if ((error= table->file->ha_index_end()) || - (error= table->file->ha_rnd_init(0))) + bool rnd_inited= (table->file->inited == handler::RND); + if (!rnd_inited && + ((error= table->file->ha_index_end()) || + (error= table->file->ha_rnd_init(0)))) DBUG_RETURN(NESTED_LOOP_ERROR); if (table->file->ha_rnd_pos(table->record[1],table->file->dup_ref)) { @@ -20334,8 +20336,9 @@ end_unique_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), table->file->print_error(error,MYF(0)); /* purecov: inspected */ DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */ } - if ((error= table->file->ha_rnd_end()) || - (error= table->file->ha_index_init(0, 0))) + if (!rnd_inited && + ((error= table->file->ha_rnd_end()) || + (error= table->file->ha_index_init(0, 0)))) DBUG_RETURN(NESTED_LOOP_ERROR); } if (join->thd->check_killed())

1 0

[Commits] d1afffa: MDEV-18300: ASAN error in Field_blob::get_key_image upon UPDATE with subquery
by varun 14 Mar '19

14 Mar '19

revision-id: d1afffae4267d7f2b28ad40926156adff364d6ea (mariadb-10.1.38-54-gd1afffa) parent(s): 49c49e630bdc5fc57dd534b23d8c59b603d36ad0 author: Varun Gupta committer: Varun Gupta timestamp: 2019-03-14 16:24:35 +0530 message: MDEV-18300: ASAN error in Field_blob::get_key_image upon UPDATE with subquery For single table update queries, engine independent statistics were not being read even if the statistics were collected. Fixed it, so when the optimizer_use_condition_selectivity > 2 then we would read the available statistics for update queries --- mysql-test/r/update_innodb.result | 20 ++++++++++++++++++++ mysql-test/t/update_innodb.test | 23 +++++++++++++++++++++++ sql/sql_update.cc | 2 ++ 3 files changed, 45 insertions(+) diff --git a/mysql-test/r/update_innodb.result b/mysql-test/r/update_innodb.result index 0a85c6d..95c6511 100644 --- a/mysql-test/r/update_innodb.result +++ b/mysql-test/r/update_innodb.result @@ -65,3 +65,23 @@ SELECT * FROM t1; a_id b_id c_id 1 NULL NULL drop table t1,t2; +# +# MDEV-18300: ASAN error in Field_blob::get_key_image upon UPDATE with subquery +# +set @save_optimizer_use_condition_selectivity= @@optimizer_use_condition_selectivity; +set @save_use_stat_tables= @@use_stat_tables; +set use_stat_tables=preferably; +set optimizer_use_condition_selectivity=4; +CREATE TABLE t1 (a INT, b CHAR(8)) ENGINE=InnoDB; +insert into t1 values (1,'foo'),(2, 'abc'); +CREATE TABLE t2 (c CHAR(8), d BLOB) ENGINE=InnoDB; +insert into t2 values ('abc', 'foo'),('edf', 'food'); +ANALYZE TABLE t1,t2; +UPDATE t1 SET a = 1 WHERE b = ( SELECT c FROM t2 WHERE d = 'foo' ); +SELECT * FROM t1; +a b +1 foo +1 abc +DROP TABLE t1, t2; +set @@optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity; +set @@use_stat_tables= @save_use_stat_tables; diff --git a/mysql-test/t/update_innodb.test b/mysql-test/t/update_innodb.test index acc8ace..851a355 100644 --- a/mysql-test/t/update_innodb.test +++ b/mysql-test/t/update_innodb.test @@ -75,3 +75,26 @@ SELECT t2.b_id FROM t1,t2 WHERE t2.c_id = t1.c_id; UPDATE t1 SET b_id = (SELECT t2.b_id FROM t2 t2 WHERE t2.c_id = t1.c_id); SELECT * FROM t1; drop table t1,t2; + +--echo # +--echo # MDEV-18300: ASAN error in Field_blob::get_key_image upon UPDATE with subquery +--echo # + +set @save_optimizer_use_condition_selectivity= @@optimizer_use_condition_selectivity; +set @save_use_stat_tables= @@use_stat_tables; +set use_stat_tables=preferably; +set optimizer_use_condition_selectivity=4; + +CREATE TABLE t1 (a INT, b CHAR(8)) ENGINE=InnoDB; +insert into t1 values (1,'foo'),(2, 'abc'); +CREATE TABLE t2 (c CHAR(8), d BLOB) ENGINE=InnoDB; +insert into t2 values ('abc', 'foo'),('edf', 'food'); + +--disable_result_log +ANALYZE TABLE t1,t2; +--enable_result_log +UPDATE t1 SET a = 1 WHERE b = ( SELECT c FROM t2 WHERE d = 'foo' ); +SELECT * FROM t1; +DROP TABLE t1, t2; +set @@optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity; +set @@use_stat_tables= @save_use_stat_tables; diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 960b5cb..32c3caa 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -301,6 +301,8 @@ int mysql_update(THD *thd, if (lock_tables(thd, table_list, table_count, 0)) DBUG_RETURN(1); + (void) read_statistics_for_tables_if_needed(thd, table_list); + if (table_list->handle_derived(thd->lex, DT_MERGE_FOR_INSERT)) DBUG_RETURN(1); if (table_list->handle_derived(thd->lex, DT_PREPARE))

1 0