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

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2018-12-29 11:05:26 +02:00
parent 33caaba5c8 68143c8905
commit 0b73b96f9d
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extra/mariabackup/xtrabackup.cc
View File

@ -6515,3 +6515,12 @@ static int get_exepath(char *buf, size_t size, const char *argv0)
return my_realpath(buf, argv0, 0); return my_realpath(buf, argv0, 0);
} }
#if defined (__SANITIZE_ADDRESS__) && defined (__linux__)
/* Avoid LeakSanitizer's false positives. */
const char* __asan_default_options()
{
return "detect_leaks=0";
}
#endif

9
mysql-test/suite/innodb/r/innodb-alter-debug.result
View File

@ -89,13 +89,12 @@ INSERT INTO t1 SELECT NULL, i FROM t1;
INSERT INTO t1 SELECT NULL, i FROM t1; INSERT INTO t1 SELECT NULL, i FROM t1;
LOCK TABLE t1 READ; LOCK TABLE t1 READ;
connect con1,localhost,root,,test; connect con1,localhost,root,,test;
SET max_statement_time= 1;
ALTER TABLE t1 FORCE, ALGORITHM=COPY; ALTER TABLE t1 FORCE, ALGORITHM=COPY;
ERROR 70100: Query execution was interrupted (max_statement_time exceeded) connection default;
SET DEBUG_SYNC = 'now SIGNAL stop_waining'; kill query @id;
connection con1;
ERROR 70100: Query execution was interrupted
disconnect con1; disconnect con1;
connection default; connection default;
SET DEBUG_SYNC = 'now WAIT_FOR stop_waining';
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
SET DEBUG_SYNC = 'RESET';

24
mysql-test/suite/innodb/t/innodb-alter-debug.test
View File

@ -98,9 +98,6 @@ SET DEBUG_SYNC='RESET';
DROP TABLE t1; DROP TABLE t1;
# Wait till all disconnects are completed
--source include/wait_until_count_sessions.inc
--echo # --echo #
--echo # MDEV-17470 Orphan temporary files after interrupted ALTER --echo # MDEV-17470 Orphan temporary files after interrupted ALTER
--echo # cause InnoDB: Operating system error number 17 and eventual --echo # cause InnoDB: Operating system error number 17 and eventual
@ -117,14 +114,21 @@ INSERT INTO t1 SELECT NULL, i FROM t1;
LOCK TABLE t1 READ; LOCK TABLE t1 READ;
--connect (con1,localhost,root,,test) --connect (con1,localhost,root,,test)
SET max_statement_time= 1; let $ID= `SELECT @id := CONNECTION_ID()`;
--error ER_STATEMENT_TIMEOUT send ALTER TABLE t1 FORCE, ALGORITHM=COPY;
ALTER TABLE t1 FORCE, ALGORITHM=COPY;
SET DEBUG_SYNC = 'now SIGNAL stop_waining';
--disconnect con1
--connection default --connection default
SET DEBUG_SYNC = 'now WAIT_FOR stop_waining'; let $wait_condition= select 1 from information_schema.processlist where state='Waiting for table metadata lock';
source include/wait_condition.inc;
let $ignore= `SELECT @id := $ID`;
kill query @id;
--connection con1
--error ER_QUERY_INTERRUPTED
reap;
--disconnect con1
--connection default
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
SET DEBUG_SYNC = 'RESET';
# Wait till all disconnects are completed
--source include/wait_until_count_sessions.inc