mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
e689fbc458
Fixed bug that caused change_user.test to fail Fixed bug that caused mysql_client_test to fail include/myisam.h: Fixed prototypes mysql-test/r/create.result: Fix that test works even if Maria is not used for temporary tables mysql-test/t/create.test: Fix that test works even if Maria is not used for temporary tables sql/mysqld.cc: Fixed that default value of max_join_size is set correctly; It needs to match usage in set_var.cc sql/set_var.cc: Fixed test, now when max_join_size is initialized correctly sql/sql_select.cc: Fixed that one can compile without -DUSE_MARIA_FOR_TMP_TABLES storage/maria/ma_blockrec.c: Fixed compiler warnings by adding casts storage/maria/ma_checkpoint.c: Fixed compiler warnings by adding casts storage/maria/ma_create.c: Fixed compiler warnings by adding casts storage/maria/ma_delete_table.c: Fixed compiler warnings by adding casts storage/maria/ma_loghandler.c: Fixed compiler warnings by adding casts and changing types for variables Changed translog_new_page_header to use changing integer instead of calling time() as time() is a slow call and will give same results when calling many times withing one second storage/maria/ma_pagecrc.c: Fixed compiler warnings by adding casts storage/maria/ma_recovery.c: Fixed indentation storage/myisam/ha_myisam.cc: Fixed wrong types for variables Changed chk_data_link() and repair*() functions to take my_bool as argument storage/myisam/mi_check.c: Fixes to handle that param.test_flag is now ulonglong storage/myisam/myisamchk.c: Fixes to handle that param.test_flag is now ulonglong support-files/compiler_warnings.supp: Fixed line numbers
112 lines
3.7 KiB
C
112 lines
3.7 KiB
C
/* Copyright (C) 2006 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
|
|
|
|
#include "ma_fulltext.h"
|
|
#include "trnman_public.h"
|
|
|
|
/**
|
|
@brief drops (deletes) a table
|
|
|
|
@param name table's name
|
|
|
|
@return Operation status
|
|
@retval 0 ok
|
|
@retval 1 error
|
|
*/
|
|
|
|
int maria_delete_table(const char *name)
|
|
{
|
|
char from[FN_REFLEN];
|
|
#ifdef USE_RAID
|
|
uint raid_type=0,raid_chunks=0;
|
|
#endif
|
|
MARIA_HA *info;
|
|
myf sync_dir;
|
|
DBUG_ENTER("maria_delete_table");
|
|
|
|
#ifdef EXTRA_DEBUG
|
|
_ma_check_table_is_closed(name,"delete");
|
|
#endif
|
|
/** @todo LOCK take X-lock on table */
|
|
/*
|
|
We need to know if this table is transactional.
|
|
When built with RAID support, we also 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= maria_open(name, O_RDONLY, HA_OPEN_FOR_REPAIR)))
|
|
{
|
|
#ifdef USE_RAID
|
|
raid_type= 0;
|
|
#endif
|
|
sync_dir= 0;
|
|
}
|
|
else
|
|
{
|
|
#ifdef USE_RAID
|
|
raid_type= info->s->base.raid_type;
|
|
raid_chunks= info->s->base.raid_chunks;
|
|
#endif
|
|
sync_dir= (info->s->now_transactional && !info->s->temporary &&
|
|
!maria_in_recovery) ?
|
|
MY_SYNC_DIR : 0;
|
|
maria_close(info);
|
|
}
|
|
#ifdef USE_RAID
|
|
#ifdef EXTRA_DEBUG
|
|
_ma_check_table_is_closed(name,"delete");
|
|
#endif
|
|
#endif /* USE_RAID */
|
|
|
|
if (sync_dir)
|
|
{
|
|
/*
|
|
For this log record to be of any use for Recovery, we need the upper
|
|
MySQL layer to be crash-safe in DDLs.
|
|
For now this record can serve when we apply logs to a backup, so we sync
|
|
it.
|
|
*/
|
|
LSN lsn;
|
|
LEX_STRING log_array[TRANSLOG_INTERNAL_PARTS + 1];
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 0].str= (char *)name;
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 0].length= strlen(name) + 1;
|
|
if (unlikely(translog_write_record(&lsn, LOGREC_REDO_DROP_TABLE,
|
|
&dummy_transaction_object, NULL,
|
|
(translog_size_t)
|
|
log_array[TRANSLOG_INTERNAL_PARTS +
|
|
0].length,
|
|
sizeof(log_array)/sizeof(log_array[0]),
|
|
log_array, NULL, NULL) ||
|
|
translog_flush(lsn)))
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
fn_format(from,name,"",MARIA_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
|
|
if (my_delete_with_symlink(from, MYF(MY_WME | sync_dir)))
|
|
DBUG_RETURN(my_errno);
|
|
fn_format(from,name,"",MARIA_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
|
|
#ifdef USE_RAID
|
|
if (raid_type)
|
|
DBUG_RETURN(my_raid_delete(from, raid_chunks, MYF(MY_WME | sync_dir)) ?
|
|
my_errno : 0);
|
|
#endif
|
|
DBUG_RETURN(my_delete_with_symlink(from, MYF(MY_WME | sync_dir)) ?
|
|
my_errno : 0);
|
|
}
|