mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge neptunus.(none):/home/msvensson/mysql/bug9911

Browse source 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
This commit is contained in:
msvensson@neptunus.(none) 2005-04-28 10:50:31 +02:00
commit 6b3e3b03d3
3 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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; }
/*
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.

1
sql/examples/ha_archive.h
View file

@ -124,7 +124,6 @@ public:
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);

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)
{
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;
}
/*