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
948fce01
Commit
948fce01
authored
Apr 28, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
parents
b40756c2
370cd22b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
32 deletions
+9
-32
BUILD/check-cpu
BUILD/check-cpu
+0
-2
sql/examples/ha_archive.cc
sql/examples/ha_archive.cc
+0
-24
sql/examples/ha_archive.h
sql/examples/ha_archive.h
+0
-1
sql/handler.cc
sql/handler.cc
+9
-5
No files found.
BUILD/check-cpu
View file @
948fce01
...
...
@@ -19,8 +19,6 @@ if test -r /proc/cpuinfo ; then
if
test
-z
"
$model_name
"
;
then
model_name
=
`
uname
-m
`
fi
else
exit
0
fi
case
"
$cpu_family
--
$model_name
"
in
...
...
sql/examples/ha_archive.cc
View file @
948fce01
...
...
@@ -427,30 +427,6 @@ const char **ha_archive::bas_ext() const
{
static
const
char
*
ext
[]
=
{
ARZ
,
ARN
,
ARM
,
NullS
};
return
ext
;
}
/*
Rename all files that this handler defines in bas_ext list
NOTE Don't care if the .arn file is missing
*/
int
ha_archive
::
rename_table
(
const
char
*
from
,
const
char
*
to
)
{
DBUG_ENTER
(
"ha_archive::rename_table"
);
for
(
const
char
**
ext
=
bas_ext
();
*
ext
;
ext
++
)
{
if
(
rename_file_ext
(
from
,
to
,
*
ext
))
{
if
(
my_errno
==
ENOENT
&&
!
my_strcasecmp
(
system_charset_info
,
*
ext
,
ARN
))
continue
;
DBUG_RETURN
(
my_errno
);
}
}
DBUG_RETURN
(
0
);
}
/*
When opening a file we:
Create/get our shared structure.
...
...
sql/examples/ha_archive.h
View file @
948fce01
...
...
@@ -124,7 +124,6 @@ class ha_archive: public handler
int
optimize
(
THD
*
thd
,
HA_CHECK_OPT
*
check_opt
);
THR_LOCK_DATA
**
store_lock
(
THD
*
thd
,
THR_LOCK_DATA
**
to
,
enum
thr_lock_type
lock_type
);
int
rename_table
(
const
char
*
from
,
const
char
*
to
);
};
bool
archive_db_init
(
void
);
...
...
sql/handler.cc
View file @
948fce01
...
...
@@ -1255,13 +1255,17 @@ int handler::delete_table(const char *name)
int
handler
::
rename_table
(
const
char
*
from
,
const
char
*
to
)
{
DBUG_ENTER
(
"handler::rename_table"
)
;
for
(
const
char
**
ext
=
bas_ext
();
*
ext
;
ext
++
)
int
error
=
0
;
for
(
const
char
**
ext
=
bas_ext
();
*
ext
;
ext
++
)
{
if
(
rename_file_ext
(
from
,
to
,
*
ext
))
DBUG_RETURN
(
my_errno
);
if
(
rename_file_ext
(
from
,
to
,
*
ext
))
{
if
((
error
=
my_errno
)
!=
ENOENT
)
break
;
error
=
0
;
}
}
DBUG_RETURN
(
0
)
;
return
error
;
}
/*
...
...
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