mirror of
https://github.com/MariaDB/server.git
synced 2025-11-22 17:44:29 +03:00
Cleaned up embedded library access and query cache handling Changed min stack size to 128K (to allow longer MyISAM keys) Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work) client/mysqldump.c: Fixed bugs found after merge include/mysql_embed.h: Disable query cache when using embedded version myisam/mi_check.c: Removed not used variable mysql-test/r/auto_increment.result: Fixed bugs found after merge mysql-test/r/bdb.result: Fixed bugs found after merge mysql-test/r/func_group.result: Fixed bugs found after merge mysql-test/r/func_str.result: Fixed bugs found after merge mysql-test/r/func_time.result: Fixed bugs found after merge mysql-test/r/group_by.result: Fixed bugs found after merge mysql-test/r/innodb.result: Fixed bugs found after merge mysql-test/r/insert.result: Fixed bugs found after merge mysql-test/r/join_outer.result: Fixed bugs found after merge mysql-test/r/loaddata.result: Fixed bugs found after merge mysql-test/r/multi_update.result: Fixed bugs found after merge mysql-test/r/mysqldump.result: Update results mysql-test/r/rpl_EE_error.result: Fixed bugs found after merge mysql-test/r/rpl_multi_update.result: Fixed bugs found after merge mysql-test/r/symlink.result: Update results mysql-test/r/type_blob.result: Update results mysql-test/r/type_datetime.result: Update results mysql-test/r/type_decimal.result: Update results mysql-test/r/type_enum.result: Fixed bugs found after merge mysql-test/r/type_timestamp.result: Update results mysql-test/r/union.result: Update results mysql-test/r/warnings.result: Update results mysql-test/t/bdb.test: Fix test for 4.1 mysql-test/t/innodb.test: Fix test for 4.1 mysql-test/t/multi_update.test: Fix test for 4.1 mysql-test/t/mysqldump.test: Fix test for 4.1 mysql-test/t/rpl_EE_error.test: Fix test for 4.1 mysql-test/t/rpl_multi_update.test: Fix test for 4.1 mysql-test/t/union.test: Cleanup mysys/charset.c: Check results from my_once_alloc() mysys/my_handler.c: part of 4.0 merge sql-common/client.c: Part of 4.0 merge sql/field.cc: After merge fixes sql/field.h: After merge fixes sql/ha_innodb.cc: Remove duplicate include files sql/item.cc: Changed automatic int conversion to be of type binary sql/item.h: After merge fixes sql/item_func.cc: Changed automatic int conversion to be of type binary sql/item_func.h: After merge fixes sql/item_strfunc.cc: Added comments sql/item_subselect.cc: Indentation fixes sql/item_sum.cc: Changed automatic int conversion to be of type binary sql/item_sum.h: After merge fixes sql/mysql_priv.h: Cleanup embedded library access checks sql/mysqld.cc: Changed min stack size to 128K (to allow longer MyISAM keys) sql/set_var.cc: Fixed compiler warnings sql/share/czech/errmsg.txt: Better error message sql/share/danish/errmsg.txt: Better error message sql/share/dutch/errmsg.txt: Better error message sql/share/english/errmsg.txt: Better error message sql/share/estonian/errmsg.txt: Better error message sql/share/french/errmsg.txt: Better error message sql/share/greek/errmsg.txt: Better error message sql/share/hungarian/errmsg.txt: Better error message sql/share/italian/errmsg.txt: Better error message sql/share/japanese/errmsg.txt: Better error message sql/share/korean/errmsg.txt: Better error message sql/share/norwegian-ny/errmsg.txt: Better error message sql/share/norwegian/errmsg.txt: Better error message sql/share/polish/errmsg.txt: Better error message sql/share/romanian/errmsg.txt: Better error message sql/share/russian/errmsg.txt: Better error message sql/share/serbian/errmsg.txt: Better error message sql/share/slovak/errmsg.txt: Better error message sql/share/spanish/errmsg.txt: Better error message sql/share/swedish/errmsg.txt: Better error message sql/share/ukrainian/errmsg.txt: Better error message sql/sql_acl.h: Cleaned up embedded library acccess checks sql/sql_base.cc: After merge fixes sql/sql_client.cc: After merge fixes sql/sql_parse.cc: After merge fixes Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called) Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster sql/sql_prepare.cc: Add missing arguments sql/sql_select.cc: After merge fixes sql/sql_update.cc: After merge fixes sql/sql_yacc.yy: Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work) sql/table.cc: After merge fixes
420 lines
12 KiB
C
420 lines
12 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
#include "my_handler.h"
|
|
|
|
int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length,
|
|
uchar *b, uint b_length, my_bool part_key)
|
|
{
|
|
if (part_key && b_length < a_length)
|
|
a_length=b_length;
|
|
return my_strnncoll(charset_info, a, a_length, b, b_length);
|
|
}
|
|
|
|
static int compare_bin(uchar *a, uint a_length, uchar *b, uint b_length,
|
|
my_bool part_key)
|
|
{
|
|
uint length= min(a_length,b_length);
|
|
uchar *end= a+ length;
|
|
int flag;
|
|
|
|
while (a < end)
|
|
if ((flag= (int) *a++ - (int) *b++))
|
|
return flag;
|
|
if (part_key && b_length < a_length)
|
|
return 0;
|
|
return (int) (a_length-b_length);
|
|
}
|
|
|
|
|
|
/*
|
|
Compare two keys
|
|
|
|
SYNOPSIS
|
|
ha_key_cmp()
|
|
keyseg Key segments of key to compare
|
|
a First key to compare, in format from _mi_pack_key()
|
|
This is normally key specified by user
|
|
b Second key to compare. This is always from a row
|
|
key_length Length of key to compare. This can be shorter than
|
|
a to just compare sub keys
|
|
next_flag How keys should be compared
|
|
If bit SEARCH_FIND is not set the keys includes the row
|
|
position and this should also be compared
|
|
|
|
NOTES
|
|
Number-keys can't be splited
|
|
|
|
RETURN VALUES
|
|
<0 If a < b
|
|
0 If a == b
|
|
>0 If a > b
|
|
*/
|
|
|
|
#define FCMP(A,B) ((int) (A) - (int) (B))
|
|
|
|
int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a,
|
|
register uchar *b, uint key_length, uint nextflag,
|
|
uint *diff_pos)
|
|
{
|
|
int flag;
|
|
int16 s_1,s_2;
|
|
int32 l_1,l_2;
|
|
uint32 u_1,u_2;
|
|
float f_1,f_2;
|
|
double d_1,d_2;
|
|
uint next_key_length;
|
|
|
|
*diff_pos=0;
|
|
for ( ; (int) key_length >0 ; key_length=next_key_length, keyseg++)
|
|
{
|
|
uchar *end;
|
|
uint piks=! (keyseg->flag & HA_NO_SORT);
|
|
(*diff_pos)++;
|
|
|
|
/* Handle NULL part */
|
|
if (keyseg->null_bit)
|
|
{
|
|
key_length--;
|
|
if (*a != *b && piks)
|
|
{
|
|
flag = (int) *a - (int) *b;
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
}
|
|
b++;
|
|
if (!*a++) /* If key was NULL */
|
|
{
|
|
if (nextflag == (SEARCH_FIND | SEARCH_UPDATE))
|
|
nextflag=SEARCH_SAME; /* Allow duplicate keys */
|
|
else if (nextflag & SEARCH_NULL_ARE_NOT_EQUAL)
|
|
{
|
|
/*
|
|
This is only used from mi_check() to calculate cardinality.
|
|
It can't be used when searching for a key as this would cause
|
|
compare of (a,b) and (b,a) to return the same value.
|
|
*/
|
|
return -1;
|
|
}
|
|
next_key_length=key_length;
|
|
continue; /* To next key part */
|
|
}
|
|
}
|
|
end= a+ min(keyseg->length,key_length);
|
|
next_key_length=key_length-keyseg->length;
|
|
|
|
switch ((enum ha_base_keytype) keyseg->type) {
|
|
case HA_KEYTYPE_TEXT: /* Ascii; Key is converted */
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
{
|
|
int a_length,b_length,pack_length;
|
|
get_key_length(a_length,a);
|
|
get_key_pack_length(b_length,pack_length,b);
|
|
next_key_length=key_length-b_length-pack_length;
|
|
|
|
if (piks &&
|
|
(flag=mi_compare_text(keyseg->charset,a,a_length,b,b_length,
|
|
(my_bool) ((nextflag & SEARCH_PREFIX) &&
|
|
next_key_length <= 0))))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a+=a_length;
|
|
b+=b_length;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
uint length=(uint) (end-a), a_length=length, b_length=length;
|
|
if (!(nextflag & SEARCH_PREFIX))
|
|
{
|
|
while (a_length && a[a_length-1] == ' ')
|
|
a_length--;
|
|
while (b_length && b[b_length-1] == ' ')
|
|
b_length--;
|
|
}
|
|
if (piks &&
|
|
(flag= mi_compare_text(keyseg->charset, a, a_length, b, b_length,
|
|
(my_bool) ((nextflag & SEARCH_PREFIX) &&
|
|
next_key_length <= 0))))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a=end;
|
|
b+=length;
|
|
}
|
|
break;
|
|
case HA_KEYTYPE_BINARY:
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
{
|
|
int a_length,b_length,pack_length;
|
|
get_key_length(a_length,a);
|
|
get_key_pack_length(b_length,pack_length,b);
|
|
next_key_length=key_length-b_length-pack_length;
|
|
|
|
if (piks &&
|
|
(flag=compare_bin(a,a_length,b,b_length,
|
|
(my_bool) ((nextflag & SEARCH_PREFIX) &&
|
|
next_key_length <= 0))))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a+=a_length;
|
|
b+=b_length;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
uint length=keyseg->length;
|
|
if (piks &&
|
|
(flag=compare_bin(a,length,b,length,
|
|
(my_bool) ((nextflag & SEARCH_PREFIX) &&
|
|
next_key_length <= 0))))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a+=length;
|
|
b+=length;
|
|
}
|
|
break;
|
|
case HA_KEYTYPE_VARTEXT:
|
|
{
|
|
int a_length,b_length,pack_length;
|
|
get_key_length(a_length,a);
|
|
get_key_pack_length(b_length,pack_length,b);
|
|
next_key_length=key_length-b_length-pack_length;
|
|
|
|
if (!(nextflag & (SEARCH_PREFIX | SEARCH_UPDATE)))
|
|
{
|
|
while (a_length && a[a_length-1] == ' ')
|
|
a_length--;
|
|
while (b_length && b[b_length-1] == ' ')
|
|
b_length--;
|
|
}
|
|
|
|
if (piks &&
|
|
(flag= mi_compare_text(keyseg->charset,a,a_length,b,b_length,
|
|
(my_bool) ((nextflag & SEARCH_PREFIX) &&
|
|
next_key_length <= 0))))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a+=a_length;
|
|
b+=b_length;
|
|
break;
|
|
}
|
|
break;
|
|
case HA_KEYTYPE_VARBINARY:
|
|
{
|
|
int a_length,b_length,pack_length;
|
|
get_key_length(a_length,a);
|
|
get_key_pack_length(b_length,pack_length,b);
|
|
next_key_length=key_length-b_length-pack_length;
|
|
|
|
if (piks &&
|
|
(flag=compare_bin(a,a_length,b,b_length,
|
|
(my_bool) ((nextflag & SEARCH_PREFIX) &&
|
|
next_key_length <= 0))))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a+=a_length;
|
|
b+=b_length;
|
|
break;
|
|
}
|
|
break;
|
|
case HA_KEYTYPE_INT8:
|
|
{
|
|
int i_1= (int) *((signed char*) a);
|
|
int i_2= (int) *((signed char*) b);
|
|
if (piks && (flag = CMP_NUM(i_1,i_2)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b++;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_SHORT_INT:
|
|
s_1= mi_sint2korr(a);
|
|
s_2= mi_sint2korr(b);
|
|
if (piks && (flag = CMP_NUM(s_1,s_2)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b+= 2; /* sizeof(short int); */
|
|
break;
|
|
case HA_KEYTYPE_USHORT_INT:
|
|
{
|
|
uint16 us_1,us_2;
|
|
us_1= mi_sint2korr(a);
|
|
us_2= mi_sint2korr(b);
|
|
if (piks && (flag = CMP_NUM(us_1,us_2)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b+=2; /* sizeof(short int); */
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_LONG_INT:
|
|
l_1= mi_sint4korr(a);
|
|
l_2= mi_sint4korr(b);
|
|
if (piks && (flag = CMP_NUM(l_1,l_2)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b+= 4; /* sizeof(long int); */
|
|
break;
|
|
case HA_KEYTYPE_ULONG_INT:
|
|
u_1= mi_sint4korr(a);
|
|
u_2= mi_sint4korr(b);
|
|
if (piks && (flag = CMP_NUM(u_1,u_2)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b+= 4; /* sizeof(long int); */
|
|
break;
|
|
case HA_KEYTYPE_INT24:
|
|
l_1=mi_sint3korr(a);
|
|
l_2=mi_sint3korr(b);
|
|
if (piks && (flag = CMP_NUM(l_1,l_2)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b+= 3;
|
|
break;
|
|
case HA_KEYTYPE_UINT24:
|
|
l_1=mi_uint3korr(a);
|
|
l_2=mi_uint3korr(b);
|
|
if (piks && (flag = CMP_NUM(l_1,l_2)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b+= 3;
|
|
break;
|
|
case HA_KEYTYPE_FLOAT:
|
|
mi_float4get(f_1,a);
|
|
mi_float4get(f_2,b);
|
|
if (piks && (flag = CMP_NUM(f_1,f_2)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b+= 4; /* sizeof(float); */
|
|
break;
|
|
case HA_KEYTYPE_DOUBLE:
|
|
mi_float8get(d_1,a);
|
|
mi_float8get(d_2,b);
|
|
if (piks && (flag = CMP_NUM(d_1,d_2)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b+= 8; /* sizeof(double); */
|
|
break;
|
|
case HA_KEYTYPE_NUM: /* Numeric key */
|
|
{
|
|
int swap_flag= 0;
|
|
int alength,blength;
|
|
|
|
if (keyseg->flag & HA_REVERSE_SORT)
|
|
{
|
|
swap(uchar*,a,b);
|
|
swap_flag=1; /* Remember swap of a & b */
|
|
end= a+ (int) (end-b);
|
|
}
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
{
|
|
alength= *a++; blength= *b++;
|
|
end=a+alength;
|
|
next_key_length=key_length-blength-1;
|
|
}
|
|
else
|
|
{
|
|
alength= (int) (end-a);
|
|
blength=keyseg->length;
|
|
/* remove pre space from keys */
|
|
for ( ; alength && *a == ' ' ; a++, alength--) ;
|
|
for ( ; blength && *b == ' ' ; b++, blength--) ;
|
|
}
|
|
if (piks)
|
|
{
|
|
if (*a == '-')
|
|
{
|
|
if (*b != '-')
|
|
return -1;
|
|
a++; b++;
|
|
swap(uchar*,a,b);
|
|
swap(int,alength,blength);
|
|
swap_flag=1-swap_flag;
|
|
alength--; blength--;
|
|
end=a+alength;
|
|
}
|
|
else if (*b == '-')
|
|
return 1;
|
|
while (alength && (*a == '+' || *a == '0'))
|
|
{
|
|
a++; alength--;
|
|
}
|
|
while (blength && (*b == '+' || *b == '0'))
|
|
{
|
|
b++; blength--;
|
|
}
|
|
if (alength != blength)
|
|
return (alength < blength) ? -1 : 1;
|
|
while (a < end)
|
|
if (*a++ != *b++)
|
|
return ((int) a[-1] - (int) b[-1]);
|
|
}
|
|
else
|
|
{
|
|
b+=(end-a);
|
|
a=end;
|
|
}
|
|
|
|
if (swap_flag) /* Restore pointers */
|
|
swap(uchar*,a,b);
|
|
break;
|
|
}
|
|
#ifdef HAVE_LONG_LONG
|
|
case HA_KEYTYPE_LONGLONG:
|
|
{
|
|
longlong ll_a,ll_b;
|
|
ll_a= mi_sint8korr(a);
|
|
ll_b= mi_sint8korr(b);
|
|
if (piks && (flag = CMP_NUM(ll_a,ll_b)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b+= 8;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_ULONGLONG:
|
|
{
|
|
ulonglong ll_a,ll_b;
|
|
ll_a= mi_uint8korr(a);
|
|
ll_b= mi_uint8korr(b);
|
|
if (piks && (flag = CMP_NUM(ll_a,ll_b)))
|
|
return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
|
|
a= end;
|
|
b+= 8;
|
|
break;
|
|
}
|
|
#endif
|
|
case HA_KEYTYPE_END: /* Ready */
|
|
goto end; /* diff_pos is incremented */
|
|
}
|
|
}
|
|
(*diff_pos)++;
|
|
end:
|
|
if (!(nextflag & SEARCH_FIND))
|
|
{
|
|
uint i;
|
|
if (nextflag & (SEARCH_NO_FIND | SEARCH_LAST)) /* Find record after key */
|
|
return (nextflag & (SEARCH_BIGGER | SEARCH_LAST)) ? -1 : 1;
|
|
flag=0;
|
|
for (i=keyseg->length ; i-- > 0 ; )
|
|
{
|
|
if (*a++ != *b++)
|
|
{
|
|
flag= FCMP(a[-1],b[-1]);
|
|
break;
|
|
}
|
|
}
|
|
if (nextflag & SEARCH_SAME)
|
|
return (flag); /* read same */
|
|
if (nextflag & SEARCH_BIGGER)
|
|
return (flag <= 0 ? -1 : 1); /* read next */
|
|
return (flag < 0 ? -1 : 1); /* read previous */
|
|
}
|
|
return 0;
|
|
} /* ha_key_cmp */
|