database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch '10.0-galera' into 10.1

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-01-16 04:53:57 +02:00
parent 8e15768731 5fc1ba604e
commit 5ac71d4464
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/galera/r/galera_var_cluster_address.result
View File

@@ -36,3 +36,4 @@ CALL mtr.add_suppression("failed to open gcomm backend connection: 110: failed t
CALL mtr.add_suppression("Failed to open backend connection: -110 \\(Connection timed out\\)"); CALL mtr.add_suppression("Failed to open backend connection: -110 \\(Connection timed out\\)");
CALL mtr.add_suppression("gcs connect failed: Connection timed out"); CALL mtr.add_suppression("gcs connect failed: Connection timed out");
CALL mtr.add_suppression("WSREP: wsrep::connect\\(foo://\\) failed: 7"); CALL mtr.add_suppression("WSREP: wsrep::connect\\(foo://\\) failed: 7");
# End of test

1
mysql-test/suite/galera/suite.pm
View File

@@ -67,6 +67,7 @@ push @::global_suppressions,
qr|WSREP: gcs_caused\(\) returned .*|, qr|WSREP: gcs_caused\(\) returned .*|,
qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored.|, qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored.|,
qr(WSREP: Action message in non-primary configuration from member [0-9]*), qr(WSREP: Action message in non-primary configuration from member [0-9]*),
qr(WSREP: discarding established .*),
); );

2
mysql-test/suite/galera/t/galera_var_cluster_address.test
View File

@@ -9,6 +9,7 @@
--let $node_1=node_1 --let $node_1=node_1
--let $node_2=node_2 --let $node_2=node_2
--source include/auto_increment_offset_save.inc --source include/auto_increment_offset_save.inc
# #
# Set to invalid value # Set to invalid value
# #
@@ -73,3 +74,4 @@ CALL mtr.add_suppression("WSREP: wsrep::connect\\(foo://\\) failed: 7");
--source include/auto_increment_offset_restore.inc --source include/auto_increment_offset_restore.inc
--source include/galera_end.inc --source include/galera_end.inc
--echo # End of test

15
scripts/mysqld_safe.sh
View File

@@ -208,13 +208,6 @@ shell_quote_string() {
echo "$1" | sed -e 's,\([^a-zA-Z0-9/_.=-]\),\\\1,g' echo "$1" | sed -e 's,\([^a-zA-Z0-9/_.=-]\),\\\1,g'
} }
check_executable_location() {
if test "$unsafe_my_cnf" = 1 -a "$unrecognized_handling" != collect; then
log_error "Cannot accept $1 from a config file, when my.cnf is in the datadir"
exit 1
fi
}
wsrep_pick_url() { wsrep_pick_url() {
[ $# -eq 0 ] && return 0 [ $# -eq 0 ] && return 0
@@ -298,6 +291,13 @@ wsrep_recover_position() {
return $ret return $ret
} }
check_executable_location() {
if test "$unsafe_my_cnf" = 1 -a "$unrecognized_handling" != collect; then
log_error "Cannot accept $1 from a config file, when my.cnf is in the datadir"
exit 1
fi
}
parse_arguments() { parse_arguments() {
for arg do for arg do
val=`echo "$arg" | sed -e "s;--[^=]*=;;"` val=`echo "$arg" | sed -e "s;--[^=]*=;;"`
@@ -997,7 +997,6 @@ else
exec 2>&- exec 2>&-
fi fi
# maximum number of wsrep restarts # maximum number of wsrep restarts
max_wsrep_restarts=0 max_wsrep_restarts=0

4
sql/mysqld.cc
View File

@@ -480,6 +480,10 @@ ulong opt_binlog_rows_event_max_size;
my_bool opt_master_verify_checksum= 0; my_bool opt_master_verify_checksum= 0;
my_bool opt_slave_sql_verify_checksum= 1; my_bool opt_slave_sql_verify_checksum= 1;
const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS}; const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS};
#ifdef WITH_WSREP
const char *wsrep_binlog_format_names[]=
{"MIXED", "STATEMENT", "ROW", "NONE", NullS};
#endif /* WITH_WSREP */
volatile sig_atomic_t calling_initgroups= 0; /**< Used in SIGSEGV handler. */ volatile sig_atomic_t calling_initgroups= 0; /**< Used in SIGSEGV handler. */
uint mysqld_port, test_flags, select_errors, dropping_tables, ha_open_options; uint mysqld_port, test_flags, select_errors, dropping_tables, ha_open_options;
uint mysqld_extra_port; uint mysqld_extra_port;