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
124d74f5
Commit
124d74f5
authored
Nov 25, 2021
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.7 into 10.8
parents
c41cbfaf
ac3b33d2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
mysql-test/suite/galera/t/galera_unicode_pk.test
mysql-test/suite/galera/t/galera_unicode_pk.test
+1
-0
mysql-test/suite/innodb/r/innodb-table-online.result
mysql-test/suite/innodb/r/innodb-table-online.result
+1
-1
mysql-test/suite/innodb/t/innodb-table-online.test
mysql-test/suite/innodb/t/innodb-table-online.test
+2
-3
storage/innobase/log/log0log.cc
storage/innobase/log/log0log.cc
+1
-0
No files found.
mysql-test/suite/galera/t/galera_unicode_pk.test
View file @
124d74f5
...
...
@@ -12,6 +12,7 @@ CREATE TABLE t1 (
INSERT
INTO
t1
VALUES
(
'текст'
);
--
connection
node_2
--
source
include
/
wait_until_ready
.
inc
SELECT
f1
=
'текст'
FROM
t1
;
#
...
...
mysql-test/suite/innodb/r/innodb-table-online.result
View file @
124d74f5
...
...
@@ -202,10 +202,10 @@ SET lock_wait_timeout = 10;
ALTER TABLE t1 ROW_FORMAT=COMPACT
PAGE_COMPRESSED = YES PAGE_COMPRESSION_LEVEL = 1, ALGORITHM = INPLACE;
connection default;
SET DEBUG_SYNC = 'now WAIT_FOR rebuilt2';
INSERT INTO t1 SELECT 80 + c1, c2, c3 FROM t1;
INSERT INTO t1 SELECT 160 + c1, c2, c3 FROM t1;
UPDATE t1 SET c2 = c2 + 1;
SET DEBUG_SYNC = 'now WAIT_FOR rebuilt2';
SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl';
name count
ddl_background_drop_indexes 0
...
...
mysql-test/suite/innodb/t/innodb-table-online.test
View file @
124d74f5
...
...
@@ -195,13 +195,12 @@ ALTER TABLE t1 ROW_FORMAT=COMPACT
PAGE_COMPRESSED
=
YES
PAGE_COMPRESSION_LEVEL
=
1
,
ALGORITHM
=
INPLACE
;
# Generate some log (delete-mark, delete-unmark, insert etc.)
# while the index creation is blocked. Some of this may run
# in parallel with the clustered index scan.
# while the index creation is blocked.
connection
default
;
SET
DEBUG_SYNC
=
'now WAIT_FOR rebuilt2'
;
INSERT
INTO
t1
SELECT
80
+
c1
,
c2
,
c3
FROM
t1
;
INSERT
INTO
t1
SELECT
160
+
c1
,
c2
,
c3
FROM
t1
;
UPDATE
t1
SET
c2
=
c2
+
1
;
SET
DEBUG_SYNC
=
'now WAIT_FOR rebuilt2'
;
# At this point, the clustered index scan must have completed,
# but the modification log keeps accumulating due to the DEBUG_SYNC.
eval
$innodb_metrics_select
;
...
...
storage/innobase/log/log0log.cc
View file @
124d74f5
...
...
@@ -836,6 +836,7 @@ void log_write_up_to(lsn_t lsn, bool flush_to_disk, bool rotate_key,
ret_lsn2
=
flush_lock
.
release
(
flush_lsn
);
log_flush_notify
(
flush_lsn
);
DBUG_EXECUTE_IF
(
"crash_after_log_write_upto"
,
DBUG_SUICIDE
(););
}
if
(
ret_lsn1
||
ret_lsn2
)
...
...
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