mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1
This commit is contained in:
bell@sanja.is.com.ua 2003-06-23 00:02:20 +03:00
commit 7b7892afad
2 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/Makefile.am
View file

@ -62,7 +62,7 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \
mysqlaccess.conf \ mysqlaccess.conf \
mysqlbug mysqlbug
pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
# mysqlbug should be distributed built so that people can report build # mysqlbug should be distributed built so that people can report build
# failures with it. # failures with it.

64
sql/item_cmpfunc.cc
View file

@ -90,40 +90,60 @@ static bool convert_constant_item(Field *field, Item **item)
bool Item_bool_func2::set_cmp_charset(CHARSET_INFO *cs1, enum coercion co1, bool Item_bool_func2::set_cmp_charset(CHARSET_INFO *cs1, enum coercion co1,
CHARSET_INFO *cs2, enum coercion co2) CHARSET_INFO *cs2, enum coercion co2)
{ {
if ((cs1 == &my_charset_bin) || (cs2 == &my_charset_bin)) if (cs1 == &my_charset_bin || cs2 == &my_charset_bin)
{ {
cmp_charset= &my_charset_bin; cmp_charset= &my_charset_bin;
coercibility= co1 > co2 ? co1 : co2;
return 0; return 0;
} }
if ((co1 == COER_NOCOLL) || (co2 == COER_NOCOLL)) if (!my_charset_same(cs1, cs2))
return 1; {
/*
if (!my_charset_same(cs1,cs2)) We do allow to use BLOBS together with character strings
return 1; BLOBS have more precedance
*/
if (co1 < co2) if ((co1 <= co2) && (cs1==&my_charset_bin))
cmp_charset= cs1;
else if (co2 < co1)
cmp_charset= cs2;
else // co1==co2
{ {
if (cs1 == cs2)
cmp_charset= cs1; cmp_charset= cs1;
coercibility= co1;
}
else if ((co2 <= co1) && (cs2==&my_charset_bin))
{
cmp_charset= cs2;
coercibility= co2;
}
else else
{ {
if (co1 == COER_COERCIBLE) cmp_charset= 0;
{ coercibility= COER_NOCOLL;
CHARSET_INFO *c;
if ((c= get_charset_by_csname(cs1->csname, MY_CS_PRIMARY, MYF(0))))
{
cmp_charset= c;
return 0;
}
}
return 1; return 1;
} }
} }
else if (co1 < co2)
{
cmp_charset= cs1;
coercibility= co1;
}
else if (co2 < co1)
{
cmp_charset= cs2;
coercibility= co1;
}
else
{
if (cs1 == cs2)
{
cmp_charset= cs1;
coercibility= co1;
}
else
{
coercibility= COER_NOCOLL;
cmp_charset= 0;
return (co1 == COER_EXPLICIT) ? 1 : 0;
}
}
return 0; return 0;
} }