mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
f094eff1d9
pointed data. I ran gcc -Wcast-qual on storage/maria, this identified un-needed casts, a couple of functions which said they had a const parameter though they changed the pointed content! This is fixed here. Some suspicious places receive a comment. The original intention of running -Wcast-qual was to find what code changes R-tree keys: I added const words, but hidden casts like those of int2store (casts target to (uint16*)) removed const checking; -Wcast-qual helped find those hidden casts. Log handler does not change the content pointed by LEX_STRING::str it receives, so we now use a struct which has a const inside, to emphasize this and be able to pass "const uchar*" buffers to log handler without fear of their content being changed by it. One-line fix for a merge glitch (when merging from MyISAM). include/m_string.h: As Maria's log handler uses LEX_STRING but never changes the content pointed by LEX_STRING::str, and assigns uchar* into this member most of the time, we introduce a new struct LEX_CUSTRING (C const U unsigned) for the log handler. include/my_global.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. include/my_handler.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. ha_find_null() does not change *a. include/my_sys.h: insert_dynamic() does not change *element. include/myisampack.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. mysys/array.c: insert_dynamic() does not change *element mysys/my_handler.c: ha_find_null() does not change *a storage/maria/ma_bitmap.c: Log handler receives const strings now storage/maria/ma_blockrec.c: Log handler receives const strings now. _ma_apply_undo_row_delete/update() do change *header. storage/maria/ma_blockrec.h: correct prototype storage/maria/ma_check.c: Log handler receives const strings now. Un-needed casts storage/maria/ma_checkpoint.c: Log handler receives const strings now storage/maria/ma_checksum.c: unneeded cast storage/maria/ma_commit.c: Log handler receives const strings now storage/maria/ma_create.c: Log handler receives const strings now storage/maria/ma_dbug.c: fixing warning of gcc -Wcast-qual storage/maria/ma_delete.c: Log handler receives const strings now storage/maria/ma_delete_all.c: Log handler receives const strings now storage/maria/ma_delete_table.c: Log handler receives const strings now storage/maria/ma_dynrec.c: fixing some warnings of gcc -Wcast-qual. Unneeded casts removed. Comment about function which lies. storage/maria/ma_ft_parser.c: fix for warnings of gcc -Wcast-qual, removing unneeded casts storage/maria/ma_ft_update.c: less casts, comment storage/maria/ma_key.c: less casts, stay const (warnings of gcc -Wcast-qual) storage/maria/ma_key_recover.c: Log handler receives const strings now storage/maria/ma_loghandler.c: Log handler receives const strings now storage/maria/ma_loghandler.h: Log handler receives const strings now storage/maria/ma_loghandler_lsn.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. storage/maria/ma_page.c: Log handler receives const strings now; more const storage/maria/ma_recovery.c: Log handler receives const strings now storage/maria/ma_rename.c: Log handler receives const strings now storage/maria/ma_rt_index.c: more const, to emphasize that functions don't change pointed content. best_key= NULL was forgotten during merge from MyISAM a few days ago, was causing a Valgrind warning storage/maria/ma_rt_index.h: new proto storage/maria/ma_rt_key.c: more const storage/maria/ma_rt_key.h: new proto storage/maria/ma_rt_mbr.c: more const for functions which deserve it storage/maria/ma_rt_mbr.h: new prototype storage/maria/ma_rt_split.c: make const what is not changed. storage/maria/ma_search.c: un-needed casts, more const storage/maria/ma_sp_key.c: more const storage/maria/ma_unique.c: un-needed casts. storage/maria/ma_write.c: Log handler receives const strings now storage/maria/maria_def.h: some more const storage/maria/unittest/ma_test_loghandler-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_first_lsn-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_max_lsn-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_multithread-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_noflush-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_nologs-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_purge-t.c: Log handler receives const strings now
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_CUSTRING log_array[TRANSLOG_INTERNAL_PARTS + 1];
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 0].str= 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);
|
|
}
|