database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixes for failing tests (post-merge).

Browse Source
This commit is contained in:
Nirbhay Choubey
2016-08-21 20:09:05 -04:00
parent cced23cf23
commit 3f481e52e4
15 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/galera/disabled.def
View File

@ -28,3 +28,4 @@ galera_flush : mysql-wsrep/issues/229
galera_transaction_read_only : mysql-wsrep/issues/229
galera_gcs_fragment : Incorrect arguments to SET
galera_flush_local : Fails sporadically
galera_binlog_stmt_autoinc : TODO: investigate

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

@ -11,3 +11,4 @@ DROP TABLE t1;
STOP SLAVE;
RESET SLAVE ALL;
CALL mtr.add_suppression('failed registering on master');
CALL mtr.add_suppression('You need to use --log-bin to make --binlog-format work');

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

@ -5,3 +5,4 @@ INSERT INTO t1 VALUES(2);
DROP TABLE t1;
STOP SLAVE;
RESET SLAVE ALL;
CALL mtr.add_suppression('You need to use --log-bin to make --binlog-format work');

4
mysql-test/suite/galera/r/galera_as_slave_autoinc.result
View File

@ -1,6 +1,4 @@
START SLAVE USER='root';
Warnings:
Note 1759 Sending passwords in plain text without SSL/TLS is extremely insecure.
START SLAVE;
SET SESSION binlog_format='STATEMENT';
CREATE TABLE t1 (
i int(11) NOT NULL AUTO_INCREMENT,

1
mysql-test/suite/galera/t/MW-284.test
View File

@ -55,3 +55,4 @@ STOP SLAVE;
RESET SLAVE ALL;
CALL mtr.add_suppression('failed registering on master');
CALL mtr.add_suppression('You need to use --log-bin to make --binlog-format work');

3
mysql-test/suite/galera/t/galera_as_master.test
View File

@ -36,3 +36,6 @@ DROP TABLE t1;
STOP SLAVE;
RESET SLAVE ALL;
CALL mtr.add_suppression('You need to use --log-bin to make --binlog-format work');

5
mysql-test/suite/galera/t/galera_as_slave_autoinc.test
View File

@ -5,7 +5,6 @@
#
--source include/have_innodb.inc
--source include/have_log_bin.inc
# As node #1 is not a Galera node, we connect to node #2 in order to run include/galera_cluster.inc
--connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2
@ -13,9 +12,9 @@
--connection node_2
--disable_query_log
--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$NODE_MYPORT_1;
--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_1;
--enable_query_log
START SLAVE USER='root';
START SLAVE;
--connection node_1

15
mysql-test/suite/galera/t/galera_ist_restart_joiner.test
View File

@ -9,6 +9,12 @@
--source include/have_debug_sync.inc
--source suite/galera/include/galera_have_debug_sync.inc
# Save original auto_increment_offset values.
--connection node_1
let $auto_increment_offset_node_1 = `SELECT @@global.auto_increment_offset`;
--connection node_2
let $auto_increment_offset_node_2 = `SELECT @@global.auto_increment_offset`;
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1));
INSERT INTO t1 VALUES (1, 'a'), (2, 'a'), (3, 'a'), (4, 'a'), (5, 'a'),(6, 'a');
@ -106,3 +112,12 @@ SELECT COUNT(*) = 0 FROM t3;
--connection node_1
DROP TABLE t1, t2, t3;
# Restore original auto_increment_offset values.
--disable_query_log
--connection node_1
--eval SET @@global.auto_increment_offset = $auto_increment_offset_node_1;
--connection node_2
--eval SET @@global.auto_increment_offset = $auto_increment_offset_node_2;
--enable_query_log

2
mysql-test/suite/galera_3nodes/t/galera_ist_gcache_rollover.test
View File

@ -82,6 +82,8 @@ INSERT INTO t1 VALUES (51), (52), (53), (54), (55);
--connection node_3
--source include/wait_until_connected_again.inc
sleep 5;
# Final checks
--connection node_2
SELECT COUNT(*) = 30 FROM t1;

8
mysql-test/suite/sys_vars/r/wsrep_desync_basic.result
View File

@ -22,10 +22,12 @@ SET @@global.wsrep_desync=ON;
ERROR HY000: Operation 'desync' failed for SET @@global.wsrep_desync=ON
SELECT @@global.wsrep_desync;
@@global.wsrep_desync
1
0
# valid values
SET @@global.wsrep_desync='OFF';
Warnings:
Warning 1231 'wsrep_desync' is already OFF.
SELECT @@global.wsrep_desync;
@@global.wsrep_desync
0
@ -33,8 +35,10 @@ SET @@global.wsrep_desync=ON;
ERROR HY000: Operation 'desync' failed for SET @@global.wsrep_desync=ON
SELECT @@global.wsrep_desync;
@@global.wsrep_desync
1
0
SET @@global.wsrep_desync=default;
Warnings:
Warning 1231 'wsrep_desync' is already OFF.
SELECT @@global.wsrep_desync;
@@global.wsrep_desync
0

4
mysql-test/suite/sys_vars/r/wsrep_max_ws_size_basic.result
View File

@ -3,10 +3,11 @@
#
# save the initial value
SET @wsrep_max_ws_size_global_saved = @@global.wsrep_max_ws_size;
SET @wsrep_provider_options_saved = @@global.wsrep_provider_options;
# default
SELECT @@global.wsrep_max_ws_size;
@@global.wsrep_max_ws_size
1073741824
2147483647
# scope
SELECT @@session.wsrep_max_ws_size;
@ -55,4 +56,5 @@ NULL
# restore the initial value
SET @@global.wsrep_max_ws_size = @wsrep_max_ws_size_global_saved;
SET @@global.wsrep_provider_options = @wsrep_provider_options_saved;
# End of test

2
mysql-test/suite/sys_vars/t/wsrep_max_ws_size_basic.test
View File

@ -6,6 +6,7 @@
--echo # save the initial value
SET @wsrep_max_ws_size_global_saved = @@global.wsrep_max_ws_size;
SET @wsrep_provider_options_saved = @@global.wsrep_provider_options;
--echo # default
SELECT @@global.wsrep_max_ws_size;
@ -41,5 +42,6 @@ SELECT @global.wsrep_max_ws_size;
--echo
--echo # restore the initial value
SET @@global.wsrep_max_ws_size = @wsrep_max_ws_size_global_saved;
SET @@global.wsrep_provider_options = @wsrep_provider_options_saved;
--echo # End of test

1
sql/sql_class.h
View File

@ -660,7 +660,6 @@ typedef struct system_variables
uint wsrep_sync_wait;
ulong wsrep_retry_autocommit;
ulong wsrep_OSU_method;
ulong wsrep_auto_increment_control;
#endif
double long_query_time_double;

4
storage/xtradb/row/row0upd.cc
View File

@ -412,7 +412,7 @@ wsrep_row_upd_check_foreign_constraints(
dict_table_open_on_name(
foreign->referenced_table_name_lookup,
FALSE, FALSE, DICT_ERR_IGNORE_NONE);
opened = TRUE;
opened = (foreign->referenced_table) ? TRUE : FALSE;
}
if (foreign->referenced_table) {
@ -435,7 +435,7 @@ wsrep_row_upd_check_foreign_constraints(
->n_foreign_key_checks_running);
if (opened == TRUE) {
dict_table_close(foreign->referenced_table, TRUE, FALSE);
dict_table_close(foreign->referenced_table, FALSE, FALSE);
opened = FALSE;
}
}

9
wsrep/wsrep_dummy.c
View File

@ -85,8 +85,15 @@ static wsrep_status_t dummy_options_set(
static char* dummy_options_get (wsrep_t* w)
{
char *options;
WSREP_DBUG_ENTER(w);
return strdup(WSREP_DUMMY(w)->options);
options= WSREP_DUMMY(w)->options;
if (options)
options= strdup(WSREP_DUMMY(w)->options);
return options;
}
static wsrep_status_t dummy_connect(