Commit 2a69f004 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.1
parents df0a4ed6 b411128f

BUILD/check-cpu

+0 −2
Original line number Diff line number Diff line
@@ -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

+0 −24
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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

+9 −5
Original line number Diff line number Diff line
@@ -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");

  int error= 0;

  for (const char **ext= bas_ext(); *ext ; 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;

}



/*