mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
bec3feaa0b
Changed my_error() to print error messages, which come from arbitrary registered ranges of error messages. Messages can be unregistered (and should be at end of the program). Added registration of handler error messages. Added a new mi_print_error() macro and a new mi_report_error() function, which supply error messages with a table name. Added calls to mi_print_error() or mi_report_error() at all places in MyISAM, where table corruption is detected. extra/comp_err.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added prints for ER_ERROR_FIRST and ER_ERROR_LAST. Removed print for ER_ERROR_MESSAGES. include/errmsg.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Added declaration for a new function. Added first and last error number defines. include/my_base.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Added first and last error number defines. include/my_sys.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Removed obsolete defines. Removed a global variable, which held pointers to the error message arrays. Added declarations for new functions. include/mysys_err.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Removed an obsolete define. Changed two defines to use the new defines. Added first and last error number defines. libmysql/errmsg.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Replaced global array initialization by proper registration and unregistration of client error messages. libmysql/libmysql.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added a call for unregistration of client error messages. myisam/mi_delete.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. Added a debugging call to pretend MyISAM corruption in case a special debug string is set. Added a debugging call to test undefined error numbers in case a special debug string is set. myisam/mi_extra.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_info.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added the error logging function. myisam/mi_key.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_keycache.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_locking.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_open.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. Added a debugging call to pretend MyISAM corruption in case a special debug string is set. myisam/mi_page.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_range.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_rkey.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_search.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_update.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. Added a debugging call to pretend MyISAM corruption in case a special debug string is set. myisam/mi_write.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. Added a debugging call to pretend MyISAM corruption in case a special debug string is set. myisam/myisamdef.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Added the declaration of the new error logging function and a new macro. mysql-test/r/merge.result: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed test results. These come from the changed error reporting in openfrm(). mysql-test/r/repair.result: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed test results. These come from the changed error reporting in openfrm(). mysql-test/t/merge.test: WL#1895 - Print message to error log in case of detected MyISAM corruption Changederror numbers. These come from the changed error reporting in openfrm(). mysys/errors.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Dropped the assignment of the global errors to the dropped global pointer array. mysys/my_error.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed my_error() from using a static array of pointers to error message arrays to using a linked list of structures with pointers to array message arrays. Added functions for registering and unregistering error message arrays to the chain. sql/derror.cc: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed reading of mysqld error messages to using the new registering and unregistering functions. sql/handler.cc: WL#1895 - Print message to error log in case of detected MyISAM corruption Added initialization and deinitialization of handler error messages. Included more handler error messages in the mapping to mysqld error messages. sql/mysqld.cc: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed deinitialization of error messages to proper unregistration. sql/table.cc: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed error reporting in openfrm() so that error messages from handler::ha_open() are reported by handler::print_error(). This changed messages from "Can't open 't1.MYI' (errno: 130)" to "Incorrect file format 't1'" for example. sql/unireg.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed two defines to use the new defines.
162 lines
5.2 KiB
C
162 lines
5.2 KiB
C
/* Copyright (C) 2003 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; 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 */
|
|
|
|
/*
|
|
Key cache assignments
|
|
*/
|
|
|
|
#include "myisamdef.h"
|
|
|
|
/*
|
|
Assign pages of the index file for a table to a key cache
|
|
|
|
SYNOPSIS
|
|
mi_assign_to_key_cache()
|
|
info open table
|
|
key_map map of indexes to assign to the key cache
|
|
key_cache_ptr pointer to the key cache handle
|
|
assign_lock Mutex to lock during assignment
|
|
|
|
PREREQUESTS
|
|
One must have a READ lock or a WRITE lock on the table when calling
|
|
the function to ensure that there is no other writers to it.
|
|
|
|
The caller must also ensure that one doesn't call this function from
|
|
two different threads with the same table.
|
|
|
|
NOTES
|
|
At present pages for all indexes must be assigned to the same key cache.
|
|
In future only pages for indexes specified in the key_map parameter
|
|
of the table will be assigned to the specified key cache.
|
|
|
|
RETURN VALUE
|
|
0 If a success
|
|
# Error code
|
|
*/
|
|
|
|
int mi_assign_to_key_cache(MI_INFO *info,
|
|
ulonglong key_map __attribute__((unused)),
|
|
KEY_CACHE *key_cache)
|
|
{
|
|
int error= 0;
|
|
MYISAM_SHARE* share= info->s;
|
|
DBUG_ENTER("mi_assign_to_key_cache");
|
|
DBUG_PRINT("enter",("old_key_cache_handle: %lx new_key_cache_handle: %lx",
|
|
share->key_cache, key_cache));
|
|
|
|
/*
|
|
Skip operation if we didn't change key cache. This can happen if we
|
|
call this for all open instances of the same table
|
|
*/
|
|
if (share->key_cache == key_cache)
|
|
DBUG_RETURN(0);
|
|
|
|
/*
|
|
First flush all blocks for the table in the old key cache.
|
|
This is to ensure that the disk is consistent with the data pages
|
|
in memory (which may not be the case if the table uses delayed_key_write)
|
|
|
|
Note that some other read thread may still fill in the key cache with
|
|
new blocks during this call and after, but this doesn't matter as
|
|
all threads will start using the new key cache for their next call to
|
|
myisam library and we know that there will not be any changed blocks
|
|
in the old key cache.
|
|
*/
|
|
|
|
if (flush_key_blocks(share->key_cache, share->kfile, FLUSH_RELEASE))
|
|
{
|
|
error= my_errno;
|
|
mi_print_error(info, HA_ERR_CRASHED);
|
|
mi_mark_crashed(info); /* Mark that table must be checked */
|
|
}
|
|
|
|
/*
|
|
Flush the new key cache for this file. This is needed to ensure
|
|
that there is no old blocks (with outdated data) left in the new key
|
|
cache from an earlier assign_to_keycache operation
|
|
|
|
(This can never fail as there is never any not written data in the
|
|
new key cache)
|
|
*/
|
|
(void) flush_key_blocks(key_cache, share->kfile, FLUSH_RELEASE);
|
|
|
|
/*
|
|
ensure that setting the key cache and changing the multi_key_cache
|
|
is done atomicly
|
|
*/
|
|
pthread_mutex_lock(&share->intern_lock);
|
|
/*
|
|
Tell all threads to use the new key cache
|
|
This should be seen at the lastes for the next call to an myisam function.
|
|
*/
|
|
share->key_cache= key_cache;
|
|
|
|
/* store the key cache in the global hash structure for future opens */
|
|
if (multi_key_cache_set(share->unique_file_name, share->unique_name_length,
|
|
share->key_cache))
|
|
error= my_errno;
|
|
pthread_mutex_unlock(&share->intern_lock);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Change all MyISAM entries that uses one key cache to another key cache
|
|
|
|
SYNOPSIS
|
|
mi_change_key_cache()
|
|
old_key_cache Old key cache
|
|
new_key_cache New key cache
|
|
|
|
NOTES
|
|
This is used when we delete one key cache.
|
|
|
|
To handle the case where some other threads tries to open an MyISAM
|
|
table associated with the to-be-deleted key cache while this operation
|
|
is running, we have to call 'multi_key_cache_change()' from this
|
|
function while we have a lock on the MyISAM table list structure.
|
|
|
|
This is safe as long as it's only MyISAM that is using this specific
|
|
key cache.
|
|
*/
|
|
|
|
|
|
void mi_change_key_cache(KEY_CACHE *old_key_cache,
|
|
KEY_CACHE *new_key_cache)
|
|
{
|
|
LIST *pos;
|
|
DBUG_ENTER("mi_change_key_cache");
|
|
|
|
/*
|
|
Lock list to ensure that no one can close the table while we manipulate it
|
|
*/
|
|
pthread_mutex_lock(&THR_LOCK_myisam);
|
|
for (pos=myisam_open_list ; pos ; pos=pos->next)
|
|
{
|
|
MI_INFO *info= (MI_INFO*) pos->data;
|
|
MYISAM_SHARE *share= info->s;
|
|
if (share->key_cache == old_key_cache)
|
|
mi_assign_to_key_cache(info, (ulonglong) ~0, new_key_cache);
|
|
}
|
|
|
|
/*
|
|
We have to do the following call while we have the lock on the
|
|
MyISAM list structure to ensure that another thread is not trying to
|
|
open a new table that will be associted with the old key cache
|
|
*/
|
|
multi_key_cache_change(old_key_cache, new_key_cache);
|
|
pthread_mutex_unlock(&THR_LOCK_myisam);
|
|
}
|