2006-04-11 15:45:10 +02:00
|
|
|
/* 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; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
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 "maria_def.h"
|
|
|
|
#ifdef HAVE_SYS_MMAN_H
|
|
|
|
#include <sys/mman.h>
|
|
|
|
#endif
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static void maria_extra_keyflag(MARIA_HA *info,
|
|
|
|
enum ha_extra_function function);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Set options and buffers to optimize table handling
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
maria_extra()
|
|
|
|
info open table
|
|
|
|
function operation
|
|
|
|
extra_arg Pointer to extra argument (normally pointer to ulong)
|
|
|
|
Used when function is one of:
|
|
|
|
HA_EXTRA_WRITE_CACHE
|
|
|
|
HA_EXTRA_CACHE
|
|
|
|
RETURN VALUES
|
|
|
|
0 ok
|
|
|
|
# error
|
|
|
|
*/
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
int maria_extra(MARIA_HA *info, enum ha_extra_function function,
|
|
|
|
void *extra_arg)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
int error=0;
|
|
|
|
ulong cache_size;
|
|
|
|
MARIA_SHARE *share=info->s;
|
|
|
|
DBUG_ENTER("maria_extra");
|
|
|
|
DBUG_PRINT("enter",("function: %d",(int) function));
|
|
|
|
|
|
|
|
switch (function) {
|
|
|
|
case HA_EXTRA_RESET_STATE: /* Reset state (don't free buffers) */
|
|
|
|
info->lastinx= 0; /* Use first index as def */
|
2007-01-18 20:38:14 +01:00
|
|
|
info->last_search_keypage= info->cur_row.lastpos= HA_OFFSET_ERROR;
|
2006-04-11 15:45:10 +02:00
|
|
|
info->page_changed=1;
|
|
|
|
/* Next/prev gives first/last */
|
|
|
|
if (info->opt_flag & READ_CACHE_USED)
|
|
|
|
{
|
|
|
|
reinit_io_cache(&info->rec_cache,READ_CACHE,0,
|
|
|
|
(pbool) (info->lock_type != F_UNLCK),
|
|
|
|
(pbool) test(info->update & HA_STATE_ROW_CHANGED)
|
|
|
|
);
|
|
|
|
}
|
|
|
|
info->update= ((info->update & HA_STATE_CHANGED) | HA_STATE_NEXT_FOUND |
|
|
|
|
HA_STATE_PREV_FOUND);
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_CACHE:
|
|
|
|
if (info->lock_type == F_UNLCK &&
|
|
|
|
(share->options & HA_OPTION_PACK_RECORD))
|
|
|
|
{
|
|
|
|
error=1; /* Not possibly if not locked */
|
|
|
|
my_errno=EACCES;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (info->s->file_map) /* Don't use cache if mmap */
|
|
|
|
break;
|
|
|
|
#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)
|
|
|
|
if ((share->options & HA_OPTION_COMPRESS_RECORD))
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&share->intern_lock);
|
|
|
|
if (_ma_memmap_file(info))
|
|
|
|
{
|
|
|
|
/* We don't nead MADV_SEQUENTIAL if small file */
|
|
|
|
madvise(share->file_map,share->state.state.data_file_length,
|
|
|
|
share->state.state.data_file_length <= RECORD_CACHE_SIZE*16 ?
|
|
|
|
MADV_RANDOM : MADV_SEQUENTIAL);
|
|
|
|
pthread_mutex_unlock(&share->intern_lock);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&share->intern_lock);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (info->opt_flag & WRITE_CACHE_USED)
|
|
|
|
{
|
|
|
|
info->opt_flag&= ~WRITE_CACHE_USED;
|
|
|
|
if ((error=end_io_cache(&info->rec_cache)))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!(info->opt_flag &
|
|
|
|
(READ_CACHE_USED | WRITE_CACHE_USED | MEMMAP_USED)))
|
|
|
|
{
|
|
|
|
cache_size= (extra_arg ? *(ulong*) extra_arg :
|
|
|
|
my_default_record_cache_size);
|
|
|
|
if (!(init_io_cache(&info->rec_cache,info->dfile,
|
|
|
|
(uint) min(info->state->data_file_length+1,
|
|
|
|
cache_size),
|
|
|
|
READ_CACHE,0L,(pbool) (info->lock_type != F_UNLCK),
|
|
|
|
MYF(share->write_flag & MY_WAIT_IF_FULL))))
|
|
|
|
{
|
|
|
|
info->opt_flag|=READ_CACHE_USED;
|
|
|
|
info->update&= ~HA_STATE_ROW_CHANGED;
|
|
|
|
}
|
|
|
|
if (share->concurrent_insert)
|
|
|
|
info->rec_cache.end_of_file=info->state->data_file_length;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_REINIT_CACHE:
|
|
|
|
if (info->opt_flag & READ_CACHE_USED)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
reinit_io_cache(&info->rec_cache, READ_CACHE, info->cur_row.nextpos,
|
2006-04-11 15:45:10 +02:00
|
|
|
(pbool) (info->lock_type != F_UNLCK),
|
|
|
|
(pbool) test(info->update & HA_STATE_ROW_CHANGED));
|
|
|
|
info->update&= ~HA_STATE_ROW_CHANGED;
|
|
|
|
if (share->concurrent_insert)
|
|
|
|
info->rec_cache.end_of_file=info->state->data_file_length;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_WRITE_CACHE:
|
|
|
|
if (info->lock_type == F_UNLCK)
|
|
|
|
{
|
|
|
|
error=1; /* Not possibly if not locked */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
cache_size= (extra_arg ? *(ulong*) extra_arg :
|
|
|
|
my_default_record_cache_size);
|
|
|
|
if (!(info->opt_flag &
|
|
|
|
(READ_CACHE_USED | WRITE_CACHE_USED | OPT_NO_ROWS)) &&
|
|
|
|
!share->state.header.uniques)
|
|
|
|
if (!(init_io_cache(&info->rec_cache,info->dfile, cache_size,
|
|
|
|
WRITE_CACHE,info->state->data_file_length,
|
|
|
|
(pbool) (info->lock_type != F_UNLCK),
|
|
|
|
MYF(share->write_flag & MY_WAIT_IF_FULL))))
|
|
|
|
{
|
|
|
|
info->opt_flag|=WRITE_CACHE_USED;
|
|
|
|
info->update&= ~(HA_STATE_ROW_CHANGED |
|
|
|
|
HA_STATE_WRITE_AT_END |
|
|
|
|
HA_STATE_EXTEND_BLOCK);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_PREPARE_FOR_UPDATE:
|
|
|
|
if (info->s->data_file_type != DYNAMIC_RECORD)
|
|
|
|
break;
|
|
|
|
/* Remove read/write cache if dynamic rows */
|
|
|
|
case HA_EXTRA_NO_CACHE:
|
|
|
|
if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
|
|
|
|
{
|
|
|
|
info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
|
|
|
|
error=end_io_cache(&info->rec_cache);
|
|
|
|
/* Sergei will insert full text index caching here */
|
|
|
|
}
|
|
|
|
#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)
|
|
|
|
if (info->opt_flag & MEMMAP_USED)
|
|
|
|
madvise(share->file_map,share->state.state.data_file_length,MADV_RANDOM);
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_FLUSH_CACHE:
|
|
|
|
if (info->opt_flag & WRITE_CACHE_USED)
|
|
|
|
{
|
|
|
|
if ((error=flush_io_cache(&info->rec_cache)))
|
|
|
|
{
|
|
|
|
maria_print_error(info->s, HA_ERR_CRASHED);
|
|
|
|
maria_mark_crashed(info); /* Fatal error found */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_NO_READCHECK:
|
|
|
|
info->opt_flag&= ~READ_CHECK_USED; /* No readcheck */
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_READCHECK:
|
|
|
|
info->opt_flag|= READ_CHECK_USED;
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_KEYREAD: /* Read only keys to record */
|
|
|
|
case HA_EXTRA_REMEMBER_POS:
|
|
|
|
info->opt_flag |= REMEMBER_OLD_POS;
|
|
|
|
bmove((byte*) info->lastkey+share->base.max_key_length*2,
|
|
|
|
(byte*) info->lastkey,info->lastkey_length);
|
|
|
|
info->save_update= info->update;
|
|
|
|
info->save_lastinx= info->lastinx;
|
2007-01-18 20:38:14 +01:00
|
|
|
info->save_lastpos= info->cur_row.lastpos;
|
2006-04-11 15:45:10 +02:00
|
|
|
info->save_lastkey_length=info->lastkey_length;
|
|
|
|
if (function == HA_EXTRA_REMEMBER_POS)
|
|
|
|
break;
|
|
|
|
/* fall through */
|
|
|
|
case HA_EXTRA_KEYREAD_CHANGE_POS:
|
|
|
|
info->opt_flag |= KEY_READ_USED;
|
|
|
|
info->read_record= _ma_read_key_record;
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_NO_KEYREAD:
|
|
|
|
case HA_EXTRA_RESTORE_POS:
|
|
|
|
if (info->opt_flag & REMEMBER_OLD_POS)
|
|
|
|
{
|
|
|
|
bmove((byte*) info->lastkey,
|
|
|
|
(byte*) info->lastkey+share->base.max_key_length*2,
|
|
|
|
info->save_lastkey_length);
|
|
|
|
info->update= info->save_update | HA_STATE_WRITTEN;
|
|
|
|
info->lastinx= info->save_lastinx;
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.lastpos= info->save_lastpos;
|
2006-04-11 15:45:10 +02:00
|
|
|
info->lastkey_length=info->save_lastkey_length;
|
|
|
|
}
|
|
|
|
info->read_record= share->read_record;
|
|
|
|
info->opt_flag&= ~(KEY_READ_USED | REMEMBER_OLD_POS);
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_NO_USER_CHANGE: /* Database is somehow locked agains changes */
|
|
|
|
info->lock_type= F_EXTRA_LCK; /* Simulate as locked */
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_WAIT_LOCK:
|
|
|
|
info->lock_wait=0;
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_NO_WAIT_LOCK:
|
|
|
|
info->lock_wait=MY_DONT_WAIT;
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_NO_KEYS:
|
|
|
|
if (info->lock_type == F_UNLCK)
|
|
|
|
{
|
|
|
|
error=1; /* Not possibly if not lock */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (maria_is_any_key_active(share->state.key_map))
|
|
|
|
{
|
|
|
|
MARIA_KEYDEF *key=share->keyinfo;
|
|
|
|
uint i;
|
|
|
|
for (i=0 ; i < share->base.keys ; i++,key++)
|
|
|
|
{
|
|
|
|
if (!(key->flag & HA_NOSAME) && info->s->base.auto_key != i+1)
|
|
|
|
{
|
|
|
|
maria_clear_key_active(share->state.key_map, i);
|
|
|
|
info->update|= HA_STATE_CHANGED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!share->changed)
|
|
|
|
{
|
|
|
|
share->state.changed|= STATE_CHANGED | STATE_NOT_ANALYZED;
|
|
|
|
share->changed=1; /* Update on close */
|
|
|
|
if (!share->global_changed)
|
|
|
|
{
|
|
|
|
share->global_changed=1;
|
|
|
|
share->state.open_count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
share->state.state= *info->state;
|
|
|
|
error=_ma_state_info_write(share->kfile,&share->state,1 | 2);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_FORCE_REOPEN:
|
|
|
|
pthread_mutex_lock(&THR_LOCK_maria);
|
|
|
|
share->last_version= 0L; /* Impossible version */
|
|
|
|
pthread_mutex_unlock(&THR_LOCK_maria);
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_PREPARE_FOR_DELETE:
|
|
|
|
pthread_mutex_lock(&THR_LOCK_maria);
|
|
|
|
share->last_version= 0L; /* Impossible version */
|
|
|
|
#ifdef __WIN__
|
|
|
|
/* Close the isam and data files as Win32 can't drop an open table */
|
|
|
|
pthread_mutex_lock(&share->intern_lock);
|
|
|
|
if (flush_key_blocks(share->key_cache, share->kfile,
|
|
|
|
(function == HA_EXTRA_FORCE_REOPEN ?
|
|
|
|
FLUSH_RELEASE : FLUSH_IGNORE_CHANGED)))
|
|
|
|
{
|
|
|
|
error=my_errno;
|
|
|
|
share->changed=1;
|
|
|
|
maria_print_error(info->s, HA_ERR_CRASHED);
|
|
|
|
maria_mark_crashed(info); /* Fatal error found */
|
|
|
|
}
|
|
|
|
if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
|
|
|
|
{
|
|
|
|
info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
|
|
|
|
error=end_io_cache(&info->rec_cache);
|
|
|
|
}
|
|
|
|
if (info->lock_type != F_UNLCK && ! info->was_locked)
|
|
|
|
{
|
|
|
|
info->was_locked=info->lock_type;
|
|
|
|
if (maria_lock_database(info,F_UNLCK))
|
|
|
|
error=my_errno;
|
|
|
|
info->lock_type = F_UNLCK;
|
|
|
|
}
|
|
|
|
if (share->kfile >= 0)
|
|
|
|
_ma_decrement_open_count(info);
|
|
|
|
if (share->kfile >= 0 && my_close(share->kfile,MYF(0)))
|
|
|
|
error=my_errno;
|
|
|
|
{
|
|
|
|
LIST *list_element ;
|
|
|
|
for (list_element=maria_open_list ;
|
|
|
|
list_element ;
|
|
|
|
list_element=list_element->next)
|
|
|
|
{
|
|
|
|
MARIA_HA *tmpinfo=(MARIA_HA*) list_element->data;
|
|
|
|
if (tmpinfo->s == info->s)
|
|
|
|
{
|
|
|
|
if (tmpinfo->dfile >= 0 && my_close(tmpinfo->dfile,MYF(0)))
|
|
|
|
error = my_errno;
|
|
|
|
tmpinfo->dfile= -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
share->kfile= -1; /* Files aren't open anymore */
|
|
|
|
pthread_mutex_unlock(&share->intern_lock);
|
|
|
|
#endif
|
|
|
|
pthread_mutex_unlock(&THR_LOCK_maria);
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_FLUSH:
|
|
|
|
if (!share->temporary)
|
|
|
|
flush_key_blocks(share->key_cache, share->kfile, FLUSH_KEEP);
|
|
|
|
#ifdef HAVE_PWRITE
|
|
|
|
_ma_decrement_open_count(info);
|
|
|
|
#endif
|
|
|
|
if (share->not_flushed)
|
|
|
|
{
|
|
|
|
share->not_flushed=0;
|
WL#3072 Maria Recovery. Making DDLs durable in Maria:
Sync table files after CREATE (of non-temp table), DROP, RENAME,
TRUNCATE, sync directories and symlinks (for the 3 first commands).
Comments for future log records.
In ma_rename(), if rename of index works and then rename of data fails,
try to undo the rename of the index to leave a consistent state.
mysys/my_symlink.c:
sync directory after creation of a symbolic link in it, if asked
mysys/my_sync.c:
comment. Fix for when the file's name has no directory in it.
storage/maria/ma_create.c:
sync files and links and dirs when creating a non-temporary table.
Optimizations of the above to reduce syncs in the common cases:
* if index file and data file have the exact same paths (regular
and link), sync the directories (of regular and link) only once
after creating the last file (the data file).
* don't sync the data file if we didn't write to it (always true
in our builds).
storage/maria/ma_delete_all.c:
sync files after truncating a table
storage/maria/ma_delete_table.c:
sync files and symbolic links and dirs after dropping a table
storage/maria/ma_extra.c:
a function which wraps the sync of the index file and the sync of the
data file.
storage/maria/ma_locking.c:
using a wrapper function
storage/maria/ma_rename.c:
sync files and symbolic links and dirs after renaming a table.
If rename of index works and then rename of data fails, try to undo
the rename of the index to leave a consistent state. That is just a
try, it may fail...
storage/maria/ma_test3.c:
warning to not pay attention to this test.
storage/maria/maria_def.h:
declaration for the function added to ma_extra.c
2006-11-27 22:01:29 +01:00
|
|
|
if (_ma_sync_table_files(info))
|
2006-04-11 15:45:10 +02:00
|
|
|
error= my_errno;
|
|
|
|
if (error)
|
|
|
|
{
|
|
|
|
share->changed=1;
|
|
|
|
maria_print_error(info->s, HA_ERR_CRASHED);
|
|
|
|
maria_mark_crashed(info); /* Fatal error found */
|
|
|
|
}
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
if (share->base.blobs && info->rec_buff_size >
|
|
|
|
share->base.default_rec_buff_size)
|
|
|
|
{
|
|
|
|
info->rec_buff_size= 1; /* Force realloc */
|
|
|
|
_ma_alloc_buffer(&info->rec_buff, &info->rec_buff_size,
|
|
|
|
share->base.default_rec_buff_size);
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
break;
|
|
|
|
case HA_EXTRA_NORMAL: /* Theese isn't in use */
|
|
|
|
info->quick_mode=0;
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_QUICK:
|
|
|
|
info->quick_mode=1;
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_NO_ROWS:
|
|
|
|
if (!share->state.header.uniques)
|
|
|
|
info->opt_flag|= OPT_NO_ROWS;
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_PRELOAD_BUFFER_SIZE:
|
|
|
|
info->preload_buff_size= *((ulong *) extra_arg);
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_CHANGE_KEY_TO_UNIQUE:
|
|
|
|
case HA_EXTRA_CHANGE_KEY_TO_DUP:
|
|
|
|
maria_extra_keyflag(info, function);
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_MMAP:
|
|
|
|
#ifdef HAVE_MMAP
|
|
|
|
pthread_mutex_lock(&share->intern_lock);
|
2007-03-01 18:23:58 +01:00
|
|
|
/*
|
|
|
|
Memory map the data file if it is not already mapped and if there
|
|
|
|
are no other threads using this table. intern_lock prevents other
|
|
|
|
threads from starting to use the table while we are mapping it.
|
|
|
|
*/
|
|
|
|
if (!share->file_map && (share->tot_locks == 1))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (_ma_dynmap_file(info, share->state.state.data_file_length))
|
|
|
|
{
|
|
|
|
DBUG_PRINT("warning",("mmap failed: errno: %d",errno));
|
|
|
|
error= my_errno= errno;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
share->file_read= _ma_mmap_pread;
|
|
|
|
share->file_write= _ma_mmap_pwrite;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&share->intern_lock);
|
|
|
|
#endif
|
|
|
|
break;
|
2006-09-07 17:07:17 +02:00
|
|
|
case HA_EXTRA_MARK_AS_LOG_TABLE:
|
|
|
|
pthread_mutex_lock(&share->intern_lock);
|
|
|
|
share->is_log_table= TRUE;
|
|
|
|
pthread_mutex_unlock(&share->intern_lock);
|
|
|
|
break;
|
2006-04-11 15:45:10 +02:00
|
|
|
case HA_EXTRA_KEY_CACHE:
|
|
|
|
case HA_EXTRA_NO_KEY_CACHE:
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
{
|
|
|
|
char tmp[1];
|
|
|
|
tmp[0]=function;
|
|
|
|
}
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
} /* maria_extra */
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Start/Stop Inserting Duplicates Into a Table, WL#1648.
|
|
|
|
*/
|
|
|
|
static void maria_extra_keyflag(MARIA_HA *info, enum ha_extra_function function)
|
|
|
|
{
|
|
|
|
uint idx;
|
|
|
|
|
|
|
|
for (idx= 0; idx< info->s->base.keys; idx++)
|
|
|
|
{
|
|
|
|
switch (function) {
|
|
|
|
case HA_EXTRA_CHANGE_KEY_TO_UNIQUE:
|
|
|
|
info->s->keyinfo[idx].flag|= HA_NOSAME;
|
|
|
|
break;
|
|
|
|
case HA_EXTRA_CHANGE_KEY_TO_DUP:
|
|
|
|
info->s->keyinfo[idx].flag&= ~(HA_NOSAME);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
|
|
|
|
|
|
|
|
int maria_reset(MARIA_HA *info)
|
|
|
|
{
|
|
|
|
int error= 0;
|
|
|
|
MARIA_SHARE *share=info->s;
|
|
|
|
DBUG_ENTER("maria_reset");
|
|
|
|
/*
|
|
|
|
Free buffers and reset the following flags:
|
|
|
|
EXTRA_CACHE, EXTRA_WRITE_CACHE, EXTRA_KEYREAD, EXTRA_QUICK
|
|
|
|
|
|
|
|
If the row buffer cache is large (for dynamic tables), reduce it
|
|
|
|
to save memory.
|
|
|
|
*/
|
|
|
|
if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
|
|
|
|
{
|
|
|
|
info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
|
|
|
|
error= end_io_cache(&info->rec_cache);
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
if (share->base.blobs && info->rec_buff_size >
|
|
|
|
share->base.default_rec_buff_size)
|
|
|
|
{
|
|
|
|
info->rec_buff_size= 1; /* Force realloc */
|
|
|
|
_ma_alloc_buffer(&info->rec_buff, &info->rec_buff_size,
|
|
|
|
share->base.default_rec_buff_size);
|
|
|
|
}
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)
|
|
|
|
if (info->opt_flag & MEMMAP_USED)
|
|
|
|
madvise(share->file_map,share->state.state.data_file_length,MADV_RANDOM);
|
|
|
|
#endif
|
|
|
|
info->opt_flag&= ~(KEY_READ_USED | REMEMBER_OLD_POS);
|
|
|
|
info->quick_mode=0;
|
|
|
|
info->lastinx= 0; /* Use first index as def */
|
2007-01-18 20:38:14 +01:00
|
|
|
info->last_search_keypage= info->cur_row.lastpos= HA_OFFSET_ERROR;
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
info->page_changed= 1;
|
|
|
|
info->update= ((info->update & HA_STATE_CHANGED) | HA_STATE_NEXT_FOUND |
|
|
|
|
HA_STATE_PREV_FOUND);
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
WL#3072 Maria Recovery. Making DDLs durable in Maria:
Sync table files after CREATE (of non-temp table), DROP, RENAME,
TRUNCATE, sync directories and symlinks (for the 3 first commands).
Comments for future log records.
In ma_rename(), if rename of index works and then rename of data fails,
try to undo the rename of the index to leave a consistent state.
mysys/my_symlink.c:
sync directory after creation of a symbolic link in it, if asked
mysys/my_sync.c:
comment. Fix for when the file's name has no directory in it.
storage/maria/ma_create.c:
sync files and links and dirs when creating a non-temporary table.
Optimizations of the above to reduce syncs in the common cases:
* if index file and data file have the exact same paths (regular
and link), sync the directories (of regular and link) only once
after creating the last file (the data file).
* don't sync the data file if we didn't write to it (always true
in our builds).
storage/maria/ma_delete_all.c:
sync files after truncating a table
storage/maria/ma_delete_table.c:
sync files and symbolic links and dirs after dropping a table
storage/maria/ma_extra.c:
a function which wraps the sync of the index file and the sync of the
data file.
storage/maria/ma_locking.c:
using a wrapper function
storage/maria/ma_rename.c:
sync files and symbolic links and dirs after renaming a table.
If rename of index works and then rename of data fails, try to undo
the rename of the index to leave a consistent state. That is just a
try, it may fail...
storage/maria/ma_test3.c:
warning to not pay attention to this test.
storage/maria/maria_def.h:
declaration for the function added to ma_extra.c
2006-11-27 22:01:29 +01:00
|
|
|
|
|
|
|
|
|
|
|
int _ma_sync_table_files(const MARIA_HA *info)
|
|
|
|
{
|
|
|
|
return (my_sync(info->dfile, MYF(0)) ||
|
|
|
|
my_sync(info->s->kfile, MYF(0)));
|
|
|
|
}
|