mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
09a53f28a7
Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() BUILD/compile-solaris-sparc-forte: Updated script to current Solaris installations Now we compile by default for 64 bits client/mysql.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysql_upgrade.c: Fixed compiler warning (on Forte) client/mysqladmin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysqlcheck.c: Fixed compiler warning (on Forte) client/mysqldump.c: Fixed compiler warning (on Forte) client/mysqlslap.c: Fixed compiler warning (on Forte) client/mysqltest.c: Fixed compiler warning (on Forte) client/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ configure.in: Added detection of mtmalloc and ieeefp.h extra/replace.c: Fixed compiler warning (on Forte) include/m_ctype.h: Added some typedef's to make it easy to use C function pointers in C++ include/my_sys.h: Added my_file_total_opened (counter for calls to my_open()) include/myisam.h: Fixed compiler warning (on Forte) libmysql/libmysql.c: Fixed compiler warning (on Forte) by adding casts and change types libmysql/manager.c: Fixed compiler warning (on Forte) by adding casts and change types mysql-test/r/ctype_cp932_binlog_stm.result: Updated positions (Needed because we didn't before correctly restore collation_database after running stored procedure mysys/my_fopen.c: Count number of opened files mysys/my_open.c: Count number of opened files mysys/my_static.c: Count number of opened files mysys/thr_alarm.c: Optimization to do less alarm() and pthread_sigmask() calls. Idea is to remember time for next pending alarm and not reschedule a new alarm if it's after the current one. Before we only did this if there was other pending alarms. We don't have to use pthread_sigmask() in case of 'USE_ONE_SIGNAL_HAND' as the alarm() signal will be blocked for the calling thread anyway and no other thread will have the alarm() signal enabled to call process_alarm() regex/regcomp.c: Fixed compiler warning (on Forte) by adding casts and change types scripts/mysql_install_db.sh: Added option --source-install to allow one to create a mysql database from the source tree without installing MySQL Don't give (unnecessary) warnings server-tools/instance-manager/angel.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) server-tools/instance-manager/thread_registry.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/event_db_repository.cc: index_read() -> index_read_map() sql/event_queue.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/field.cc: Fixed compiler warnings about hidden fields sql/ha_partition.cc: Fixed compiler warnings about hidden fields index_read() -> index_read_map() sql/ha_partition.h: index_read() -> index_read_map() sql/handler.cc: Added PAGE option to row types (to prepare for future) index_read() -> index_read_map() sql/handler.h: Added ROW_TYPE_PAGE (for future) Added flag to signal if table was to be created transactionally I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() sql/item.cc: Fixed indentation Renamed local variable to avoid hiding class variable sql/item_cmpfunc.cc: Renamed local variable to avoid hiding class variable sql/item_cmpfunc.h: Removed not used variable sql/item_func.cc: Renamed local variable to avoid hiding class variable sql/item_strfunc.cc: Moved functions from Item_strfunc.cc sql/item_strfunc.h: Move functions to item_strfunc.cc Use C function pointer type to avoid compiler warnings (with Forte) sql/item_subselect.cc: index_read() -> index_read_map() sql/item_xmlfunc.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/key.cc: Fixed indentation sql/log.cc: Renamed local variable to avoid hiding class variable sql/log_event.cc: Removed call to my_time() when creating class instance of Log_event() as this may have static instances. (One can't call my_time() before my_init()) index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/log_event_old.cc: Renamed local variable to avoid hiding class variable sql/mysql_priv.h: Made all create_backup_ctx() declarations identical. This lifted up a bug where wrong create_backup_ctx() was called in some cases. Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/mysqld.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Fixed indentation Don't call end_thr_alarm() when calling unireg_abort() as unireg_abort() already calls end_thr_alarm() Added variable 'Opened_files' (number of calls to my_open() or my_fopen()) Don't print 'loose' warnings when using --bootstrap (to avoid warnings when running mysql_install_db) Fixed compiler warnings sql/opt_range.cc: index_read() -> index_read_map() sql/opt_sum.cc: index_read() -> index_read_map() sql/partition_info.cc: Renamed local variable to avoid hiding class variable sql/rpl_filter.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/set_var.cc: Renamed local variable to avoid hiding class variable Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/set_var.h: Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/sp.cc: More debugging index_read() -> index_read_map() sql/sp_cache.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sp_head.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Moved 'saved_creation_ctx' higher up to be able to free objects allocated by create_backup_ctx() sql/sql_acl.cc: index_read() -> index_read_map() sql/sql_class.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_class.h: Renamed local variable to avoid hiding class variable sql/sql_db.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_delete.cc: Renamed local variable to avoid hiding class variable sql/sql_handler.cc: index_read() -> index_read_map() sql/sql_help.cc: index_read() -> index_read_map() sql/sql_insert.cc: index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/sql_lex.cc: Renamed local variable to avoid hiding class variable sql/sql_plugin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) index_read() -> index_read_map() Don't give warnings about not used plugins if we are using --warnings=0 sql/sql_select.cc: index_read() -> index_read_map() sql-common/client.c: Fixed compiler warning (on Forte) sql-common/my_time.c: Removed never accessed code Fixed compiler warning (on Forte) sql/sql_servers.cc: index_read() -> index_read_map() sql/sql_show.cc: Added TRANSACTIONAL to SHOW CREATE Fixed ROW_TYPE_PAGE sql/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ sql/sql_table.cc: Set create_info->transactional if we used TRANSACTIONAL=1 sql/sql_udf.cc: index_read() -> index_read_map() sql/sql_yacc.yy: Added TRANSACTIONAL=0|1 to CREATE (for future) Added row type PAGE (was only partionally handled before) sql/strfunc.cc: Avoid compiler warnings when using C function pointers in C++ sql/table.cc: More DBUG statements Declare all create_backup_ctx() functions identically Remember if table was created with TRANSACTIONAL flag or not (future safe) Renamed local variable to avoid hiding class variable sql/table.h: Remember if table was created with TRANSACTIONAL=1 sql/tztime.cc: index_read() -> index_read_map() sql-common/pack.c: Fixed compiler warning (on Forte) storage/archive/archive_reader.c: Fixed compiler warning (on Forte) storage/archive/azio.c: Fixed compiler warning (on Forte) storage/blackhole/ha_blackhole.cc: index_read() -> index_read_map() storage/blackhole/ha_blackhole.h: index_read() -> index_read_map() storage/csv/ha_tina.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) storage/example/ha_example.cc: index_read() -> index_read_map() storage/example/ha_example.h: index_read() -> index_read_map() storage/heap/ha_heap.cc: index_read() -> index_read_map() storage/heap/ha_heap.h: index_read() -> index_read_map() storage/heap/hp_test1.c: Fixed compiler warning (on Forte) storage/heap/hp_test2.c: Fixed compiler warning (on Forte) storage/myisam/ft_boolean_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_nlq_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_parser.c: Fixed compiler warning (on Forte) storage/myisam/ft_stopwords.c: Fixed compiler warning (on Forte) storage/myisam/ha_myisam.cc: index_read() -> index_read_map() storage/myisam/ha_myisam.h: index_read() -> index_read_map() storage/myisam/mi_check.c: Fixed compiler warning (on Forte) storage/myisam/mi_delete.c: Fixed compiler warning (on Forte) storage/myisam/mi_dynrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_extra.c: Fixed compiler warning (on Forte) storage/myisam/mi_key.c: Fixed compiler warning (on Forte) storage/myisam/mi_keycache.c: Fixed compiler warning (on Forte) storage/myisam/mi_locking.c: Fixed compiler warning (on Forte) storage/myisam/mi_log.c: Fixed compiler warning (on Forte) storage/myisam/mi_open.c: Fixed compiler warning (on Forte) storage/myisam/mi_packrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_page.c: Fixed compiler warning (on Forte) storage/myisam/mi_rkey.c: Added comment storage/myisam/mi_search.c: Fixed compiler warning (on Forte) storage/myisam/mi_statrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_test1.c: Fixed compiler warning (on Forte) storage/myisam/mi_test2.c: Fixed compiler warning (on Forte) storage/myisam/mi_test3.c: Fixed compiler warning (on Forte) storage/myisam/mi_update.c: Fixed compiler warning (on Forte) storage/myisam/mi_write.c: Fixed compiler warning (on Forte) storage/myisam/myisamdef.h: Fixed that file_read/file_write returns type size_t Changed some functions to use uchar * as argument/return value instead of char* This fixed some compiler warnings on Forte storage/myisam/myisamlog.c: Fixed compiler warning (on Forte) storage/myisam/myisampack.c: Fixed compiler warning (on Forte) storage/myisam/rt_test.c: Fixed compiler warning (on Forte) storage/myisam/sort.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisam/sp_test.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisammrg/ha_myisammrg.cc: index_read() -> index_read_map() storage/myisammrg/ha_myisammrg.h: index_read() -> index_read_map() storage/myisammrg/myrg_create.c: Fixed compiler warning (on Forte) by adding casts or changing variable types storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Tdummy -> align (as in other part of cluster code) storage/ndb/src/kernel/vm/DynArr256.cpp: Removed not used variable storage/ndb/src/ndbapi/Ndb.cpp: Removed not used variable strings/strtod.c: Include ieeefp.h to avoid compiler warning tests/bug25714.c: Fixed compiler warning tests/mysql_client_test.c: Remove not used variable Fixed indentation Removed never reached code Fixed compiler warning (on Forte) by adding casts or changing variable types vio/viosocket.c: Fixed compiler warning (on Forte) by adding casts or changing variable types
160 lines
4.9 KiB
C
160 lines
4.9 KiB
C
/* Copyright (C) 2000-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 */
|
|
|
|
/* Read and write key blocks */
|
|
|
|
#include "myisamdef.h"
|
|
|
|
/* Fetch a key-page in memory */
|
|
|
|
uchar *_mi_fetch_keypage(register MI_INFO *info, MI_KEYDEF *keyinfo,
|
|
my_off_t page, int level,
|
|
uchar *buff, int return_buffer)
|
|
{
|
|
uchar *tmp;
|
|
uint page_size;
|
|
DBUG_ENTER("_mi_fetch_keypage");
|
|
DBUG_PRINT("enter",("page: %ld", (long) page));
|
|
|
|
tmp=(uchar*) key_cache_read(info->s->key_cache,
|
|
info->s->kfile, page, level, (uchar*) buff,
|
|
(uint) keyinfo->block_length,
|
|
(uint) keyinfo->block_length,
|
|
return_buffer);
|
|
if (tmp == info->buff)
|
|
info->buff_used=1;
|
|
else if (!tmp)
|
|
{
|
|
DBUG_PRINT("error",("Got errno: %d from key_cache_read",my_errno));
|
|
info->last_keypage=HA_OFFSET_ERROR;
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
my_errno=HA_ERR_CRASHED;
|
|
DBUG_RETURN(0);
|
|
}
|
|
info->last_keypage=page;
|
|
page_size=mi_getint(tmp);
|
|
if (page_size < 4 || page_size > keyinfo->block_length)
|
|
{
|
|
DBUG_PRINT("error",("page %lu had wrong page length: %u",
|
|
(ulong) page, page_size));
|
|
DBUG_DUMP("page", (char*) tmp, keyinfo->block_length);
|
|
info->last_keypage = HA_OFFSET_ERROR;
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
my_errno = HA_ERR_CRASHED;
|
|
tmp = 0;
|
|
}
|
|
DBUG_RETURN(tmp);
|
|
} /* _mi_fetch_keypage */
|
|
|
|
|
|
/* Write a key-page on disk */
|
|
|
|
int _mi_write_keypage(register MI_INFO *info, register MI_KEYDEF *keyinfo,
|
|
my_off_t page, int level, uchar *buff)
|
|
{
|
|
reg3 uint length;
|
|
DBUG_ENTER("_mi_write_keypage");
|
|
|
|
#ifndef FAST /* Safety check */
|
|
if (page < info->s->base.keystart ||
|
|
page+keyinfo->block_length > info->state->key_file_length ||
|
|
(page & (MI_MIN_KEY_BLOCK_LENGTH-1)))
|
|
{
|
|
DBUG_PRINT("error",("Trying to write inside key status region: key_start: %lu length: %lu page: %lu",
|
|
(long) info->s->base.keystart,
|
|
(long) info->state->key_file_length,
|
|
(long) page));
|
|
my_errno=EINVAL;
|
|
DBUG_RETURN((-1));
|
|
}
|
|
DBUG_PRINT("page",("write page at: %lu",(long) page));
|
|
DBUG_DUMP("buff",(uchar*) buff,mi_getint(buff));
|
|
#endif
|
|
|
|
if ((length=keyinfo->block_length) > IO_SIZE*2 &&
|
|
info->state->key_file_length != page+length)
|
|
length= ((mi_getint(buff)+IO_SIZE-1) & (uint) ~(IO_SIZE-1));
|
|
#ifdef HAVE_purify
|
|
{
|
|
length=mi_getint(buff);
|
|
bzero((uchar*) buff+length,keyinfo->block_length-length);
|
|
length=keyinfo->block_length;
|
|
}
|
|
#endif
|
|
DBUG_RETURN((key_cache_write(info->s->key_cache,
|
|
info->s->kfile,page, level, (uchar*) buff,length,
|
|
(uint) keyinfo->block_length,
|
|
(int) ((info->lock_type != F_UNLCK) ||
|
|
info->s->delay_key_write))));
|
|
} /* mi_write_keypage */
|
|
|
|
|
|
/* Remove page from disk */
|
|
|
|
int _mi_dispose(register MI_INFO *info, MI_KEYDEF *keyinfo, my_off_t pos,
|
|
int level)
|
|
{
|
|
my_off_t old_link;
|
|
uchar buff[8];
|
|
DBUG_ENTER("_mi_dispose");
|
|
DBUG_PRINT("enter",("pos: %ld", (long) pos));
|
|
|
|
old_link= info->s->state.key_del[keyinfo->block_size_index];
|
|
info->s->state.key_del[keyinfo->block_size_index]= pos;
|
|
mi_sizestore(buff,old_link);
|
|
info->s->state.changed|= STATE_NOT_SORTED_PAGES;
|
|
DBUG_RETURN(key_cache_write(info->s->key_cache,
|
|
info->s->kfile, pos , level, buff,
|
|
sizeof(buff),
|
|
(uint) keyinfo->block_length,
|
|
(int) (info->lock_type != F_UNLCK)));
|
|
} /* _mi_dispose */
|
|
|
|
|
|
/* Make new page on disk */
|
|
|
|
my_off_t _mi_new(register MI_INFO *info, MI_KEYDEF *keyinfo, int level)
|
|
{
|
|
my_off_t pos;
|
|
uchar buff[8];
|
|
DBUG_ENTER("_mi_new");
|
|
|
|
if ((pos= info->s->state.key_del[keyinfo->block_size_index]) ==
|
|
HA_OFFSET_ERROR)
|
|
{
|
|
if (info->state->key_file_length >=
|
|
info->s->base.max_key_file_length - keyinfo->block_length)
|
|
{
|
|
my_errno=HA_ERR_INDEX_FILE_FULL;
|
|
DBUG_RETURN(HA_OFFSET_ERROR);
|
|
}
|
|
pos=info->state->key_file_length;
|
|
info->state->key_file_length+= keyinfo->block_length;
|
|
}
|
|
else
|
|
{
|
|
if (!key_cache_read(info->s->key_cache,
|
|
info->s->kfile, pos, level,
|
|
buff,
|
|
(uint) sizeof(buff),
|
|
(uint) keyinfo->block_length,0))
|
|
pos= HA_OFFSET_ERROR;
|
|
else
|
|
info->s->state.key_del[keyinfo->block_size_index]= mi_sizekorr(buff);
|
|
}
|
|
info->s->state.changed|= STATE_NOT_SORTED_PAGES;
|
|
DBUG_PRINT("exit",("Pos: %ld",(long) pos));
|
|
DBUG_RETURN(pos);
|
|
} /* _mi_new */
|