mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +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
243 lines
7.2 KiB
C
243 lines
7.2 KiB
C
/* Copyright (C) 2000-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 */
|
|
|
|
/* Update an old row in a MyISAM table */
|
|
|
|
#include "fulltext.h"
|
|
#include "rt_index.h"
|
|
|
|
int mi_update(register MI_INFO *info, const uchar *oldrec, uchar *newrec)
|
|
{
|
|
int flag,key_changed,save_errno;
|
|
reg3 my_off_t pos;
|
|
uint i;
|
|
uchar old_key[MI_MAX_KEY_BUFF],*new_key;
|
|
bool auto_key_changed=0;
|
|
ulonglong changed;
|
|
MYISAM_SHARE *share=info->s;
|
|
ha_checksum old_checksum;
|
|
DBUG_ENTER("mi_update");
|
|
LINT_INIT(new_key);
|
|
LINT_INIT(changed);
|
|
LINT_INIT(old_checksum);
|
|
|
|
DBUG_EXECUTE_IF("myisam_pretend_crashed_table_on_usage",
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
DBUG_RETURN(my_errno= HA_ERR_CRASHED););
|
|
if (!(info->update & HA_STATE_AKTIV))
|
|
{
|
|
DBUG_RETURN(my_errno=HA_ERR_KEY_NOT_FOUND);
|
|
}
|
|
if (share->options & HA_OPTION_READ_ONLY_DATA)
|
|
{
|
|
DBUG_RETURN(my_errno=EACCES);
|
|
}
|
|
if (info->state->key_file_length >= share->base.margin_key_file_length)
|
|
{
|
|
DBUG_RETURN(my_errno=HA_ERR_INDEX_FILE_FULL);
|
|
}
|
|
pos=info->lastpos;
|
|
if (_mi_readinfo(info,F_WRLCK,1))
|
|
DBUG_RETURN(my_errno);
|
|
|
|
if (share->calc_checksum)
|
|
old_checksum=info->checksum=(*share->calc_checksum)(info,oldrec);
|
|
if ((*share->compare_record)(info,oldrec))
|
|
{
|
|
save_errno=my_errno;
|
|
goto err_end; /* Record has changed */
|
|
}
|
|
|
|
|
|
/* Calculate and check all unique constraints */
|
|
key_changed=0;
|
|
for (i=0 ; i < share->state.header.uniques ; i++)
|
|
{
|
|
MI_UNIQUEDEF *def=share->uniqueinfo+i;
|
|
if (mi_unique_comp(def, newrec, oldrec,1) &&
|
|
mi_check_unique(info, def, newrec, mi_unique_hash(def, newrec),
|
|
info->lastpos))
|
|
{
|
|
save_errno=my_errno;
|
|
goto err_end;
|
|
}
|
|
}
|
|
if (_mi_mark_file_changed(info))
|
|
{
|
|
save_errno=my_errno;
|
|
goto err_end;
|
|
}
|
|
|
|
/* Check which keys changed from the original row */
|
|
|
|
new_key=info->lastkey2;
|
|
changed=0;
|
|
for (i=0 ; i < share->base.keys ; i++)
|
|
{
|
|
if (mi_is_key_active(share->state.key_map, i))
|
|
{
|
|
if (share->keyinfo[i].flag & HA_FULLTEXT )
|
|
{
|
|
if (_mi_ft_cmp(info,i,oldrec, newrec))
|
|
{
|
|
if ((int) i == info->lastinx)
|
|
{
|
|
/*
|
|
We are changeing the index we are reading on. Mark that
|
|
the index data has changed and we need to do a full search
|
|
when doing read-next
|
|
*/
|
|
key_changed|=HA_STATE_WRITTEN;
|
|
}
|
|
changed|=((ulonglong) 1 << i);
|
|
if (_mi_ft_update(info,i, old_key,oldrec,newrec,pos))
|
|
goto err;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
uint new_length=_mi_make_key(info,i,new_key,newrec,pos);
|
|
uint old_length=_mi_make_key(info,i,old_key,oldrec,pos);
|
|
|
|
/* The above changed info->lastkey2. Inform mi_rnext_same(). */
|
|
info->update&= ~HA_STATE_RNEXT_SAME;
|
|
|
|
if (new_length != old_length ||
|
|
memcmp((uchar*) old_key,(uchar*) new_key,new_length))
|
|
{
|
|
if ((int) i == info->lastinx)
|
|
key_changed|=HA_STATE_WRITTEN; /* Mark that keyfile changed */
|
|
changed|=((ulonglong) 1 << i);
|
|
share->keyinfo[i].version++;
|
|
if (share->keyinfo[i].ck_delete(info,i,old_key,old_length)) goto err;
|
|
if (share->keyinfo[i].ck_insert(info,i,new_key,new_length)) goto err;
|
|
if (share->base.auto_key == i+1)
|
|
auto_key_changed=1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
/*
|
|
If we are running with external locking, we must update the index file
|
|
that something has changed.
|
|
*/
|
|
if (changed || !my_disable_locking)
|
|
key_changed|= HA_STATE_CHANGED;
|
|
|
|
if (share->calc_checksum)
|
|
{
|
|
info->checksum=(*share->calc_checksum)(info,newrec);
|
|
/* Store new checksum in index file header */
|
|
key_changed|= HA_STATE_CHANGED;
|
|
}
|
|
{
|
|
/*
|
|
Don't update index file if data file is not extended and no status
|
|
information changed
|
|
*/
|
|
MI_STATUS_INFO state;
|
|
ha_rows org_split;
|
|
my_off_t org_delete_link;
|
|
|
|
memcpy((char*) &state, (char*) info->state, sizeof(state));
|
|
org_split= share->state.split;
|
|
org_delete_link= share->state.dellink;
|
|
if ((*share->update_record)(info,pos,newrec))
|
|
goto err;
|
|
if (!key_changed &&
|
|
(memcmp((char*) &state, (char*) info->state, sizeof(state)) ||
|
|
org_split != share->state.split ||
|
|
org_delete_link != share->state.dellink))
|
|
key_changed|= HA_STATE_CHANGED; /* Must update index file */
|
|
}
|
|
if (auto_key_changed)
|
|
set_if_bigger(info->s->state.auto_increment,
|
|
retrieve_auto_increment(info, newrec));
|
|
if (share->calc_checksum)
|
|
info->state->checksum+=(info->checksum - old_checksum);
|
|
|
|
info->update= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED | HA_STATE_AKTIV |
|
|
key_changed);
|
|
myisam_log_record(MI_LOG_UPDATE,info,newrec,info->lastpos,0);
|
|
/*
|
|
Every myisam function that updates myisam table must end with
|
|
call to _mi_writeinfo(). If operation (second param of
|
|
_mi_writeinfo()) is not 0 it sets share->changed to 1, that is
|
|
flags that data has changed. If operation is 0, this function
|
|
equals to no-op in this case.
|
|
|
|
mi_update() must always pass !0 value as operation, since even if
|
|
there is no index change there could be data change.
|
|
*/
|
|
VOID(_mi_writeinfo(info, WRITEINFO_UPDATE_KEYFILE));
|
|
allow_break(); /* Allow SIGHUP & SIGINT */
|
|
if (info->invalidator != 0)
|
|
{
|
|
DBUG_PRINT("info", ("invalidator... '%s' (update)", info->filename));
|
|
(*info->invalidator)(info->filename);
|
|
info->invalidator=0;
|
|
}
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
DBUG_PRINT("error",("key: %d errno: %d",i,my_errno));
|
|
save_errno=my_errno;
|
|
if (changed)
|
|
key_changed|= HA_STATE_CHANGED;
|
|
if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_OUT_OF_MEM ||
|
|
my_errno == HA_ERR_RECORD_FILE_FULL)
|
|
{
|
|
info->errkey= (int) i;
|
|
flag=0;
|
|
do
|
|
{
|
|
if (((ulonglong) 1 << i) & changed)
|
|
{
|
|
if (share->keyinfo[i].flag & HA_FULLTEXT)
|
|
{
|
|
if ((flag++ && _mi_ft_del(info,i, new_key,newrec,pos)) ||
|
|
_mi_ft_add(info,i, old_key,oldrec,pos))
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
uint new_length=_mi_make_key(info,i,new_key,newrec,pos);
|
|
uint old_length= _mi_make_key(info,i,old_key,oldrec,pos);
|
|
if ((flag++ && _mi_ck_delete(info,i,new_key,new_length)) ||
|
|
_mi_ck_write(info,i,old_key,old_length))
|
|
break;
|
|
}
|
|
}
|
|
} while (i-- != 0);
|
|
}
|
|
else
|
|
{
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
mi_mark_crashed(info);
|
|
}
|
|
info->update= (HA_STATE_CHANGED | HA_STATE_AKTIV | HA_STATE_ROW_CHANGED |
|
|
key_changed);
|
|
|
|
err_end:
|
|
myisam_log_record(MI_LOG_UPDATE,info,newrec,info->lastpos,my_errno);
|
|
VOID(_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE));
|
|
allow_break(); /* Allow SIGHUP & SIGINT */
|
|
if (save_errno == HA_ERR_KEY_NOT_FOUND)
|
|
{
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
save_errno=HA_ERR_CRASHED;
|
|
}
|
|
DBUG_RETURN(my_errno=save_errno);
|
|
} /* mi_update */
|