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
77b7f793
Commit
77b7f793
authored
May 17, 2020
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-18496 Crash when Aria encryption is enabled but plugin not available
fix uninitialized struct member
parent
88cbe2f0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
mysql-test/suite/maria/encrypt-no-key.result
mysql-test/suite/maria/encrypt-no-key.result
+6
-0
mysql-test/suite/maria/encrypt-no-key.test
mysql-test/suite/maria/encrypt-no-key.test
+1
-0
storage/maria/ma_check.c
storage/maria/ma_check.c
+1
-0
No files found.
mysql-test/suite/maria/encrypt-no-key.result
View file @
77b7f793
...
...
@@ -5,5 +5,11 @@ alter table t1 disable keys;
insert into t1 values (1,1);
alter table t1 enable keys;
ERROR HY000: Unknown key id 1. Can't continue!
repair table t1 use_frm;
Table Op Msg_type Msg_text
test.t1 repair warning Number of rows changed from 0 to 1
test.t1 repair Error Unknown key id 1. Can't continue!
test.t1 repair Error Unknown key id 1. Can't continue!
test.t1 repair status OK
drop table t1;
set global aria_encrypt_tables= default;
mysql-test/suite/maria/encrypt-no-key.test
View file @
77b7f793
...
...
@@ -9,5 +9,6 @@ alter table t1 disable keys;
insert
into
t1
values
(
1
,
1
);
error
192
;
alter
table
t1
enable
keys
;
repair
table
t1
use_frm
;
drop
table
t1
;
set
global
aria_encrypt_tables
=
default
;
storage/maria/ma_check.c
View file @
77b7f793
...
...
@@ -3198,6 +3198,7 @@ static int write_page(MARIA_SHARE *share, File file,
args
.
page
=
buff
;
args
.
pageno
=
(
pgcache_page_no_t
)
(
pos
/
share
->
block_size
);
args
.
data
=
(
uchar
*
)
share
;
args
.
crypt_buf
=
NULL
;
(
*
share
->
kfile
.
pre_write_hook
)(
&
args
);
res
=
my_pwrite
(
file
,
args
.
page
,
block_size
,
pos
,
myf_rw
);
(
*
share
->
kfile
.
post_write_hook
)(
res
,
&
args
);
...
...
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