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

Merge branch '10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Sergei Golubchik 2017-10-04 19:50:04 +02:00
commit 3e39771551
8 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +0,0 @@
# ==== Usage ====
#
# [--let $restart_parameters= --innodb-force-recovery=0 --innodb-read-only=1]
# [--let $mysqld_stub_cmd= $MYSQLD_LAST_CMD]
# [--let $error_log= $MYSQLTEST_VARDIR/log/mysqld.1.err]
# --source include/fail_restart_mysqld.inc
# Evaluate the default of $error_log
if (!$error_log)
{
--let $error_log= $MYSQLTEST_VARDIR/log/mysqld.1.err
}
--error 1
--exec $mysqld_stub_cmd $restart_parameters >> $error_log 2>&1
# As the server is stopped
--disable_reconnect

6
mysql-test/mysql-test-run.pl
View File

@ -5057,9 +5057,9 @@ sub mysqld_start ($$) {
}
# "Dynamic" version of MYSQLD_CMD is reevaluated with each mysqld_start.
# Use it to restart the server at testing a failing server start (e.g
# due to incompatible options).
# Command line for mysqld started for *this particular test*.
# Differs from "generic" MYSQLD_CMD by including all command line
# options from *.opt and *.combination files.
$ENV{'MYSQLD_LAST_CMD'}= "$exe @$args";
if ( $opt_gdb || $opt_manual_gdb )

1
mysql-test/r/tc_heuristic_recover.result
View File

@ -1,7 +1,6 @@
call mtr.add_suppression("Can't init tc log");
call mtr.add_suppression("Found 1 prepared transactions!");
call mtr.add_suppression("Aborting");
set debug_sync='RESET';
CREATE TABLE t1 (i INT) ENGINE=InnoDB;
SET GLOBAL innodb_flush_log_at_trx_commit=1;
FLUSH TABLES;

24
mysql-test/t/tc_heuristic_recover.test
View File

@ -9,7 +9,7 @@
# All this proves no crashes and effective rollback of the transaction.
#
--source include/have_innodb.inc
# The test logics really requires --log-bin.
# The test logic really requires --log-bin.
--source include/have_binlog_format_mixed.inc
--source include/have_debug_sync.inc
--source include/not_embedded.inc
@ -22,14 +22,7 @@ call mtr.add_suppression("Aborting");
#
# The "restart" expect-file facility can't be engaged because the server
# having conflicting options may not succeed to boot up.
# Also notice $MYSQLD_CMD is too "static" being unaware of the actual options
# of the last (before shutdown or kill) server run.
# That's why $MYSQLD_LAST_CMD that allows for the server new start
# with more options appended to a stub set which is settled at this very point.
--let $mysqld_stub_cmd= $MYSQLD_LAST_CMD
--let $error_log= $MYSQLTEST_VARDIR/log/mysqld.1.err
--let SEARCH_FILE= $error_log
set debug_sync='RESET';
--let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
CREATE TABLE t1 (i INT) ENGINE=InnoDB;
SET GLOBAL innodb_flush_log_at_trx_commit=1;
@ -55,8 +48,8 @@ SELECT * FROM t1;
# TODO: MDEV-12700 Allow innodb_read_only startup without prior slow shutdown.
--source include/kill_mysqld.inc
--let $restart_parameters= --innodb-force-recovery=4
--source include/fail_start_mysqld.inc
--error 1
--exec $MYSQLD_LAST_CMD --log-bin=master-bin --binlog-format=mixed --core-file --loose-debug-sync-timeout=300 --innodb-force-recovery=4
--let SEARCH_PATTERN= was in the XA prepared state
--source include/search_pattern_in_file.inc
@ -65,8 +58,8 @@ SELECT * FROM t1;
--let SEARCH_PATTERN= \\[ERROR\\] Can\\'t init tc log
--source include/search_pattern_in_file.inc
--let $restart_parameters= --innodb-force-recovery=4 --tc-heuristic-recover=COMMIT
--source include/fail_start_mysqld.inc
--error 1
--exec $MYSQLD_LAST_CMD --log-bin=master-bin --binlog-format=mixed --core-file --loose-debug-sync-timeout=300 --innodb-force-recovery=4 --tc-heuristic-recover=COMMIT
--let SEARCH_PATTERN= was in the XA prepared state
--source include/search_pattern_in_file.inc
--let SEARCH_PATTERN= Found 1 prepared transactions!
@ -76,8 +69,8 @@ SELECT * FROM t1;
--let SEARCH_PATTERN= Please restart mysqld without --tc-heuristic-recover
--source include/search_pattern_in_file.inc
--let $restart_parameters= --tc-heuristic-recover=ROLLBACK
--source include/fail_start_mysqld.inc
--error 1
--exec $MYSQLD_LAST_CMD --log-bin=master-bin --binlog-format=mixed --core-file --loose-debug-sync-timeout=300 --tc-heuristic-recover=ROLLBACK
--let SEARCH_PATTERN= was in the XA prepared state
--source include/search_pattern_in_file.inc
@ -88,7 +81,6 @@ SELECT * FROM t1;
--let SEARCH_PATTERN= Please restart mysqld without --tc-heuristic-recover
--source include/search_pattern_in_file.inc
--let $restart_parameters=
--source include/start_mysqld.inc
--let SEARCH_PATTERN= was in the XA prepared state

4
scripts/mysqld_safe.sh
View File

@ -245,7 +245,7 @@ wsrep_recover_position() {
local euid=$(id -u)
local ret=0
local wr_logfile=$(mktemp wsrep_recovery.XXXXXX)
local wr_logfile=$(mktemp /tmp/wsrep_recovery.XXXXXX)
# safety checks
if [ -z $wr_logfile ]; then
@ -267,7 +267,7 @@ wsrep_recover_position() {
log_notice "WSREP: Running position recovery with $wr_options"
eval_log_error "$mysqld_cmd --wsrep_recover $wr_options 2> $wr_logfile"
eval "$mysqld_cmd --wsrep_recover $wr_options 2> $wr_logfile"
local rp="$(grep 'WSREP: Recovered position:' $wr_logfile)"
if [ -z "$rp" ]; then

2
sql/log_event.cc
View File

@ -7670,7 +7670,7 @@ Gtid_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info)
char buf[21];
char buf2[21];
if (!print_event_info->short_form & !is_flashback)
if (!print_event_info->short_form && !is_flashback)
{
print_header(&cache, print_event_info, FALSE);
longlong10_to_str(seq_no, buf, 10);

2
storage/connect/CMakeLists.txt
View File

@ -247,7 +247,7 @@ ENDIF(CONNECT_WITH_ODBC)
#
# JDBC with MongoDB Java Driver included but disabled
#
#OPTION(CONNECT_WITH_MONGO "Compile CONNECT storage engine with MONGO support" ON)
OPTION(CONNECT_WITH_MONGO "Compile CONNECT storage engine with MONGO support" ON)
OPTION(CONNECT_WITH_JDBC "Compile CONNECT storage engine with JDBC support" ON)
IF(CONNECT_WITH_JDBC)

4
storage/innobase/row/row0import.cc
View File

@ -3595,10 +3595,6 @@ row_import_for_mysql(
DBUG_EXECUTE_IF("ib_import_cluster_root_adjust_failure",
err = DB_CORRUPTION;);
if (err != DB_SUCCESS) {
return(row_import_error(prebuilt, trx, err));
}
if (err != DB_SUCCESS) {
return(row_import_error(prebuilt, trx, err));
} else if (cfg.requires_purge(index->name)) {