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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
283af34a
Commit
283af34a
authored
Jan 20, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-5543 MyISAM repair unsafe usage of TMD files
parent
1555f180
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
2 deletions
+44
-2
mysql-test/r/repair_symlink-5543.result
mysql-test/r/repair_symlink-5543.result
+14
-0
mysql-test/t/repair_symlink-5543.test
mysql-test/t/repair_symlink-5543.test
+26
-0
storage/maria/ha_maria.cc
storage/maria/ha_maria.cc
+2
-1
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.cc
+2
-1
No files found.
mysql-test/r/repair_symlink-5543.result
0 → 100644
View file @
283af34a
create table t1 (a int) engine=myisam data directory='MYSQL_TMP_DIR';
insert t1 values (1);
repair table t1;
Table Op Msg_type Msg_text
test.t1 repair error Can't create new tempfile: 'MYSQL_TMP_DIR/t1.TMD'
test.t1 repair status Operation failed
drop table t1;
create table t2 (a int) engine=aria data directory='MYSQL_TMP_DIR';
insert t2 values (1);
repair table t2;
Table Op Msg_type Msg_text
test.t2 repair error Can't create new tempfile: 'MYSQL_TMP_DIR/t2.TMD'
test.t2 repair status Operation failed
drop table t2;
mysql-test/t/repair_symlink-5543.test
0 → 100644
View file @
283af34a
#
# MDEV-5543 MyISAM repair unsafe usage of TMD files
#
--
source
include
/
have_symlink
.
inc
--
source
include
/
not_windows
.
inc
--
source
include
/
have_maria
.
inc
--
replace_result
$MYSQL_TMP_DIR
MYSQL_TMP_DIR
eval
create
table
t1
(
a
int
)
engine
=
myisam
data
directory
=
'$MYSQL_TMP_DIR'
;
insert
t1
values
(
1
);
--
system
ln
-
s
$MYSQL_TMP_DIR
/
foobar5543
$MYSQL_TMP_DIR
/
t1
.
TMD
--
replace_result
$MYSQL_TMP_DIR
MYSQL_TMP_DIR
repair
table
t1
;
drop
table
t1
;
--
replace_result
$MYSQL_TMP_DIR
MYSQL_TMP_DIR
eval
create
table
t2
(
a
int
)
engine
=
aria
data
directory
=
'$MYSQL_TMP_DIR'
;
insert
t2
values
(
1
);
--
system
ln
-
s
$MYSQL_TMP_DIR
/
foobar5543
$MYSQL_TMP_DIR
/
t2
.
TMD
--
replace_result
$MYSQL_TMP_DIR
MYSQL_TMP_DIR
repair
table
t2
;
drop
table
t2
;
--
list_files
$MYSQL_TMP_DIR
foobar5543
--
system
rm
$MYSQL_TMP_DIR
/
t1
.
TMD
$MYSQL_TMP_DIR
/
t2
.
TMD
storage/maria/ha_maria.cc
View file @
283af34a
/* Copyright (C) 2004-2008 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
/* Copyright (C) 2004-2008 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
Copyright (C) 2008-2009 Sun Microsystems, Inc.
Copyright (C) 2008-2009 Sun Microsystems, Inc.
Copyright (c) 2009, 2014, SkySQL Ab.
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
@@ -1467,7 +1468,7 @@ int ha_maria::repair(THD *thd, HA_CHECK *param, bool do_optimize)
...
@@ -1467,7 +1468,7 @@ int ha_maria::repair(THD *thd, HA_CHECK *param, bool do_optimize)
param
->
db_name
=
table
->
s
->
db
.
str
;
param
->
db_name
=
table
->
s
->
db
.
str
;
param
->
table_name
=
table
->
alias
;
param
->
table_name
=
table
->
alias
;
param
->
tmpfile_createflag
=
O_RDWR
|
O_TRUNC
;
param
->
tmpfile_createflag
=
O_RDWR
|
O_TRUNC
|
O_EXCL
;
param
->
using_global_keycache
=
1
;
param
->
using_global_keycache
=
1
;
param
->
thd
=
thd
;
param
->
thd
=
thd
;
param
->
tmpdir
=
&
mysql_tmpdir_list
;
param
->
tmpdir
=
&
mysql_tmpdir_list
;
...
...
storage/myisam/ha_myisam.cc
View file @
283af34a
/*
/*
Copyright (c) 2000, 2011, Oracle and/or its affiliates
Copyright (c) 2000, 2011, Oracle and/or its affiliates
Copyright (c) 2009, 2014, SkySQL Ab.
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
@@ -1138,7 +1139,7 @@ int ha_myisam::repair(THD *thd, HA_CHECK ¶m, bool do_optimize)
...
@@ -1138,7 +1139,7 @@ int ha_myisam::repair(THD *thd, HA_CHECK ¶m, bool do_optimize)
param
.
db_name
=
table
->
s
->
db
.
str
;
param
.
db_name
=
table
->
s
->
db
.
str
;
param
.
table_name
=
table
->
alias
;
param
.
table_name
=
table
->
alias
;
param
.
tmpfile_createflag
=
O_RDWR
|
O_TRUNC
;
param
.
tmpfile_createflag
=
O_RDWR
|
O_TRUNC
|
O_EXCL
;
param
.
using_global_keycache
=
1
;
param
.
using_global_keycache
=
1
;
param
.
thd
=
thd
;
param
.
thd
=
thd
;
param
.
tmpdir
=
&
mysql_tmpdir_list
;
param
.
tmpdir
=
&
mysql_tmpdir_list
;
...
...
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