database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/my/mysql-4.1
This commit is contained in:
unknown
2005-04-28 16:00:09 +03:00
parent df0a4ed64e b411128fa5
commit 2a69f0049b
4 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/check-cpu
View File

@ -19,8 +19,6 @@ if test -r /proc/cpuinfo ; then
if test -z "$model_name" ; then if test -z "$model_name" ; then
model_name=`uname -m` model_name=`uname -m`
fi fi
else
exit 0
fi fi
case "$cpu_family--$model_name" in case "$cpu_family--$model_name" in

24
sql/examples/ha_archive.cc
View File

@ -427,30 +427,6 @@ const char **ha_archive::bas_ext() const
{ static const char *ext[]= { ARZ, ARN, ARM, NullS }; return ext; } { 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: When opening a file we:
Create/get our shared structure. Create/get our shared structure.

1
sql/examples/ha_archive.h
View File

@ -124,7 +124,6 @@ public:
int optimize(THD* thd, HA_CHECK_OPT* check_opt); int optimize(THD* thd, HA_CHECK_OPT* check_opt);
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to, THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
enum thr_lock_type lock_type); enum thr_lock_type lock_type);
int rename_table(const char * from, const char * to);
}; };
bool archive_db_init(void); bool archive_db_init(void);

14
sql/handler.cc
View File

@ -1255,13 +1255,17 @@ int handler::delete_table(const char *name)
int handler::rename_table(const char * from, const char * to) int handler::rename_table(const char * from, const char * to)
{ {
DBUG_ENTER("handler::rename_table"); int error= 0;
for (const char **ext=bas_ext(); *ext ; ext++) for (const char **ext= bas_ext(); *ext ; ext++)
{ {
if (rename_file_ext(from,to,*ext)) if (rename_file_ext(from, to, *ext))
DBUG_RETURN(my_errno); {
if ((error=my_errno) != ENOENT)
break;
error= 0;
}
} }
DBUG_RETURN(0); return error;
} }
/* /*