svnno****@sourc*****
svnno****@sourc*****
2007年 11月 14日 (水) 11:10:54 JST
Revision: 40 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=40 Author: mir Date: 2007-11-14 11:10:54 +0900 (Wed, 14 Nov 2007) Log Message: ----------- created tritonn-1.1.0 from tritonn-1.0.8 Added Paths: ----------- mysql-5.0.45-tritonn-1.1.0/ mysql-5.0.45-tritonn-1.1.0/myisam/mi_delete_table.c Removed Paths: ------------- mysql-5.0.45-tritonn-1.1.0/myisam/mi_delete_table.c Copied: mysql-5.0.45-tritonn-1.1.0 (from rev 38, mysql-5.0.45-tritonn-1.0.8) Deleted: mysql-5.0.45-tritonn-1.1.0/myisam/mi_delete_table.c =================================================================== --- mysql-5.0.45-tritonn-1.0.8/myisam/mi_delete_table.c 2007-11-06 02:10:10 UTC (rev 38) +++ mysql-5.0.45-tritonn-1.1.0/myisam/mi_delete_table.c 2007-11-14 02:10:54 UTC (rev 40) @@ -1,95 +0,0 @@ -/* Copyright (C) 2000-2001, 2004, 2006 MySQL AB - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -/* - deletes a table -*/ - -#include "fulltext.h" - -int mi_delete_table(const char *name) -{ - char from[FN_REFLEN]; -#ifdef USE_RAID - uint raid_type=0,raid_chunks=0; -#endif - DBUG_ENTER("mi_delete_table"); - -#ifdef EXTRA_DEBUG - check_table_is_closed(name,"delete"); -#endif -#ifdef USE_RAID - { - MI_INFO *info; - /* - When built with RAID support, we need to determine if this table - makes use of the raid feature. If yes, we need to remove all raid - chunks. This is done with my_raid_delete(). Unfortunately it is - necessary to open the table just to check this. We use - 'open_for_repair' to be able to open even a crashed table. If even - this open fails, we assume no raid configuration for this table - and try to remove the normal data file only. This may however - leave the raid chunks behind. - */ - if (!(info= mi_open(name, O_RDONLY, HA_OPEN_FOR_REPAIR))) - raid_type= 0; - else - { - raid_type= info->s->base.raid_type; - raid_chunks= info->s->base.raid_chunks; - mi_close(info); - } - } -#ifdef EXTRA_DEBUG - check_table_is_closed(name,"delete"); -#endif -#endif /* USE_RAID */ - -#ifdef ENABLE_SENNA - { - int i; - MI_INFO *mi_info; - MI_INFO cp_of_mi_info; - - if (!(mi_info = mi_open(name, O_RDONLY, 0))) - { - SEN_LOG(sen_log_warning, "mi_delete_table => cannot get MI_INFO"); - DBUG_RETURN(my_errno); - } - - cp_of_mi_info = *mi_info; - mi_close(mi_info); - - for (i = 0; i < cp_of_mi_info.s->state.header.keys; i++) - { - if (cp_of_mi_info.s->keyinfo[i].senna) - { - my_snprintf(from, FN_REFLEN, "%s.%03d", name, i); - SEN_LOG(sen_log_notice, "mi_delete_table => sen_index_remove: path=%s", from); - sen_index_remove(from); - } - } - } -#endif /* ENABLE_SENNA */ - fn_format(from,name,"",MI_NAME_IEXT,4); - if (my_delete_with_symlink(from, MYF(MY_WME))) - DBUG_RETURN(my_errno); - fn_format(from,name,"",MI_NAME_DEXT,4); -#ifdef USE_RAID - if (raid_type) - DBUG_RETURN(my_raid_delete(from, raid_chunks, MYF(MY_WME)) ? my_errno : 0); -#endif - DBUG_RETURN(my_delete_with_symlink(from, MYF(MY_WME)) ? my_errno : 0); -} Copied: mysql-5.0.45-tritonn-1.1.0/myisam/mi_delete_table.c (from rev 39, mysql-5.0.45-tritonn-1.0.8/myisam/mi_delete_table.c)