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
e1182792
Commit
e1182792
authored
May 16, 2002
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents
a5efaf38
cae95ac0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
sql/sql_table.cc
sql/sql_table.cc
+5
-6
No files found.
sql/sql_table.cc
View file @
e1182792
...
...
@@ -934,20 +934,19 @@ static int prepare_for_repair(THD* thd, TABLE_LIST* table,
else
{
char
from
[
FN_REFLEN
],
t
o
[
FN_REFLEN
];
char
from
[
FN_REFLEN
],
t
mp
[
FN_REFLEN
];
char
*
db
=
thd
->
db
?
thd
->
db
:
table
->
db
;
sprintf
(
from
,
"%s/%s/%s"
,
mysql_real_data_home
,
db
,
table
->
name
);
fn_format
(
from
,
from
,
""
,
MI_NAME_DEXT
,
4
);
sprintf
(
to
,
"%s-%lx_%lx"
,
from
,
current_pid
,
thd
->
thread_id
);
sprintf
(
tmp
,
"%s-%lx_%lx"
,
from
,
current_pid
,
thd
->
thread_id
);
my_rename
(
to
,
from
,
MYF
(
MY_WME
)
);
close_cached_table
(
thd
,
table
->
table
);
if
(
lock_and_wait_for_table_name
(
thd
,
table
))
DBUG_RETURN
(
-
1
);
if
(
my_rename
(
from
,
t
o
,
MYF
(
MY_WME
)))
if
(
my_rename
(
from
,
t
mp
,
MYF
(
MY_WME
)))
{
unlock_table_name
(
thd
,
table
);
DBUG_RETURN
(
send_check_errmsg
(
thd
,
table
,
"repair"
,
...
...
@@ -959,7 +958,7 @@ static int prepare_for_repair(THD* thd, TABLE_LIST* table,
DBUG_RETURN
(
send_check_errmsg
(
thd
,
table
,
"repair"
,
"Failed generating table from .frm file"
));
}
if
(
my_rename
(
t
o
,
from
,
MYF
(
MY_WME
)))
if
(
my_rename
(
t
mp
,
from
,
MYF
(
MY_WME
)))
{
unlock_table_name
(
thd
,
table
);
DBUG_RETURN
(
send_check_errmsg
(
thd
,
table
,
"repair"
,
...
...
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