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
745e6498
Commit
745e6498
authored
Jan 18, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After-merge fix to a test
parent
4ef2e430
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result
...t/suite/encryption/r/innodb_encrypt_log_corruption.result
+1
-1
mysql-test/suite/innodb/r/log_corruption.result
mysql-test/suite/innodb/r/log_corruption.result
+1
-1
mysql-test/suite/innodb/t/log_corruption.test
mysql-test/suite/innodb/t/log_corruption.test
+5
-1
No files found.
mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result
View file @
745e6498
...
@@ -118,7 +118,7 @@ WHERE engine = 'innodb'
...
@@ -118,7 +118,7 @@ WHERE engine = 'innodb'
AND support IN ('YES', 'DEFAULT', 'ENABLED');
AND support IN ('YES', 'DEFAULT', 'ENABLED');
COUNT(*)
COUNT(*)
1
1
FOUND 1 /InnoDB: .* started; log sequence number 121397
0
/ in mysqld.1.err
FOUND 1 /InnoDB: .* started; log sequence number 121397
[09]
/ in mysqld.1.err
# Empty 10.2 redo log
# Empty 10.2 redo log
SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
WHERE engine = 'innodb'
WHERE engine = 'innodb'
...
...
mysql-test/suite/innodb/r/log_corruption.result
View file @
745e6498
...
@@ -118,7 +118,7 @@ WHERE engine = 'innodb'
...
@@ -118,7 +118,7 @@ WHERE engine = 'innodb'
AND support IN ('YES', 'DEFAULT', 'ENABLED');
AND support IN ('YES', 'DEFAULT', 'ENABLED');
COUNT(*)
COUNT(*)
1
1
FOUND 1 /InnoDB: .* started; log sequence number 121397
0
/ in mysqld.1.err
FOUND 1 /InnoDB: .* started; log sequence number 121397
[09]
/ in mysqld.1.err
# Empty 10.2 redo log
# Empty 10.2 redo log
SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
WHERE engine = 'innodb'
WHERE engine = 'innodb'
...
...
mysql-test/suite/innodb/t/log_corruption.test
View file @
745e6498
...
@@ -416,7 +416,11 @@ SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
...
@@ -416,7 +416,11 @@ SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
WHERE
engine
=
'innodb'
WHERE
engine
=
'innodb'
AND
support
IN
(
'YES'
,
'DEFAULT'
,
'ENABLED'
);
AND
support
IN
(
'YES'
,
'DEFAULT'
,
'ENABLED'
);
--
source
include
/
shutdown_mysqld
.
inc
--
source
include
/
shutdown_mysqld
.
inc
--
let
SEARCH_PATTERN
=
InnoDB
:
.*
started
;
log
sequence
number
1213970
# In encryption.innodb_encrypt_log_corruption, we would convert the
# log to encrypted format. Writing an extra log checkpoint before the
# redo log conversion would advance the LSN by the size of a
# MLOG_CHECKPOINT record (9 bytes).
--
let
SEARCH_PATTERN
=
InnoDB
:
.*
started
;
log
sequence
number
121397
[
09
]
--
source
include
/
search_pattern_in_file
.
inc
--
source
include
/
search_pattern_in_file
.
inc
--
echo
# Empty 10.2 redo log
--
echo
# Empty 10.2 redo log
...
...
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