Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
0b73b96f
Commit
0b73b96f
authored
Dec 29, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.1 into 10.2
parents
33caaba5
68143c89
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
15 deletions
+27
-15
extra/mariabackup/xtrabackup.cc
extra/mariabackup/xtrabackup.cc
+9
-0
mysql-test/suite/innodb/r/innodb-alter-debug.result
mysql-test/suite/innodb/r/innodb-alter-debug.result
+4
-5
mysql-test/suite/innodb/t/innodb-alter-debug.test
mysql-test/suite/innodb/t/innodb-alter-debug.test
+14
-10
No files found.
extra/mariabackup/xtrabackup.cc
View file @
0b73b96f
...
@@ -6515,3 +6515,12 @@ static int get_exepath(char *buf, size_t size, const char *argv0)
...
@@ -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
mysql-test/suite/innodb/r/innodb-alter-debug.result
View file @
0b73b96f
...
@@ -89,13 +89,12 @@ INSERT INTO t1 SELECT NULL, i FROM t1;
...
@@ -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';
mysql-test/suite/innodb/t/innodb-alter-debug.test
View file @
0b73b96f
...
@@ -98,9 +98,6 @@ SET DEBUG_SYNC='RESET';
...
@@ -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;
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment