- commits - lists.mariadb.org

[Commits] dfa24e5: MDEV-7974 XA trnasactions.
by holyfoot＠askmonty.org 04 Apr '19

04 Apr '19

revision-id: dfa24e558ea9fb1ace29e97383577fe4e18d0939 (mariadb-10.4.3-82-gdfa24e5) parent(s): 22e70afbd6fadcd2151e146d9b825939de2de4b8 committer: Alexey Botchkov timestamp: 2019-04-04 13:28:43 +0400 message: MDEV-7974 XA trnasactions. XID_STATE::registered_for_binlog is replaced with rw_trans flag in ha_prepare(). --- sql/handler.cc | 13 ++++++++++--- sql/log.cc | 9 ++++----- sql/sql_class.h | 1 - 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/sql/handler.cc b/sql/handler.cc index 45d21ea..f21420e 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -113,6 +113,10 @@ TYPELIB tx_isolation_typelib= {array_elements(tx_isolation_names)-1,"", static TYPELIB known_extensions= {0,"known_exts", NULL, NULL}; uint known_extensions_id= 0; +static +uint +ha_check_and_coalesce_trx_read_only(THD *thd, Ha_trx_info *ha_list, + bool all); static int commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans); @@ -1247,7 +1251,6 @@ int ha_prepare(THD *thd) Ha_trx_info *ha_info= trans->ha_list; DBUG_ENTER("ha_prepare"); - thd->transaction.xid_state.registered_for_binlog= false; if (ha_info) { for (; ha_info; ha_info= ha_info->next()) @@ -1272,8 +1275,12 @@ int ha_prepare(THD *thd) } } - if (thd->transaction.xid_state.registered_for_binlog && - unlikely(tc_log->log_xa_prepare(thd, all))) + uint rw_ha_count= + ha_check_and_coalesce_trx_read_only(thd,trans->ha_list, all); + bool rw_trans= + (rw_ha_count > (thd->is_current_stmt_binlog_disabled()?0U:1U)); + + if (rw_trans && tc_log->log_xa_prepare(thd, all)) { ha_rollback_trans(thd, all); error=1; diff --git a/sql/log.cc b/sql/log.cc index 1273ccd..3819f1f 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1958,12 +1958,11 @@ binlog_truncate_trx_cache(THD *thd, binlog_cache_mngr *cache_mngr, bool all) static int binlog_prepare(handlerton *hton, THD *thd, bool all) { /* - Mark the XA for binlogging. - Transactions with no binlog handler registered like readonly ones, - should not go to the binlog. - Real work is done in MYSQL_BIN_LOG::log_xa_prepare() + do nothing. + just pretend we can do 2pc, so that MySQL won't + switch to 1pc. + real work is done in MYSQL_BIN_LOG::log_xa_prepare() */ - thd->transaction.xid_state.registered_for_binlog= true; return 0; } diff --git a/sql/sql_class.h b/sql/sql_class.h index bc87a5a..2e81cc2 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1296,7 +1296,6 @@ typedef struct st_xid_state { That can cause inconsistencies (shoud be fixed?). */ bool is_binlogged; - bool registered_for_binlog; /** Check that XA transaction has an uncommitted work. Report an error

1 0

[Commits] 473549d: MDEV-7974 XA transactions.
by holyfoot＠askmonty.org 04 Apr '19

04 Apr '19

revision-id: 473549db66eba115e6a82708fd312bc58e0aadfd (mariadb-10.4.3-81-g473549d) parent(s): d943ed2c47839a4acfe501f5ee8129261dee3a70 committer: Alexey Botchkov timestamp: 2019-04-04 12:50:28 +0400 message: MDEV-7974 XA transactions. registered_for_binlogging replaced with the rw_trans flag in the ha_prepare(). --- sql/handler.cc | 13 ++++++++++--- sql/log.cc | 9 ++++----- sql/sql_class.h | 1 - 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/sql/handler.cc b/sql/handler.cc index 45d21ea..f21420e 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -113,6 +113,10 @@ TYPELIB tx_isolation_typelib= {array_elements(tx_isolation_names)-1,"", static TYPELIB known_extensions= {0,"known_exts", NULL, NULL}; uint known_extensions_id= 0; +static +uint +ha_check_and_coalesce_trx_read_only(THD *thd, Ha_trx_info *ha_list, + bool all); static int commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans); @@ -1247,7 +1251,6 @@ int ha_prepare(THD *thd) Ha_trx_info *ha_info= trans->ha_list; DBUG_ENTER("ha_prepare"); - thd->transaction.xid_state.registered_for_binlog= false; if (ha_info) { for (; ha_info; ha_info= ha_info->next()) @@ -1272,8 +1275,12 @@ int ha_prepare(THD *thd) } } - if (thd->transaction.xid_state.registered_for_binlog && - unlikely(tc_log->log_xa_prepare(thd, all))) + uint rw_ha_count= + ha_check_and_coalesce_trx_read_only(thd,trans->ha_list, all); + bool rw_trans= + (rw_ha_count > (thd->is_current_stmt_binlog_disabled()?0U:1U)); + + if (rw_trans && tc_log->log_xa_prepare(thd, all)) { ha_rollback_trans(thd, all); error=1; diff --git a/sql/log.cc b/sql/log.cc index 1273ccd..3819f1f 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1958,12 +1958,11 @@ binlog_truncate_trx_cache(THD *thd, binlog_cache_mngr *cache_mngr, bool all) static int binlog_prepare(handlerton *hton, THD *thd, bool all) { /* - Mark the XA for binlogging. - Transactions with no binlog handler registered like readonly ones, - should not go to the binlog. - Real work is done in MYSQL_BIN_LOG::log_xa_prepare() + do nothing. + just pretend we can do 2pc, so that MySQL won't + switch to 1pc. + real work is done in MYSQL_BIN_LOG::log_xa_prepare() */ - thd->transaction.xid_state.registered_for_binlog= true; return 0; } diff --git a/sql/sql_class.h b/sql/sql_class.h index bc87a5a..2e81cc2 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1296,7 +1296,6 @@ typedef struct st_xid_state { That can cause inconsistencies (shoud be fixed?). */ bool is_binlogged; - bool registered_for_binlog; /** Check that XA transaction has an uncommitted work. Report an error

1 0

[Commits] d943ed2: MDEV-7974 review/contribution:
by holyfoot＠askmonty.org 04 Apr '19

04 Apr '19

revision-id: d943ed2c47839a4acfe501f5ee8129261dee3a70 (mariadb-10.4.3-80-gd943ed2) parent(s): 20b444ad535c058ce90d8195fbd2261cb6609dc4 committer: Andrei Elkin timestamp: 2019-04-03 20:39:25 +0300 message: MDEV-7974 review/contribution: gtid record of XA-prepare should no be merged into the replicated trx. This patch redirects it into the default mysql.gtid_slave_pos table. A test is added. --- mysql-test/suite/rpl/r/rpl_xa.result | 37 ++++-------- .../suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result | 65 ++++++++++++++++++++ mysql-test/suite/rpl/t/rpl_xa.inc | 69 ++++++++++++++++++++++ mysql-test/suite/rpl/t/rpl_xa.test | 43 +------------- .../suite/rpl/t/rpl_xa_gtid_pos_auto_engine.test | 25 ++++++++ 5 files changed, 171 insertions(+), 68 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_xa.result b/mysql-test/suite/rpl/r/rpl_xa.result index d406877..5d6dddb 100644 --- a/mysql-test/suite/rpl/r/rpl_xa.result +++ b/mysql-test/suite/rpl/r/rpl_xa.result @@ -1,31 +1,22 @@ include/master-slave.inc [connection master] +connection master; create table t1 (a int, b int) engine=InnoDB; xa start 't'; insert into t1 values(1, 2); xa end 't'; xa prepare 't'; xa commit 't'; -select * from t1; -a b -1 2 connection slave; -select * from t1; -a b -1 2 +include/diff_tables.inc [master:t1, slave:t1] connection master; xa start 't'; insert into t1 values(3, 4); xa end 't'; xa prepare 't'; xa rollback 't'; -select * from t1; -a b -1 2 connection slave; -select * from t1; -a b -1 2 +include/diff_tables.inc [master:t1, slave:t1] connection master; SET pseudo_slave_mode=1; create table t2 (a int) engine=InnoDB; @@ -37,26 +28,20 @@ xa start 's'; insert into t2 values (0); xa end 's'; xa prepare 's'; +include/sync_with_master_gtid.inc +xa recover; +formatID gtrid_length bqual_length data +1 1 0 t +1 1 0 s +connection master; xa commit 't'; xa commit 's'; SET pseudo_slave_mode=0; Warnings: Warning 1231 Slave applier execution mode not active, statement ineffective. -select * from t1; -a b -1 2 -5 6 -select * from t2; -a -0 connection slave; -select * from t1; -a b -1 2 -5 6 -select * from t2; -a -0 +include/diff_tables.inc [master:t1, slave:t1] +include/diff_tables.inc [master:t2, slave:t2] connection master; drop table t1, t2; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result b/mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result new file mode 100644 index 0000000..e8b4b05 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result @@ -0,0 +1,65 @@ +include/master-slave.inc +[connection master] +connection slave; +call mtr.add_suppression("The automatically created table.*name may not be entirely in lowercase"); +include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @@global.gtid_pos_auto_engines="innodb"; +include/start_slave.inc +connection master; +create table t1 (a int, b int) engine=InnoDB; +insert into t1 values(0, 0); +xa start 't'; +insert into t1 values(1, 2); +xa end 't'; +xa prepare 't'; +xa commit 't'; +connection slave; +include/diff_tables.inc [master:t1, slave:t1] +connection master; +xa start 't'; +insert into t1 values(3, 4); +xa end 't'; +xa prepare 't'; +xa rollback 't'; +connection slave; +include/diff_tables.inc [master:t1, slave:t1] +connection master; +SET pseudo_slave_mode=1; +create table t2 (a int) engine=InnoDB; +xa start 't'; +insert into t1 values (5, 6); +xa end 't'; +xa prepare 't'; +xa start 's'; +insert into t2 values (0); +xa end 's'; +xa prepare 's'; +connection slave; +include/sync_with_master_gtid.inc +SELECT @@global.gtid_slave_pos = CONCAT(domain_id,"-",server_id,"-",seq_no) FROM mysql.gtid_slave_pos WHERE seq_no = (SELECT DISTINCT max(seq_no) FROM mysql.gtid_slave_pos); +@@global.gtid_slave_pos = CONCAT(domain_id,"-",server_id,"-",seq_no) +1 +xa recover; +formatID gtrid_length bqual_length data +1 1 0 t +1 1 0 s +connection master; +xa commit 't'; +xa commit 's'; +SET pseudo_slave_mode=0; +Warnings: +Warning 1231 Slave applier execution mode not active, statement ineffective. +connection slave; +include/diff_tables.inc [master:t1, slave:t1] +include/diff_tables.inc [master:t2, slave:t2] +connection master; +drop table t1, t2; +connection slave; +include/stop_slave.inc +SET @@global.gtid_pos_auto_engines=""; +SET @@session.sql_log_bin=0; +DROP TABLE mysql.gtid_slave_pos_InnoDB; +SET @@session.sql_log_bin=1; +include/start_slave.inc +include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_xa.inc b/mysql-test/suite/rpl/t/rpl_xa.inc new file mode 100644 index 0000000..69d9f90 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_xa.inc @@ -0,0 +1,69 @@ +# +# This "body" file checks general properties of XA transaction replication +# as of MDEV-7974. +# Parameters: +# --let rpl_xa_check= SELECT ... +# +connection master; +create table t1 (a int, b int) engine=InnoDB; +insert into t1 values(0, 0); +xa start 't'; +insert into t1 values(1, 2); +xa end 't'; +xa prepare 't'; +xa commit 't'; + +sync_slave_with_master; +let $diff_tables= master:t1, slave:t1; +source include/diff_tables.inc; + +connection master; + +xa start 't'; +insert into t1 values(3, 4); +xa end 't'; +xa prepare 't'; +xa rollback 't'; + +sync_slave_with_master; +let $diff_tables= master:t1, slave:t1; +source include/diff_tables.inc; + +connection master; +SET pseudo_slave_mode=1; +create table t2 (a int) engine=InnoDB; +xa start 't'; +insert into t1 values (5, 6); +xa end 't'; +xa prepare 't'; +xa start 's'; +insert into t2 values (0); +xa end 's'; +xa prepare 's'; + +connection slave; +source include/sync_with_master_gtid.inc; +if ($rpl_xa_check) +{ + --eval $rpl_xa_check + if ($rpl_xa_verbose) + { + --eval SELECT $rpl_xa_check_lhs + --eval SELECT $rpl_xa_check_rhs + } +} +xa recover; + +connection master; +xa commit 't'; +xa commit 's'; +SET pseudo_slave_mode=0; + +sync_slave_with_master; +let $diff_tables= master:t1, slave:t1; +source include/diff_tables.inc; +let $diff_tables= master:t2, slave:t2; +source include/diff_tables.inc; + +connection master; +drop table t1, t2; diff --git a/mysql-test/suite/rpl/t/rpl_xa.test b/mysql-test/suite/rpl/t/rpl_xa.test index fda84b3..05a1abe 100644 --- a/mysql-test/suite/rpl/t/rpl_xa.test +++ b/mysql-test/suite/rpl/t/rpl_xa.test @@ -1,46 +1,5 @@ source include/have_innodb.inc; source include/master-slave.inc; -create table t1 (a int, b int) engine=InnoDB; -xa start 't'; -insert into t1 values(1, 2); -xa end 't'; -xa prepare 't'; -xa commit 't'; -select * from t1; -sync_slave_with_master; -select * from t1; -connection master; - -xa start 't'; -insert into t1 values(3, 4); -xa end 't'; -xa prepare 't'; -xa rollback 't'; -select * from t1; -sync_slave_with_master; -select * from t1; - -connection master; -SET pseudo_slave_mode=1; -create table t2 (a int) engine=InnoDB; -xa start 't'; -insert into t1 values (5, 6); -xa end 't'; -xa prepare 't'; -xa start 's'; -insert into t2 values (0); -xa end 's'; -xa prepare 's'; -xa commit 't'; -xa commit 's'; -SET pseudo_slave_mode=0; -select * from t1; -select * from t2; -sync_slave_with_master; -select * from t1; -select * from t2; - -connection master; -drop table t1, t2; +source rpl_xa.inc; source include/rpl_end.inc; diff --git a/mysql-test/suite/rpl/t/rpl_xa_gtid_pos_auto_engine.test b/mysql-test/suite/rpl/t/rpl_xa_gtid_pos_auto_engine.test new file mode 100644 index 0000000..803e29d --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_xa_gtid_pos_auto_engine.test @@ -0,0 +1,25 @@ +--source include/have_innodb.inc +--source include/master-slave.inc + +--connection slave +call mtr.add_suppression("The automatically created table.*name may not be entirely in lowercase"); + +--source include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; + +SET @@global.gtid_pos_auto_engines="innodb"; +--source include/start_slave.inc +--let $rpl_xa_check_lhs= @@global.gtid_slave_pos +--let $rpl_xa_check_rhs= CONCAT(domain_id,"-",server_id,"-",seq_no) FROM mysql.gtid_slave_pos WHERE seq_no = (SELECT DISTINCT max(seq_no) FROM mysql.gtid_slave_pos) +--let $rpl_xa_check=SELECT $rpl_xa_check_lhs = $rpl_xa_check_rhs +--source rpl_xa.inc + +--connection slave +--source include/stop_slave.inc +SET @@global.gtid_pos_auto_engines=""; +SET @@session.sql_log_bin=0; +DROP TABLE mysql.gtid_slave_pos_InnoDB; +SET @@session.sql_log_bin=1; +--source include/start_slave.inc + +--source include/rpl_end.inc

1 0

[Commits] 962782f: MDEV-19112 WITH clause does not work with information_schema as default database
by IgorBabaev 04 Apr '19

04 Apr '19

revision-id: 962782f767879eb64d088aa483007dc25b4fe74b (mariadb-10.2.23-42-g962782f) parent(s): b718ec055d41e45cbbca0bb0c9fdf86310ce9e02 author: Igor Babaev committer: Igor Babaev timestamp: 2019-04-03 22:52:29 -0700 message: MDEV-19112 WITH clause does not work with information_schema as default database With INFORMATION_SCHEMA set as the default database the check that a table referred in the processed query is defined in INORMATION_SCHEMA must be postponed until all CTE names can be identified. --- mysql-test/r/cte_nonrecursive.result | 14 ++++++++++++++ mysql-test/t/cte_nonrecursive.test | 12 ++++++++++++ sql/sql_base.cc | 24 ++++++++++++++++++++++++ sql/sql_cte.cc | 1 + sql/sql_parse.cc | 15 +-------------- 5 files changed, 52 insertions(+), 14 deletions(-) diff --git a/mysql-test/r/cte_nonrecursive.result b/mysql-test/r/cte_nonrecursive.result index fc65458..8ad3818 100644 --- a/mysql-test/r/cte_nonrecursive.result +++ b/mysql-test/r/cte_nonrecursive.result @@ -1659,3 +1659,17 @@ a 2 drop view v1; drop table t1,t2; +# +# MDEV-19112: CTE usage when information_schema is set as default db +# +with t as (select 1 as t ) select * from t; +t +1 +use information_schema; +with t as (select 1 as t) select * from t; +t +1 +with columns as (select 1 as t) select * from columns; +t +1 +use test; diff --git a/mysql-test/t/cte_nonrecursive.test b/mysql-test/t/cte_nonrecursive.test index 920c27a..c0c5c22 100644 --- a/mysql-test/t/cte_nonrecursive.test +++ b/mysql-test/t/cte_nonrecursive.test @@ -1168,3 +1168,15 @@ select * from v1; drop view v1; drop table t1,t2; + +--echo # +--echo # MDEV-19112: CTE usage when information_schema is set as default db +--echo # + +with t as (select 1 as t ) select * from t; + +use information_schema; +with t as (select 1 as t) select * from t; +with columns as (select 1 as t) select * from columns; + +use test; diff --git a/sql/sql_base.cc b/sql/sql_base.cc index c282db4..e0a907a 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3344,6 +3344,30 @@ open_and_process_table(THD *thd, LEX *lex, TABLE_LIST *tables, goto end; } } + + if (!tables->derived && + is_infoschema_db(tables->db, tables->db_length)) + { + /* + Check whether the information schema contains a table + whose name is tables->schema_table_name + */ + ST_SCHEMA_TABLE *schema_table; + schema_table= find_schema_table(thd, tables->schema_table_name); + if (!schema_table || + (schema_table->hidden && + ((sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) == 0 || + /* + this check is used for show columns|keys from I_S hidden table + */ + lex->sql_command == SQLCOM_SHOW_FIELDS || + lex->sql_command == SQLCOM_SHOW_KEYS))) + { + my_error(ER_UNKNOWN_TABLE, MYF(0), + tables->schema_table_name, INFORMATION_SCHEMA_NAME.str); + DBUG_RETURN(1); + } + } /* If this TABLE_LIST object is a placeholder for an information_schema table, create a temporary table to represent the information_schema diff --git a/sql/sql_cte.cc b/sql/sql_cte.cc index bcba4d0..d922a7a 100644 --- a/sql/sql_cte.cc +++ b/sql/sql_cte.cc @@ -1094,6 +1094,7 @@ bool TABLE_LIST::set_as_with_table(THD *thd, With_element *with_elem) table= 0; } with= with_elem; + schema_table= NULL; if (!with_elem->is_referenced() || with_elem->is_recursive) { derived= with_elem->spec; diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a80bf00..28cf549 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -8222,7 +8222,6 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ptr->derived= table->sel; if (!ptr->derived && is_infoschema_db(ptr->db, ptr->db_length)) { - ST_SCHEMA_TABLE *schema_table; if (ptr->updating && /* Special cases which are processed by commands itself */ lex->sql_command != SQLCOM_CHECK && @@ -8234,20 +8233,8 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, INFORMATION_SCHEMA_NAME.str); DBUG_RETURN(0); } + ST_SCHEMA_TABLE *schema_table; schema_table= find_schema_table(thd, ptr->table_name); - if (!schema_table || - (schema_table->hidden && - ((sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) == 0 || - /* - this check is used for show columns|keys from I_S hidden table - */ - lex->sql_command == SQLCOM_SHOW_FIELDS || - lex->sql_command == SQLCOM_SHOW_KEYS))) - { - my_error(ER_UNKNOWN_TABLE, MYF(0), - ptr->table_name, INFORMATION_SCHEMA_NAME.str); - DBUG_RETURN(0); - } ptr->schema_table_name= ptr->table_name; ptr->schema_table= schema_table; }

1 0

[Commits] 7597ddb: rename mysql-configh.sh to mysql-vars.sh to avoid naming confusion
by Sergei Petrunia 03 Apr '19

03 Apr '19

revision-id: 7597ddb1713e3fbae44574ab925399c88f0f8dea () parent(s): 8f1e3889dc57153f6594fef29a110a2be87b2e2e author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-03 14:01:07 +0300 message: rename mysql-configh.sh to mysql-vars.sh to avoid naming confusion --- mariadb-tpcds-tooling2/02-load-dataset.sh | 6 +++--- mariadb-tpcds-tooling2/20-run-queries.sh | 6 +++--- setup-server/setup-mariadb-current.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mariadb-tpcds-tooling2/02-load-dataset.sh b/mariadb-tpcds-tooling2/02-load-dataset.sh index 8065ed0..79db23f 100755 --- a/mariadb-tpcds-tooling2/02-load-dataset.sh +++ b/mariadb-tpcds-tooling2/02-load-dataset.sh @@ -2,12 +2,12 @@ set -e -if [ ! -f mysql-config.sh ] ; then - echo "Cannot find mysql-config.sh - did you setup the db?" +if [ ! -f mysql-vars.sh ] ; then + echo "Cannot find mysql-vars.sh - did you setup the db?" exit 1; fi -source mysql-config.sh +source mysql-vars.sh echo "Loading data using $MYSQL $MYSQL_ARGS"; # This should fail if the database already exists, right? diff --git a/mariadb-tpcds-tooling2/20-run-queries.sh b/mariadb-tpcds-tooling2/20-run-queries.sh index 5cea382..60866bb 100755 --- a/mariadb-tpcds-tooling2/20-run-queries.sh +++ b/mariadb-tpcds-tooling2/20-run-queries.sh @@ -1,11 +1,11 @@ #!/bin/bash -if [ ! -f mysql-config.sh ] ; then - echo "Cannot find mysql-config.sh - did you setup the db?" +if [ ! -f mysql-vars.sh ] ; then + echo "Cannot find mysql-vars.sh - did you setup the db?" exit 1; fi -source mysql-config.sh +source mysql-vars.sh echo "Running data using $MYSQL $MYSQL_ARGS"; ls queries-for-mysql/*.sql | while read a ; do diff --git a/setup-server/setup-mariadb-current.sh b/setup-server/setup-mariadb-current.sh index cc2635d..2e5103a 100755 --- a/setup-server/setup-mariadb-current.sh +++ b/setup-server/setup-mariadb-current.sh @@ -72,7 +72,7 @@ innodb_buffer_pool_size=8G EOF -cat > mysql-config.sh <<EOF +cat > mysql-vars.sh <<EOF MYSQL="./mariadb-$BRANCH/client/mysql" MYSQL_SOCKET="--socket=$SOCKETNAME" MYSQL_USER="-uroot"

1 0

[Commits] 8f1e388: setup-os-ubuntu should install libgnutls28-dev
by Sergei Petrunia 03 Apr '19

03 Apr '19

revision-id: 8f1e3889dc57153f6594fef29a110a2be87b2e2e () parent(s): 93ecbe81bd3a189c6c3ed819c8f6987fa632e4a8 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-03 13:38:17 +0300 message: setup-os-ubuntu should install libgnutls28-dev --- setup-server/setup-os-ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-server/setup-os-ubuntu.sh b/setup-server/setup-os-ubuntu.sh old mode 100644 new mode 100755 index aec787d..5206107 --- a/setup-server/setup-os-ubuntu.sh +++ b/setup-server/setup-os-ubuntu.sh @@ -8,7 +8,7 @@ if [ -e /etc/debian_version ] ; then sudo apt-get -y install libzstd0 sudo apt-get -y install libssl-dev - sudo apt-get install libgnutls28-dev + sudo apt-get -y install libgnutls28-dev # percona server: sudo apt-get -y install libcurl4-gnutls-dev

1 0

[Commits] 86392ed0be3: MDEV-19156: Galera test failure on galerra_sr_cc_master
by jan 03 Apr '19

03 Apr '19

revision-id: 86392ed0be358fff0a2da5575fcde7b37a20497d (mariadb-10.4.3-142-g86392ed0be3) parent(s): e10f9e6c810bf0ced6d79f486d6625d2ed04932e author: Jan Lindström committer: Jan Lindström timestamp: 2019-04-03 09:23:29 +0300 message: MDEV-19156: Galera test failure on galerra_sr_cc_master Test cleanup and fix. --- .../suite/galera_sr/r/galera_sr_cc_master.result | 43 +++++++++++----------- .../suite/galera_sr/t/galera_sr_cc_master.test | 16 ++++---- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result b/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result index 79bc29200f9..9e223414fe4 100644 --- a/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result +++ b/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result @@ -1,5 +1,6 @@ connection node_2; connection node_1; +CALL mtr.add_suppression("WSREP: discarding established.*"); connection node_1; connection node_2; connection node_2; @@ -12,13 +13,13 @@ INSERT INTO t1 VALUES (2); INSERT INTO t1 VALUES (3); INSERT INTO t1 VALUES (4); INSERT INTO t1 VALUES (5); -SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log; -COUNT(*) > 0 -1 +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; +COUNT(*) +5 connection node_1; -SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log; -COUNT(*) > 0 -1 +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; +COUNT(*) +5 connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; connection node_2a; SET SESSION wsrep_sync_wait=0; @@ -28,18 +29,18 @@ connection node_2; INSERT INTO t1 VALUES (6); ERROR HY000: Lost connection to MySQL server during query connection node_1; -SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; -COUNT(*) = 0 -1 +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; +COUNT(*) +0 connection node_2a; connection node_1; connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2; connection node_2b; SELECT * FROM mysql.wsrep_streaming_log; node_uuid trx_id seqno flags frag -SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; -COUNT(*) = 0 -1 +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; +COUNT(*) +0 SET AUTOCOMMIT=OFF; START TRANSACTION; INSERT INTO t1 VALUES (1); @@ -48,16 +49,16 @@ INSERT INTO t1 VALUES (3); INSERT INTO t1 VALUES (4); INSERT INTO t1 VALUES (5); COMMIT; -SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; -COUNT(*) = 0 -1 +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; +COUNT(*) +0 connection node_1; -SELECT COUNT(*) = 5 FROM t1; -COUNT(*) = 5 -1 -SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; -COUNT(*) = 0 -1 +SELECT COUNT(*) FROM t1; +COUNT(*) +5 +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; +COUNT(*) +0 DROP TABLE t1; connection node_2b; CALL mtr.add_suppression("WSREP: Failed to replicate rollback fragment for"); diff --git a/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test b/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test index 8ae8c204f60..da547c59626 100644 --- a/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test +++ b/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test @@ -7,6 +7,8 @@ # leave the cluster. # +CALL mtr.add_suppression("WSREP: discarding established.*"); + # Save original auto_increment_offset values. --let $node_1=node_1 --let $node_2=node_2 @@ -26,10 +28,10 @@ INSERT INTO t1 VALUES (3); INSERT INTO t1 VALUES (4); INSERT INTO t1 VALUES (5); -SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log; +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; --connection node_1 -SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log; +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; # # Trigger CC . The transaction is aborted and we expect the SR tables to be cleaned up @@ -50,7 +52,7 @@ SET SESSION wsrep_sync_wait = DEFAULT; INSERT INTO t1 VALUES (6); --connection node_1 -SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; # Restore cluster @@ -68,7 +70,7 @@ SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; --connection node_2b --source include/galera_wait_ready.inc SELECT * FROM mysql.wsrep_streaming_log; -SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; # Repeat transaction to confirm no locks are left from previous transaction @@ -81,11 +83,11 @@ INSERT INTO t1 VALUES (4); INSERT INTO t1 VALUES (5); COMMIT; -SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; --connection node_1 -SELECT COUNT(*) = 5 FROM t1; -SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; +SELECT COUNT(*) FROM t1; +SELECT COUNT(*) FROM mysql.wsrep_streaming_log; DROP TABLE t1;

1 0

[Commits] 4b71faecf7a: MDEV-19129: Build Failure on OSX
by Varun 02 Apr '19

02 Apr '19

revision-id: 4b71faecf7add3af87ceb84bd738716d4954e828 (mariadb-10.2.22-128-g4b71faecf7a) parent(s): 5633f83ca42ac6f035cf2c18ae11b3b7639b1f7e author: Varun Gupta committer: Varun Gupta timestamp: 2019-04-03 00:10:45 +0530 message: MDEV-19129: Build Failure on OSX Fixing part #1, added flag Wno-error=deprecated-declarations to convert errors to warnings, fixed rest of the warnings --- cmake/maintainer.cmake | 4 ++++ include/my_global.h | 2 +- mysys/my_sync.c | 2 ++ plugin/server_audit/server_audit.c | 2 ++ sql/sql_parse.cc | 3 ++- storage/connect/ha_connect.cc | 7 ++++--- storage/rocksdb/ha_rocksdb.cc | 1 - storage/spider/spd_table.cc | 2 +- 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake index caba370c4ae..f058f0861de 100644 --- a/cmake/maintainer.cmake +++ b/cmake/maintainer.cmake @@ -35,6 +35,10 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0") SET(MY_WARNING_FLAGS ${MY_WARNING_FLAGS} -Wno-error=maybe-uninitialized) ENDIF() +IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "10.0.0") + SET(MY_WARNING_FLAGS ${MY_WARNING_FLAGS} -Wno-error=deprecated-declarations) +ENDIF() + IF(MYSQL_MAINTAINER_MODE MATCHES "OFF") RETURN() ELSEIF(MYSQL_MAINTAINER_MODE MATCHES "AUTO") diff --git a/include/my_global.h b/include/my_global.h index 719464933b8..c56105199dc 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -535,7 +535,7 @@ C_MODE_START #ifdef HAVE_SIGHANDLER_T #define sig_return sighandler_t #else -typedef void (*sig_return)(void); /* Returns type from signal */ +typedef void (*sig_return)(int); /* Returns type from signal */ #endif C_MODE_END #if defined(__GNUC__) && !defined(_lint) diff --git a/mysys/my_sync.c b/mysys/my_sync.c index d1e239692f1..61a5fa170a5 100644 --- a/mysys/my_sync.c +++ b/mysys/my_sync.c @@ -133,7 +133,9 @@ int my_sync(File fd, myf my_flags) } /* my_sync */ +#ifdef NEED_EXPLICIT_SYNC_DIR static const char cur_dir_name[]= {FN_CURLIB, 0}; +#endif /* Force directory information to disk. diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 0995327a86d..0d25d8bec06 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -2130,6 +2130,7 @@ struct mysql_event_general_v8 static void auditing_v8(MYSQL_THD thd, struct mysql_event_general_v8 *ev_v8) { +#ifdef __linux__ #ifdef DBUG_OFF #ifdef __x86_64__ static const int cmd_off= 4200; @@ -2151,6 +2152,7 @@ static void auditing_v8(MYSQL_THD thd, struct mysql_event_general_v8 *ev_v8) static const int db_len_off= 68; #endif /*x86_64*/ #endif /*DBUG_OFF*/ +#endif struct mysql_event_general event; diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a80bf004916..57951a3d031 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1296,7 +1296,8 @@ bool do_command(THD *thd) mysql_mutex_lock(&thd->LOCK_thd_data); if (thd->wsrep_conflict_state == MUST_ABORT) { - DBUG_PRINT("wsrep",("aborted for wsrep rollback: %lu", thd->real_id)); + DBUG_PRINT("wsrep",("aborted for wsrep rollback: %lu", + (unsigned long)thd->real_id)); wsrep_client_rollback(thd); } mysql_mutex_unlock(&thd->LOCK_thd_data); diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 859dc859a09..6724eda4521 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -1317,7 +1317,7 @@ char *ha_connect::GetRealString(PCSZ s) { char *sv; - if (IsPartitioned() && s && partname && *partname) { + if (IsPartitioned() && s && *partname) { sv= (char*)PlugSubAlloc(xp->g, NULL, 0); sprintf(sv, s, partname); PlugSubAlloc(xp->g, NULL, strlen(sv) + 1); @@ -3061,6 +3061,7 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond) const char *p; char *s = (ishav) ? havg : body; uint j, k, n; + const char *str= "1970-01-01 00:00:00"; // Append the value to the filter switch (args[i]->field_type()) { @@ -3071,7 +3072,7 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond) strncat(s, res->ptr(), res->length()); if (res->length() < 19) - strcat(s, "1970-01-01 00:00:00" + res->length()); + strcat(s, str + res->length()); strcat(s, "'}"); break; @@ -3101,7 +3102,7 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond) strncat(s, res->ptr(), res->length()); if (res->length() < 19) - strcat(s, "1970-01-01 00:00:00" + res->length()); + strcat(s, str + res->length()); strcat(s, "'}"); break; diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 022511320a6..8364dd118a7 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -268,7 +268,6 @@ static void rocksdb_flush_all_memtables() { namespace // anonymous namespace = not visible outside this source file { -const ulong TABLE_HASH_SIZE = 32; typedef Hash_set<Rdb_table_handler> Rdb_table_set; struct Rdb_open_tables_map { diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index b4d69af12c4..70edc8c7c09 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -6308,7 +6308,7 @@ int spider_panic( int spider_db_init( void *p ) { - int error_num, roop_count; + int error_num= 0, roop_count; uint dbton_id = 0; handlerton *spider_hton = (handlerton *)p; DBUG_ENTER("spider_db_init");

1 0

[Commits] 11fa88ef67b: MDEV-17362: SIGSEGV in JOIN::optimize_inner or Assertion `fixed == 0' failed in Item_equal::fix_fields, server crashes after 2nd execution of PS
by Oleksandr Byelkin 02 Apr '19

02 Apr '19

revision-id: 11fa88ef67bea74bd13ad688938a03d5b266db64 (mariadb-10.4.3-107-g11fa88ef67b) parent(s): a90622644c11568c2bf982492d2f47bc164ddfef author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-04-02 15:04:45 +0200 message: MDEV-17362: SIGSEGV in JOIN::optimize_inner or Assertion `fixed == 0' failed in Item_equal::fix_fields, server crashes after 2nd execution of PS Move reinitialisation of pushdown variables for every query, because it used now not only for derived tables. --- mysql-test/main/subselect_innodb.result | 20 ++++++++++++++++++++ mysql-test/main/subselect_innodb.test | 24 ++++++++++++++++++++++++ sql/sql_derived.cc | 5 ----- sql/sql_prepare.cc | 4 ++++ sql/sql_select.cc | 6 ++++-- 5 files changed, 52 insertions(+), 7 deletions(-) diff --git a/mysql-test/main/subselect_innodb.result b/mysql-test/main/subselect_innodb.result index 0eb40c9be00..518158e3a04 100644 --- a/mysql-test/main/subselect_innodb.result +++ b/mysql-test/main/subselect_innodb.result @@ -616,3 +616,23 @@ id select_type table type possible_keys key key_len ref rows filtered Extra Warnings: Note 1003 select `test`.`t1`.`f1` AS `f1`,`test`.`t2`.`f2` AS `f2`,`test`.`t3`.`f3` AS `f3` from `test`.`t1` join `test`.`t2` semi join (`test`.`t4`) join `test`.`t3` where `test`.`t4`.`f4` = 1 and `test`.`t1`.`f1` >= `test`.`t2`.`f2` DROP TABLE t1,t2,t3,t4; +# +# MDEV-17362: SIGSEGV in JOIN::optimize_inner or Assertion `fixed == 0' +# failed in Item_equal::fix_fields, server crashes after 2nd execution +# of PS +# +CREATE TABLE t1 (pk int primary key, i1 int, i2 int, v1 varchar(1), v2 varchar(1), KEY i1 (i1), KEY v2 (v2,i1)) ENGINE=InnoDB ; +INSERT INTO t1 VALUES (12,1,1,'r','r'); +CREATE TABLE t2 (pk int, i1 int, i2 int, v1 varchar(1), v2 varchar(1)) ENGINE=InnoDB ; +CREATE TABLE t3 (pk int, i1 int, i2 int, v1 varchar(1), v2 varchar(1)) ENGINE=InnoDB ; +INSERT INTO t3 VALUES (19,1,9,NULL,NULL),(20,5,6,'r','r'); +prepare stmt from " +SELECT 1 FROM t1 +WHERE t1.pk = t1.i1 + AND ((t1.pk,t1.i1) IN (SELECT t3.pk, COUNT(t3.pk) FROM t3 + WHERE EXISTS (SELECT 1 FROM (t1 JOIN t3 ON (t3.i2 = t1.i1)) WHERE t3.v1 = t1.v1)));"; +execute stmt; +1 +execute stmt; +1 +drop table t1,t2,t3; diff --git a/mysql-test/main/subselect_innodb.test b/mysql-test/main/subselect_innodb.test index 544bcd994ed..214d692e793 100644 --- a/mysql-test/main/subselect_innodb.test +++ b/mysql-test/main/subselect_innodb.test @@ -611,3 +611,27 @@ FROM t1 DROP TABLE t1,t2,t3,t4; +--echo # +--echo # MDEV-17362: SIGSEGV in JOIN::optimize_inner or Assertion `fixed == 0' +--echo # failed in Item_equal::fix_fields, server crashes after 2nd execution +--echo # of PS +--echo # + +CREATE TABLE t1 (pk int primary key, i1 int, i2 int, v1 varchar(1), v2 varchar(1), KEY i1 (i1), KEY v2 (v2,i1)) ENGINE=InnoDB ; +INSERT INTO t1 VALUES (12,1,1,'r','r'); + +CREATE TABLE t2 (pk int, i1 int, i2 int, v1 varchar(1), v2 varchar(1)) ENGINE=InnoDB ; + +CREATE TABLE t3 (pk int, i1 int, i2 int, v1 varchar(1), v2 varchar(1)) ENGINE=InnoDB ; +INSERT INTO t3 VALUES (19,1,9,NULL,NULL),(20,5,6,'r','r'); + +prepare stmt from " +SELECT 1 FROM t1 +WHERE t1.pk = t1.i1 + AND ((t1.pk,t1.i1) IN (SELECT t3.pk, COUNT(t3.pk) FROM t3 + WHERE EXISTS (SELECT 1 FROM (t1 JOIN t3 ON (t3.i2 = t1.i1)) WHERE t3.v1 = t1.v1)));"; + +execute stmt; +execute stmt; + +drop table t1,t2,t3; diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 1ad97e4244d..f694707578c 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -1294,11 +1294,6 @@ bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived) unit->types.empty(); /* for derived tables & PS (which can't be reset by Item_subselect) */ unit->reinit_exec_mechanism(); - for (st_select_lex *sl= unit->first_select(); sl; sl= sl->next_select()) - { - sl->cond_pushed_into_where= NULL; - sl->cond_pushed_into_having= NULL; - } unit->set_thd(thd); DBUG_RETURN(FALSE); } diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 8a722ad3952..c15f3a8c143 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3026,6 +3026,10 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) for (order= win_spec->order_list->first; order; order= order->next) order->item= &order->item_ptr; } + + // Reinit Pushdown + sl->cond_pushed_into_where= NULL; + sl->cond_pushed_into_having= NULL; } if (sl->changed_elements & TOUCHED_SEL_DERIVED) { diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e8b092b1b23..197ead809eb 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -13445,8 +13445,10 @@ void JOIN::join_free() void JOIN::cleanup(bool full) { DBUG_ENTER("JOIN::cleanup"); - DBUG_PRINT("enter", ("full %u", (uint) full)); - + DBUG_PRINT("enter", ("select: %d (%p) join: %p full: %u", + select_lex->select_number, select_lex, this, + (uint) full)); + if (full) have_query_plan= QEP_DELETED;

1 0

[Commits] a90622644c1: Cleanup of derived table interface
by Oleksandr Byelkin 02 Apr '19

02 Apr '19

revision-id: a90622644c11568c2bf982492d2f47bc164ddfef (mariadb-10.4.3-106-ga90622644c1) parent(s): 3e1f3d3e2f14a157121b92bd4b76e986f1846454 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-04-02 14:46:36 +0200 message: Cleanup of derived table interface --- sql/sql_derived.h | 1 - sql/sql_view.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/sql_derived.h b/sql/sql_derived.h index abfdb007072..2454d40ba79 100644 --- a/sql/sql_derived.h +++ b/sql/sql_derived.h @@ -22,7 +22,6 @@ struct LEX; bool mysql_handle_derived(LEX *lex, uint phases); bool mysql_handle_single_derived(LEX *lex, TABLE_LIST *derived, uint phases); -bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived); bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived); diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 3014065d28b..13b5caba539 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1200,7 +1200,7 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table, in which case the reinit call wasn't done. See MDEV-6668 for details. */ - mysql_derived_reinit(thd, NULL, table); + mysql_handle_single_derived(thd->lex, table, DT_REINIT); DEBUG_SYNC(thd, "after_cached_view_opened"); DBUG_RETURN(0);

1 0