mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
9421f1dae9
Some simple optimzations, more comments and indentation changes. Add ` around database in 'use database' in binary log. Moved max_error_count and max_warning_count to variables struct. Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls. Changed string functions to use character set of first string argument as default return characterset (Each string function can change the above assumption if needed) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395: Auto merged BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31: Auto merged Docs/manual.texi: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged isam/isamlog.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/ft_dump.c: Auto merged myisam/ft_parser.c: Auto merged myisam/ft_static.c: Auto merged myisam/ft_test1.c: Auto merged myisam/ft_update.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_static.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_test2.c: Auto merged myisam/mi_test3.c: Auto merged myisam/mi_update.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged myisam/myisamlog.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/select_found.test: Auto merged mysql-test/t/union.test: Auto merged mysys/default.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/my_error.c: Auto merged mysys/my_init.c: Auto merged scripts/mysql_config.sh: Auto merged sql/convert.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/key.cc: Auto merged sql/log.cc: Auto merged sql/net_pkg.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged strings/Makefile.am: Auto merged strings/ctype-latin1_de.c: Auto merged strings/ctype-tis620.c: Auto merged tools/mysqlmanager.c: Auto merged BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997: merge with 4.0.3 BitKeeper/triggers/post-commit: merge with 4.0.3 client/mysql.cc: merge with 4.0.3 + simple optimsation client/mysqltest.c: merge with 4.0.3 (Indentation change) configure.in: merge with 4.0.3 extra/resolve_stack_dump.c: merge with 4.0.3 (Indentation change) include/Makefile.am: merge with 4.0.3 include/myisam.h: merge with 4.0.3 (Indentation change) include/mysql.h: merge with 4.0.3 (removed not used structure) include/mysqld_error.h: merge with 4.0.3 libmysql/Makefile.shared: merge with 4.0.3 libmysql/libmysql.c: merge with 4.0.3 (Indentation change) libmysqld/Makefile.am: merge with 4.0.3 myisam/ft_boolean_search.c: merge with 4.0.3 (Indentation change) myisam/ft_nlq_search.c: merge with 4.0.3 (Indentation change) myisam/mi_check.c: merge with 4.0.3 myisam/mi_search.c: merge with 4.0.3 myisam/mi_unique.c: merge with 4.0.3 mysys/Makefile.am: merge with 4.0.3 mysys/mf_casecnv.c: merge with 4.0.3 sql-bench/server-cfg.sh: Removed 8000 max row limit for Innodb sql/Makefile.am: merge with 4.0.3 sql/field.cc: Indentation cleanup Changed sprintf -> my_sprintf sql/field.h: merge with 4.0.3 sql/ha_heap.cc: merge with 4.0.3 (Indentation change) sql/item.h: merge with 4.0.3 (Indentation change) sql/item_cmpfunc.cc: merge with 4.0.3 sql/item_cmpfunc.h: Removed size_of() from items Indentation cleanup sql/item_create.cc: merge sql/item_create.h: merge sql/item_func.cc: Added comments Changed string functions to use character set of first string argument as default return characterset Simple optimizations. Removed return of uninitalized variable. sql/item_func.h: merge sql/item_strfunc.cc: merge with 4.0.3 (Indentation change) sql/item_strfunc.h: removed size_of() sql/item_uniq.h: removed size_of() sql/lex.h: merge with 4.0.3 (Indentation change) sql/log_event.cc: Add ` around database in 'use database' in binary log. sql/mysql_priv.h: merge with 4.0.3 sql/mysqld.cc: merge with 4.0.3 (Indentation change) sql/share/czech/errmsg.txt: merge sql/share/danish/errmsg.txt: merge sql/share/dutch/errmsg.txt: merge sql/share/english/errmsg.txt: merge sql/share/estonian/errmsg.txt: merge sql/share/french/errmsg.txt: merge sql/share/german/errmsg.txt: merge sql/share/greek/errmsg.txt: merge sql/share/hungarian/errmsg.txt: merge sql/share/italian/errmsg.txt: merge sql/share/japanese/errmsg.txt: merge sql/share/korean/errmsg.txt: merge sql/share/norwegian-ny/errmsg.txt: merge sql/share/norwegian/errmsg.txt: merge sql/share/polish/errmsg.txt: merge sql/share/portuguese/errmsg.txt: merge sql/share/romanian/errmsg.txt: merge sql/share/russian/errmsg.txt: merge sql/share/slovak/errmsg.txt: merge sql/share/spanish/errmsg.txt: merge sql/share/swedish/errmsg.txt: merge sql/share/ukrainian/errmsg.txt: merge sql/sql_acl.cc: merge with 4.0.3 sql/sql_base.cc: More comments Fixed bug in send_fields() when using convert sql/sql_class.cc: merge sql/sql_class.h: Merge with 4.0.3 Moved max_error_count and max_warning_count to variables struct. sql/sql_delete.cc: merge with 4.0.3 (Indentation change) sql/sql_lex.h: merge with 4.0.3 sql/sql_parse.cc: Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT. (Should be retrived from variables) sql/sql_select.cc: merge with 4.0.3 sql/sql_show.cc: merge with 4.0.3 sql/sql_union.cc: merge with 4.0.3 sql/sql_update.cc: merge with 4.0.3 sql/sql_yacc.yy: merge with 4.0.3 Indentation cleanup sql/structs.h: merge with 4.0.3 sql/table.cc: merge with 4.0.3 sql/table.h: merge with 4.0.3
432 lines
10 KiB
C
432 lines
10 KiB
C
/* Copyright (C) 2000 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 */
|
|
|
|
/* Functions to handle keys */
|
|
|
|
#include "myisamdef.h"
|
|
#include "m_ctype.h"
|
|
#include "sp_defs.h"
|
|
#ifdef HAVE_IEEEFP_H
|
|
#include <ieeefp.h>
|
|
#endif
|
|
|
|
#define CHECK_KEYS
|
|
|
|
static int _mi_put_key_in_record(MI_INFO *info,uint keynr,byte *record);
|
|
|
|
/*
|
|
** Make a intern key from a record
|
|
** Ret: Length of key
|
|
*/
|
|
|
|
uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
|
|
const byte *record, my_off_t filepos)
|
|
{
|
|
byte *pos,*end;
|
|
uchar *start;
|
|
reg1 HA_KEYSEG *keyseg;
|
|
DBUG_ENTER("_mi_make_key");
|
|
|
|
if(info->s->keyinfo[keynr].flag & HA_SPATIAL)
|
|
{
|
|
/*
|
|
TODO: nulls processing
|
|
*/
|
|
return sp_make_key(info,keynr,key,record,filepos);
|
|
}
|
|
|
|
start=key;
|
|
for (keyseg=info->s->keyinfo[keynr].seg ; keyseg->type ;keyseg++)
|
|
{
|
|
enum ha_base_keytype type=(enum ha_base_keytype) keyseg->type;
|
|
uint length=keyseg->length;
|
|
|
|
if (keyseg->null_bit)
|
|
{
|
|
if (record[keyseg->null_pos] & keyseg->null_bit)
|
|
{
|
|
*key++= 0; /* NULL in key */
|
|
continue;
|
|
}
|
|
*key++=1; /* Not NULL */
|
|
}
|
|
|
|
pos= (byte*) record+keyseg->start;
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
{
|
|
end=pos+length;
|
|
if (type != HA_KEYTYPE_NUM)
|
|
{
|
|
while (end > pos && end[-1] == ' ')
|
|
end--;
|
|
}
|
|
else
|
|
{
|
|
while (pos < end && pos[0] == ' ')
|
|
pos++;
|
|
}
|
|
length=(uint) (end-pos);
|
|
store_key_length_inc(key,length);
|
|
memcpy((byte*) key,(byte*) pos,(size_t) length);
|
|
key+=length;
|
|
continue;
|
|
}
|
|
if (keyseg->flag & HA_VAR_LENGTH)
|
|
{
|
|
uint tmp_length=uint2korr(pos);
|
|
pos+=2; /* Skip VARCHAR length */
|
|
set_if_smaller(length,tmp_length);
|
|
store_key_length_inc(key,length);
|
|
}
|
|
else if (keyseg->flag & HA_BLOB_PART)
|
|
{
|
|
uint tmp_length=_mi_calc_blob_length(keyseg->bit_start,pos);
|
|
memcpy_fixed((byte*) &pos,pos+keyseg->bit_start,sizeof(char*));
|
|
set_if_smaller(length,tmp_length);
|
|
store_key_length_inc(key,length);
|
|
}
|
|
else if (keyseg->flag & HA_SWAP_KEY)
|
|
{ /* Numerical column */
|
|
#ifdef HAVE_ISNAN
|
|
if (type == HA_KEYTYPE_FLOAT)
|
|
{
|
|
float nr;
|
|
float4get(nr,pos);
|
|
if (isnan(nr))
|
|
{
|
|
/* Replace NAN with zero */
|
|
bzero(key,length);
|
|
key+=length;
|
|
continue;
|
|
}
|
|
}
|
|
else if (type == HA_KEYTYPE_DOUBLE)
|
|
{
|
|
double nr;
|
|
float8get(nr,pos);
|
|
if (isnan(nr))
|
|
{
|
|
bzero(key,length);
|
|
key+=length;
|
|
continue;
|
|
}
|
|
}
|
|
#endif
|
|
pos+=length;
|
|
while (length--)
|
|
{
|
|
*key++ = *--pos;
|
|
}
|
|
continue;
|
|
}
|
|
memcpy((byte*) key, pos, length);
|
|
key+= length;
|
|
}
|
|
_mi_dpointer(info,key,filepos);
|
|
DBUG_PRINT("exit",("keynr: %d",keynr));
|
|
DBUG_DUMP("key",(byte*) start,(uint) (key-start)+keyseg->length);
|
|
DBUG_EXECUTE("key",
|
|
_mi_print_key(DBUG_FILE,info->s->keyinfo[keynr].seg,start,
|
|
(uint) (key-start)););
|
|
DBUG_RETURN((uint) (key-start)); /* Return keylength */
|
|
} /* _mi_make_key */
|
|
|
|
|
|
/* Pack a key to intern format from given format (c_rkey) */
|
|
/* returns length of packed key */
|
|
|
|
uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old,
|
|
uint k_length)
|
|
{
|
|
uint length;
|
|
uchar *pos,*end,*start_key=key;
|
|
reg1 HA_KEYSEG *keyseg;
|
|
enum ha_base_keytype type;
|
|
DBUG_ENTER("_mi_pack_key");
|
|
|
|
start_key=key;
|
|
for (keyseg=info->s->keyinfo[keynr].seg ;
|
|
keyseg->type && (int) k_length > 0;
|
|
old+=keyseg->length, keyseg++)
|
|
{
|
|
length=min((uint) keyseg->length,(uint) k_length);
|
|
type=(enum ha_base_keytype) keyseg->type;
|
|
if (keyseg->null_bit)
|
|
{
|
|
k_length--;
|
|
if (!(*key++= (char) 1-*old++)) /* Copy null marker */
|
|
{
|
|
k_length-=length;
|
|
continue; /* Found NULL */
|
|
}
|
|
}
|
|
pos=old;
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
{
|
|
end=pos+length;
|
|
if (type != HA_KEYTYPE_NUM)
|
|
{
|
|
while (end > pos && end[-1] == ' ')
|
|
end--;
|
|
}
|
|
else
|
|
{
|
|
while (pos < end && pos[0] == ' ')
|
|
pos++;
|
|
}
|
|
k_length-=length;
|
|
length=(uint) (end-pos);
|
|
store_key_length_inc(key,length);
|
|
memcpy((byte*) key,pos,(size_t) length);
|
|
key+= length;
|
|
continue;
|
|
}
|
|
else if (keyseg->flag & (HA_VAR_LENGTH | HA_BLOB_PART))
|
|
{
|
|
/* Length of key-part used with mi_rkey() always 2 */
|
|
uint tmp_length=uint2korr(pos);
|
|
k_length-= 2+length;
|
|
set_if_smaller(length,tmp_length); /* Safety */
|
|
store_key_length_inc(key,length);
|
|
old+=2; /* Skipp length */
|
|
memcpy((byte*) key, pos+2,(size_t) length);
|
|
key+= length;
|
|
continue;
|
|
}
|
|
else if (keyseg->flag & HA_SWAP_KEY)
|
|
{ /* Numerical column */
|
|
pos+=length;
|
|
k_length-=length;
|
|
while (length--)
|
|
{
|
|
*key++ = *--pos;
|
|
}
|
|
continue;
|
|
}
|
|
memcpy((byte*) key,pos,(size_t) length);
|
|
key+= length;
|
|
k_length-=length;
|
|
}
|
|
|
|
#ifdef NOT_USED
|
|
if (keyseg->type)
|
|
{
|
|
/* Part-key ; fill with ASCII 0 for easier searching */
|
|
length= (uint) -k_length; /* unused part of last key */
|
|
do
|
|
{
|
|
if (keyseg->flag & HA_NULL_PART)
|
|
length++;
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
length+=2;
|
|
else
|
|
length+= keyseg->length;
|
|
keyseg++;
|
|
} while (keyseg->type);
|
|
bzero((byte*) key,length);
|
|
key+=length;
|
|
}
|
|
#endif
|
|
DBUG_RETURN((uint) (key-start_key));
|
|
} /* _mi_pack_key */
|
|
|
|
|
|
/* Put a key in record */
|
|
/* Used when only-keyread is wanted */
|
|
|
|
static int _mi_put_key_in_record(register MI_INFO *info, uint keynr,
|
|
byte *record)
|
|
{
|
|
reg2 byte *key;
|
|
byte *pos,*key_end;
|
|
reg1 HA_KEYSEG *keyseg;
|
|
byte *blob_ptr;
|
|
DBUG_ENTER("_mi_put_key_in_record");
|
|
|
|
if (info->blobs && info->s->keyinfo[keynr].flag & HA_VAR_LENGTH_KEY)
|
|
{
|
|
if (!(blob_ptr=
|
|
mi_alloc_rec_buff(info, info->s->keyinfo[keynr].keylength,
|
|
&info->rec_buff)))
|
|
goto err;
|
|
}
|
|
key=(byte*) info->lastkey;
|
|
key_end=key+info->lastkey_length;
|
|
for (keyseg=info->s->keyinfo[keynr].seg ; keyseg->type ;keyseg++)
|
|
{
|
|
if (keyseg->null_bit)
|
|
{
|
|
if (!*key++)
|
|
{
|
|
record[keyseg->null_pos]|= keyseg->null_bit;
|
|
continue;
|
|
}
|
|
record[keyseg->null_pos]&= ~keyseg->null_bit;
|
|
}
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
{
|
|
uint length;
|
|
get_key_length(length,key);
|
|
#ifdef CHECK_KEYS
|
|
if (length > keyseg->length || key+length > key_end)
|
|
goto err;
|
|
#endif
|
|
pos= record+keyseg->start;
|
|
if (keyseg->type != (int) HA_KEYTYPE_NUM)
|
|
{
|
|
memcpy(pos,key,(size_t) length);
|
|
bfill(pos+length,keyseg->length-length,' ');
|
|
}
|
|
else
|
|
{
|
|
bfill(pos,keyseg->length-length,' ');
|
|
memcpy(pos+keyseg->length-length,key,(size_t) length);
|
|
}
|
|
key+=length;
|
|
continue;
|
|
}
|
|
|
|
if (keyseg->flag & HA_VAR_LENGTH)
|
|
{
|
|
uint length;
|
|
get_key_length(length,key);
|
|
#ifdef CHECK_KEYS
|
|
if (length > keyseg->length || key+length > key_end)
|
|
goto err;
|
|
#endif
|
|
memcpy(record+keyseg->start,(byte*) key, length);
|
|
key+= length;
|
|
}
|
|
else if (keyseg->flag & HA_BLOB_PART)
|
|
{
|
|
uint length;
|
|
get_key_length(length,key);
|
|
#ifdef CHECK_KEYS
|
|
if (length > keyseg->length || key+length > key_end)
|
|
goto err;
|
|
#endif
|
|
memcpy(record+keyseg->start+keyseg->bit_start,
|
|
(char*) &blob_ptr,sizeof(char*));
|
|
memcpy(blob_ptr,key,length);
|
|
blob_ptr+=length;
|
|
_my_store_blob_length(record+keyseg->start,
|
|
(uint) keyseg->bit_start,length);
|
|
key+=length;
|
|
}
|
|
else if (keyseg->flag & HA_SWAP_KEY)
|
|
{
|
|
byte *to= record+keyseg->start+keyseg->length;
|
|
byte *end= key+keyseg->length;
|
|
#ifdef CHECK_KEYS
|
|
if (end > key_end)
|
|
goto err;
|
|
#endif
|
|
do
|
|
{
|
|
*--to= *key++;
|
|
} while (key != end);
|
|
continue;
|
|
}
|
|
else
|
|
{
|
|
#ifdef CHECK_KEYS
|
|
if (key+keyseg->length > key_end)
|
|
goto err;
|
|
#endif
|
|
memcpy(record+keyseg->start,(byte*) key,
|
|
(size_t) keyseg->length);
|
|
key+= keyseg->length;
|
|
}
|
|
}
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
DBUG_RETURN(1); /* Crashed row */
|
|
} /* _mi_put_key_in_record */
|
|
|
|
|
|
/* Here when key reads are used */
|
|
|
|
int _mi_read_key_record(MI_INFO *info, my_off_t filepos, byte *buf)
|
|
{
|
|
fast_mi_writeinfo(info);
|
|
if (filepos != HA_OFFSET_ERROR)
|
|
{
|
|
if (info->lastinx >= 0)
|
|
{ /* Read only key */
|
|
if (_mi_put_key_in_record(info,(uint) info->lastinx,buf))
|
|
{
|
|
my_errno=HA_ERR_CRASHED;
|
|
return -1;
|
|
}
|
|
info->update|= HA_STATE_AKTIV; /* We should find a record */
|
|
return 0;
|
|
}
|
|
my_errno=HA_ERR_WRONG_INDEX;
|
|
}
|
|
return(-1); /* Wrong data to read */
|
|
}
|
|
|
|
|
|
/* Update auto_increment info */
|
|
|
|
void update_auto_increment(MI_INFO *info,const byte *record)
|
|
{
|
|
ulonglong value;
|
|
HA_KEYSEG *keyseg=info->s->keyinfo[info->s->base.auto_key-1].seg;
|
|
const uchar *key=(uchar*) record+keyseg->start;
|
|
|
|
switch (keyseg->type) {
|
|
case HA_KEYTYPE_INT8:
|
|
case HA_KEYTYPE_BINARY:
|
|
value=(ulonglong) *(uchar*) key;
|
|
break;
|
|
case HA_KEYTYPE_SHORT_INT:
|
|
case HA_KEYTYPE_USHORT_INT:
|
|
value=(ulonglong) uint2korr(key);
|
|
break;
|
|
case HA_KEYTYPE_LONG_INT:
|
|
case HA_KEYTYPE_ULONG_INT:
|
|
value=(ulonglong) uint4korr(key);
|
|
break;
|
|
case HA_KEYTYPE_INT24:
|
|
case HA_KEYTYPE_UINT24:
|
|
value=(ulonglong) uint3korr(key);
|
|
break;
|
|
case HA_KEYTYPE_FLOAT: /* This shouldn't be used */
|
|
{
|
|
float f_1;
|
|
float4get(f_1,key);
|
|
value = (ulonglong) f_1;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_DOUBLE: /* This shouldn't be used */
|
|
{
|
|
double f_1;
|
|
float8get(f_1,key);
|
|
value = (ulonglong) f_1;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_LONGLONG:
|
|
case HA_KEYTYPE_ULONGLONG:
|
|
value= uint8korr(key);
|
|
break;
|
|
default:
|
|
value=0; /* Error */
|
|
break;
|
|
}
|
|
set_if_bigger(info->s->state.auto_increment,value);
|
|
}
|