diff options
| author | Andrei <andrei.elkin@mariadb.com> | 2021-12-14 00:03:55 +0200 |
|---|---|---|
| committer | Andrei <andrei.elkin@mariadb.com> | 2021-12-15 22:44:23 +0200 |
| commit | 51cc5fbb6d2b5454215c32c283da2604d1101204 (patch) | |
| tree | 46c8f729c627f5e1ea8c5d6b60805a0943e3480d | |
| parent | ac73f5d269e46be52749cbefe8cafc16d539f249 (diff) | |
| download | mariadb-git-51cc5fbb6d2b5454215c32c283da2604d1101204.tar.gz | |
MDEV-11675. Cleanup and test results update
Todo: fix FTWRL. In case the parallel slave executes
SA, FTWRL, CA in this order, there's a hang, as CA can't
be scheduled (because of FTWRL) to unlock FTWRL to complete its
processing.
A patch is following up tomorrow to fix that.
| -rw-r--r-- | mysql-test/main/mysqld--help.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 1bc60dc11a6..675cc3fd131 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -43,8 +43,9 @@ The following specify which files/extra groups are read (specified before remain this automatically. --bind-address=name IP address to bind to. --binlog-alter-two-phase=name - If set split the alter into 2 statement START ALTER and - COMMIT/ROLLBACKALTER. One of: No, Yes + When set, split ALTER at binary logging into 2 + statements: START ALTER and COMMIT/ROLLBACK ALTER. One + of: No, Yes --binlog-annotate-row-events Tells the master to annotate RBR events with the statement that caused these events diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 2e8e7f4168c..04cf5fe34a1 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -325,7 +325,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ALTER_TWO_PHASE VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT If set split the alter into 2 statement START ALTER and COMMIT/ROLLBACKALTER +VARIABLE_COMMENT When set, split ALTER at binary logging into 2 statements: START ALTER and COMMIT/ROLLBACK ALTER NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 4e8b2003b2e..9b01e9c6985 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -7767,10 +7767,6 @@ static bool mysql_inplace_alter_table(THD *thd, } err: - if (partial_alter || start_alter_id) - write_bin_log_start_alter_rollback(thd, start_alter_id, partial_alter, - if_exists); - DBUG_RETURN(true); } |