2002-10-02 12:33:08 +02:00
|
|
|
/* Copyright (C) 2002 MySQL AB
|
2002-03-12 18:37:58 +01:00
|
|
|
|
|
|
|
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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2002-03-12 18:37:58 +01:00
|
|
|
|
|
|
|
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 */
|
|
|
|
|
|
|
|
#include <my_global.h>
|
2002-11-10 13:14:39 +01:00
|
|
|
#include "m_string.h"
|
2002-11-27 15:08:31 +01:00
|
|
|
#include "m_ctype.h"
|
2006-07-20 10:41:12 +02:00
|
|
|
#include "my_sys.h" /* Needed for MY_ERRNO_ERANGE */
|
2002-11-28 08:04:26 +01:00
|
|
|
#include <errno.h>
|
|
|
|
|
2002-11-10 13:14:39 +01:00
|
|
|
#include "stdarg.h"
|
2002-03-12 18:37:58 +01:00
|
|
|
|
2005-01-26 13:34:09 +01:00
|
|
|
/*
|
|
|
|
Returns the number of bytes required for strnxfrm().
|
|
|
|
*/
|
|
|
|
uint my_strnxfrmlen_simple(CHARSET_INFO *cs, uint len)
|
|
|
|
{
|
|
|
|
return len * (cs->strxfrm_multiply ? cs->strxfrm_multiply : 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-01-13 15:12:04 +01:00
|
|
|
/*
|
|
|
|
Converts a string into its sort key.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
my_strnxfrm_xxx()
|
|
|
|
|
|
|
|
IMPLEMENTATION
|
|
|
|
|
|
|
|
The my_strxfrm_xxx() function transforms a string pointed to by
|
|
|
|
'src' with length 'srclen' according to the charset+collation
|
|
|
|
pair 'cs' and copies the result key into 'dest'.
|
|
|
|
|
|
|
|
Comparing two strings using memcmp() after my_strnxfrm_xxx()
|
|
|
|
is equal to comparing two original strings with my_strnncollsp_xxx().
|
|
|
|
|
|
|
|
Not more than 'dstlen' bytes are written into 'dst'.
|
|
|
|
To garantee that the whole string is transformed, 'dstlen' must be
|
|
|
|
at least srclen*cs->strnxfrm_multiply bytes long. Otherwise,
|
|
|
|
consequent memcmp() may return a non-accurate result.
|
|
|
|
|
|
|
|
If the source string is too short to fill whole 'dstlen' bytes,
|
|
|
|
then the 'dest' string is padded up to 'dstlen', ensuring that:
|
|
|
|
|
|
|
|
"a" == "a "
|
|
|
|
"a\0" < "a"
|
|
|
|
"a\0" < "a "
|
|
|
|
|
|
|
|
my_strnxfrm_simple() is implemented for 8bit charsets and
|
|
|
|
simple collations with one-to-one string->key transformation.
|
|
|
|
|
|
|
|
See also implementations for various charsets/collations in
|
|
|
|
other ctype-xxx.c files.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
|
|
|
|
Target len 'dstlen'.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
2002-11-27 15:08:31 +01:00
|
|
|
|
2002-03-12 18:37:58 +01:00
|
|
|
int my_strnxfrm_simple(CHARSET_INFO * cs,
|
2002-10-09 12:40:57 +02:00
|
|
|
uchar *dest, uint len,
|
|
|
|
const uchar *src, uint srclen)
|
2002-03-12 18:37:58 +01:00
|
|
|
{
|
2002-10-02 12:33:08 +02:00
|
|
|
uchar *map= cs->sort_order;
|
2005-01-13 15:12:04 +01:00
|
|
|
uint dstlen= len;
|
2004-09-10 21:19:52 +02:00
|
|
|
set_if_smaller(len, srclen);
|
2003-04-01 09:45:16 +02:00
|
|
|
if (dest != src)
|
|
|
|
{
|
|
|
|
const uchar *end;
|
|
|
|
for ( end=src+len; src < end ; )
|
|
|
|
*dest++= map[*src++];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const uchar *end;
|
|
|
|
for ( end=dest+len; dest < end ; dest++)
|
|
|
|
*dest= (char) map[(uchar) *dest];
|
|
|
|
}
|
2005-01-13 15:12:04 +01:00
|
|
|
if (dstlen > len)
|
|
|
|
bfill(dest, dstlen - len, ' ');
|
|
|
|
return dstlen;
|
2002-03-12 18:37:58 +01:00
|
|
|
}
|
|
|
|
|
2002-10-09 12:40:57 +02:00
|
|
|
int my_strnncoll_simple(CHARSET_INFO * cs, const uchar *s, uint slen,
|
2004-06-10 21:18:57 +02:00
|
|
|
const uchar *t, uint tlen,
|
|
|
|
my_bool t_is_prefix)
|
2002-03-12 18:37:58 +01:00
|
|
|
{
|
|
|
|
int len = ( slen > tlen ) ? tlen : slen;
|
2002-10-02 12:33:08 +02:00
|
|
|
uchar *map= cs->sort_order;
|
2004-06-10 21:18:57 +02:00
|
|
|
if (t_is_prefix && slen > tlen)
|
|
|
|
slen=tlen;
|
2002-03-12 18:37:58 +01:00
|
|
|
while (len--)
|
|
|
|
{
|
2002-10-09 12:40:57 +02:00
|
|
|
if (map[*s++] != map[*t++])
|
|
|
|
return ((int) map[s[-1]] - (int) map[t[-1]]);
|
2002-03-12 18:37:58 +01:00
|
|
|
}
|
2004-06-10 21:18:57 +02:00
|
|
|
return (int) (slen - tlen);
|
2002-03-12 18:37:58 +01:00
|
|
|
}
|
|
|
|
|
2003-01-31 10:48:35 +01:00
|
|
|
|
2004-03-25 14:05:01 +01:00
|
|
|
/*
|
|
|
|
Compare strings, discarding end space
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
my_strnncollsp_simple()
|
|
|
|
cs character set handler
|
|
|
|
a First string to compare
|
|
|
|
a_length Length of 'a'
|
|
|
|
b Second string to compare
|
|
|
|
b_length Length of 'b'
|
2004-12-06 01:00:37 +01:00
|
|
|
diff_if_only_endspace_difference
|
|
|
|
Set to 1 if the strings should be regarded as different
|
|
|
|
if they only difference in end space
|
2004-03-25 14:05:01 +01:00
|
|
|
|
|
|
|
IMPLEMENTATION
|
|
|
|
If one string is shorter as the other, then we space extend the other
|
|
|
|
so that the strings have equal length.
|
|
|
|
|
|
|
|
This will ensure that the following things hold:
|
|
|
|
|
|
|
|
"a" == "a "
|
|
|
|
"a\0" < "a"
|
|
|
|
"a\0" < "a "
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
< 0 a < b
|
|
|
|
= 0 a == b
|
|
|
|
> 0 a > b
|
|
|
|
*/
|
|
|
|
|
|
|
|
int my_strnncollsp_simple(CHARSET_INFO * cs, const uchar *a, uint a_length,
|
2004-12-06 01:00:37 +01:00
|
|
|
const uchar *b, uint b_length,
|
|
|
|
my_bool diff_if_only_endspace_difference)
|
2003-01-31 10:48:35 +01:00
|
|
|
{
|
2004-03-25 14:05:01 +01:00
|
|
|
const uchar *map= cs->sort_order, *end;
|
|
|
|
uint length;
|
2004-12-06 01:00:37 +01:00
|
|
|
int res;
|
|
|
|
|
|
|
|
#ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE
|
|
|
|
diff_if_only_endspace_difference= 0;
|
|
|
|
#endif
|
2004-03-25 14:05:01 +01:00
|
|
|
|
|
|
|
end= a + (length= min(a_length, b_length));
|
|
|
|
while (a < end)
|
2003-01-31 10:48:35 +01:00
|
|
|
{
|
2004-03-25 14:05:01 +01:00
|
|
|
if (map[*a++] != map[*b++])
|
|
|
|
return ((int) map[a[-1]] - (int) map[b[-1]]);
|
2003-01-31 10:48:35 +01:00
|
|
|
}
|
2004-12-06 01:00:37 +01:00
|
|
|
res= 0;
|
2004-03-25 14:05:01 +01:00
|
|
|
if (a_length != b_length)
|
|
|
|
{
|
2005-02-01 15:27:08 +01:00
|
|
|
int swap= 1;
|
2004-12-06 01:00:37 +01:00
|
|
|
if (diff_if_only_endspace_difference)
|
|
|
|
res= 1; /* Assume 'a' is bigger */
|
2004-03-25 14:05:01 +01:00
|
|
|
/*
|
|
|
|
Check the next not space character of the longer key. If it's < ' ',
|
|
|
|
then it's smaller than the other key.
|
|
|
|
*/
|
|
|
|
if (a_length < b_length)
|
|
|
|
{
|
|
|
|
/* put shorter key in s */
|
|
|
|
a_length= b_length;
|
|
|
|
a= b;
|
2005-02-01 15:27:08 +01:00
|
|
|
swap= -1; /* swap sign of result */
|
2004-12-06 01:00:37 +01:00
|
|
|
res= -res;
|
2004-03-25 14:05:01 +01:00
|
|
|
}
|
|
|
|
for (end= a + a_length-length; a < end ; a++)
|
|
|
|
{
|
|
|
|
if (*a != ' ')
|
2005-02-01 15:27:08 +01:00
|
|
|
return (*a < ' ') ? -swap : swap;
|
2004-03-25 14:05:01 +01:00
|
|
|
}
|
|
|
|
}
|
2004-12-06 01:00:37 +01:00
|
|
|
return res;
|
2003-01-31 10:48:35 +01:00
|
|
|
}
|
|
|
|
|
2004-03-25 14:05:01 +01:00
|
|
|
|
2006-10-30 11:40:15 +01:00
|
|
|
uint my_caseup_str_8bit(CHARSET_INFO * cs,char *str)
|
2002-03-12 18:37:58 +01:00
|
|
|
{
|
2006-10-30 11:40:15 +01:00
|
|
|
register uchar *map= cs->to_upper;
|
|
|
|
char *str_orig= str;
|
|
|
|
while ((*str= (char) map[(uchar) *str]) != 0)
|
2002-03-12 18:37:58 +01:00
|
|
|
str++;
|
2006-10-30 11:40:15 +01:00
|
|
|
return str - str_orig;
|
2002-03-12 18:37:58 +01:00
|
|
|
}
|
|
|
|
|
2006-10-30 11:40:15 +01:00
|
|
|
|
|
|
|
uint my_casedn_str_8bit(CHARSET_INFO * cs,char *str)
|
2002-03-12 18:37:58 +01:00
|
|
|
{
|
2006-10-30 11:40:15 +01:00
|
|
|
register uchar *map= cs->to_lower;
|
|
|
|
char *str_orig= str;
|
|
|
|
while ((*str= (char) map[(uchar) *str]) != 0)
|
2002-03-12 18:37:58 +01:00
|
|
|
str++;
|
2006-10-30 11:40:15 +01:00
|
|
|
return str - str_orig;
|
2002-03-12 18:37:58 +01:00
|
|
|
}
|
|
|
|
|
2006-10-30 11:40:15 +01:00
|
|
|
|
2005-06-06 13:54:15 +02:00
|
|
|
uint my_caseup_8bit(CHARSET_INFO * cs, char *src, uint srclen,
|
|
|
|
char *dst __attribute__((unused)),
|
|
|
|
uint dstlen __attribute__((unused)))
|
2002-03-12 18:37:58 +01:00
|
|
|
{
|
2005-06-06 13:54:15 +02:00
|
|
|
uint srclen0= srclen;
|
|
|
|
register uchar *map= cs->to_upper;
|
|
|
|
DBUG_ASSERT(src == dst && srclen == dstlen);
|
|
|
|
for ( ; srclen > 0 ; srclen--, src++)
|
|
|
|
*src= (char) map[(uchar) *src];
|
|
|
|
return srclen0;
|
2002-03-12 18:37:58 +01:00
|
|
|
}
|
|
|
|
|
2005-06-06 13:54:15 +02:00
|
|
|
uint my_casedn_8bit(CHARSET_INFO * cs, char *src, uint srclen,
|
|
|
|
char *dst __attribute__((unused)),
|
|
|
|
uint dstlen __attribute__((unused)))
|
2002-03-12 18:37:58 +01:00
|
|
|
{
|
2005-06-06 13:54:15 +02:00
|
|
|
uint srclen0= srclen;
|
2002-08-15 13:42:54 +02:00
|
|
|
register uchar *map=cs->to_lower;
|
2005-06-06 13:54:15 +02:00
|
|
|
DBUG_ASSERT(src == dst && srclen == dstlen);
|
|
|
|
for ( ; srclen > 0 ; srclen--, src++)
|
|
|
|
*src= (char) map[(uchar) *src];
|
|
|
|
return srclen0;
|
2002-03-12 18:37:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int my_strcasecmp_8bit(CHARSET_INFO * cs,const char *s, const char *t)
|
|
|
|
{
|
2002-08-15 13:42:54 +02:00
|
|
|
register uchar *map=cs->to_upper;
|
|
|
|
while (map[(uchar) *s] == map[(uchar) *t++])
|
2002-03-12 18:37:58 +01:00
|
|
|
if (!*s++) return 0;
|
2002-08-15 13:42:54 +02:00
|
|
|
return ((int) map[(uchar) s[0]] - (int) map[(uchar) t[-1]]);
|
2002-03-12 18:37:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-03-29 13:06:06 +01:00
|
|
|
int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc,
|
|
|
|
const unsigned char *str,
|
|
|
|
const unsigned char *end __attribute__((unused)))
|
|
|
|
{
|
2003-01-27 13:46:03 +01:00
|
|
|
if (str >= end)
|
2005-12-12 18:42:09 +01:00
|
|
|
return MY_CS_TOOSMALL;
|
2003-01-27 13:46:03 +01:00
|
|
|
|
2002-03-29 13:06:06 +01:00
|
|
|
*wc=cs->tab_to_uni[*str];
|
2005-12-12 18:42:09 +01:00
|
|
|
return (!wc[0] && str[0]) ? -1 : 1;
|
2002-03-29 13:06:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc,
|
2003-01-14 13:28:36 +01:00
|
|
|
unsigned char *str,
|
|
|
|
unsigned char *end __attribute__((unused)))
|
2002-03-29 13:06:06 +01:00
|
|
|
{
|
|
|
|
MY_UNI_IDX *idx;
|
|
|
|
|
2003-01-27 13:46:03 +01:00
|
|
|
if (str >= end)
|
|
|
|
return MY_CS_TOOSMALL;
|
|
|
|
|
2003-01-14 13:28:36 +01:00
|
|
|
for (idx=cs->tab_from_uni; idx->tab ; idx++)
|
|
|
|
{
|
|
|
|
if (idx->from <= wc && idx->to >= wc)
|
|
|
|
{
|
|
|
|
str[0]= idx->tab[wc - idx->from];
|
|
|
|
return (!str[0] && wc) ? MY_CS_ILUNI : 1;
|
2002-03-29 13:06:06 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return MY_CS_ILUNI;
|
|
|
|
}
|
2002-10-10 13:52:22 +02:00
|
|
|
|
|
|
|
|
2003-01-14 13:28:36 +01:00
|
|
|
/*
|
|
|
|
We can't use vsprintf here as it's not guaranteed to return
|
|
|
|
the length on all operating systems.
|
|
|
|
This function is also not called in a safe environment, so the
|
|
|
|
end buffer must be checked.
|
|
|
|
*/
|
2002-11-10 13:14:39 +01:00
|
|
|
|
|
|
|
int my_snprintf_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
2002-11-13 12:00:25 +01:00
|
|
|
char* to, uint n __attribute__((unused)),
|
|
|
|
const char* fmt, ...)
|
2002-11-10 13:14:39 +01:00
|
|
|
{
|
|
|
|
va_list args;
|
2003-01-14 13:28:36 +01:00
|
|
|
int result;
|
2002-11-10 13:14:39 +01:00
|
|
|
va_start(args,fmt);
|
2003-01-14 13:28:36 +01:00
|
|
|
result= my_vsnprintf(to, n, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
return result;
|
2002-11-10 13:14:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-10-10 13:52:22 +02:00
|
|
|
void my_hash_sort_simple(CHARSET_INFO *cs,
|
2004-03-25 14:05:01 +01:00
|
|
|
const uchar *key, uint len,
|
|
|
|
ulong *nr1, ulong *nr2)
|
2002-10-10 13:52:22 +02:00
|
|
|
{
|
|
|
|
register uchar *sort_order=cs->sort_order;
|
2004-12-06 01:00:37 +01:00
|
|
|
const uchar *end= key + len;
|
2002-10-10 13:52:22 +02:00
|
|
|
|
2004-12-06 01:00:37 +01:00
|
|
|
/*
|
|
|
|
Remove end space. We have to do this to be able to compare
|
|
|
|
'A ' and 'A' as identical
|
|
|
|
*/
|
|
|
|
while (end > key && end[-1] == ' ')
|
|
|
|
end--;
|
2002-10-10 13:52:22 +02:00
|
|
|
|
2004-12-06 01:00:37 +01:00
|
|
|
for (; key < (uchar*) end ; key++)
|
2002-10-10 13:52:22 +02:00
|
|
|
{
|
|
|
|
nr1[0]^=(ulong) ((((uint) nr1[0] & 63)+nr2[0]) *
|
2004-12-06 01:00:37 +01:00
|
|
|
((uint) sort_order[(uint) *key])) + (nr1[0] << 8);
|
2002-10-10 13:52:22 +02:00
|
|
|
nr2[0]+=3;
|
|
|
|
}
|
|
|
|
}
|
2002-11-13 14:13:29 +01:00
|
|
|
|
2002-11-27 15:08:31 +01:00
|
|
|
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
long my_strntol_8bit(CHARSET_INFO *cs,
|
|
|
|
const char *nptr, uint l, int base,
|
|
|
|
char **endptr, int *err)
|
2002-11-13 14:13:29 +01:00
|
|
|
{
|
2002-11-27 15:08:31 +01:00
|
|
|
int negative;
|
2004-05-07 00:43:17 +02:00
|
|
|
register uint32 cutoff;
|
2002-11-27 15:08:31 +01:00
|
|
|
register unsigned int cutlim;
|
2004-05-07 00:43:17 +02:00
|
|
|
register uint32 i;
|
2002-11-27 15:08:31 +01:00
|
|
|
register const char *s;
|
|
|
|
register unsigned char c;
|
|
|
|
const char *save, *e;
|
|
|
|
int overflow;
|
2003-01-17 10:17:22 +01:00
|
|
|
|
2003-01-17 15:33:54 +01:00
|
|
|
*err= 0; /* Initialize error indicator */
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base < 0 || base == 1 || base > 36)
|
|
|
|
base = 10;
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
|
|
|
|
2002-11-27 15:08:31 +01:00
|
|
|
s = nptr;
|
|
|
|
e = nptr+l;
|
|
|
|
|
|
|
|
for ( ; s<e && my_isspace(cs, *s) ; s++);
|
|
|
|
|
|
|
|
if (s == e)
|
|
|
|
{
|
|
|
|
goto noconv;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for a sign. */
|
|
|
|
if (*s == '-')
|
|
|
|
{
|
|
|
|
negative = 1;
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
else if (*s == '+')
|
|
|
|
{
|
|
|
|
negative = 0;
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
negative = 0;
|
|
|
|
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
|
|
|
|
s += 2;
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
2002-11-27 15:08:31 +01:00
|
|
|
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base == 0)
|
|
|
|
{
|
|
|
|
if (*s == '0')
|
|
|
|
{
|
|
|
|
if (s[1]=='X' || s[1]=='x')
|
|
|
|
{
|
|
|
|
s += 2;
|
|
|
|
base = 16;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
base = 8;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
base = 10;
|
|
|
|
}
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
2002-11-27 15:08:31 +01:00
|
|
|
|
|
|
|
save = s;
|
2004-05-07 00:43:17 +02:00
|
|
|
cutoff = ((uint32)~0L) / (uint32) base;
|
|
|
|
cutlim = (uint) (((uint32)~0L) % (uint32) base);
|
2002-11-27 15:08:31 +01:00
|
|
|
|
|
|
|
overflow = 0;
|
|
|
|
i = 0;
|
|
|
|
for (c = *s; s != e; c = *++s)
|
|
|
|
{
|
|
|
|
if (c>='0' && c<='9')
|
|
|
|
c -= '0';
|
2004-03-15 16:18:30 +01:00
|
|
|
else if (c>='A' && c<='Z')
|
2002-11-27 15:08:31 +01:00
|
|
|
c = c - 'A' + 10;
|
2004-03-15 16:18:30 +01:00
|
|
|
else if (c>='a' && c<='z')
|
2002-11-27 15:08:31 +01:00
|
|
|
c = c - 'a' + 10;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
if (c >= base)
|
|
|
|
break;
|
|
|
|
if (i > cutoff || (i == cutoff && c > cutlim))
|
|
|
|
overflow = 1;
|
|
|
|
else
|
|
|
|
{
|
2004-05-07 00:43:17 +02:00
|
|
|
i *= (uint32) base;
|
2002-11-27 15:08:31 +01:00
|
|
|
i += c;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s == save)
|
|
|
|
goto noconv;
|
|
|
|
|
|
|
|
if (endptr != NULL)
|
|
|
|
*endptr = (char *) s;
|
|
|
|
|
|
|
|
if (negative)
|
|
|
|
{
|
2004-05-07 00:43:17 +02:00
|
|
|
if (i > (uint32) INT_MIN32)
|
2002-11-27 15:08:31 +01:00
|
|
|
overflow = 1;
|
|
|
|
}
|
2004-05-07 00:43:17 +02:00
|
|
|
else if (i > INT_MAX32)
|
2002-11-27 15:08:31 +01:00
|
|
|
overflow = 1;
|
|
|
|
|
|
|
|
if (overflow)
|
|
|
|
{
|
2003-01-16 14:17:07 +01:00
|
|
|
err[0]= ERANGE;
|
2004-05-07 00:43:17 +02:00
|
|
|
return negative ? INT_MIN32 : INT_MAX32;
|
2002-11-27 15:08:31 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return (negative ? -((long) i) : (long) i);
|
|
|
|
|
|
|
|
noconv:
|
2003-01-16 14:17:07 +01:00
|
|
|
err[0]= EDOM;
|
2002-11-27 15:08:31 +01:00
|
|
|
if (endptr != NULL)
|
|
|
|
*endptr = (char *) nptr;
|
|
|
|
return 0L;
|
2002-11-13 14:13:29 +01:00
|
|
|
}
|
|
|
|
|
2002-11-27 15:08:31 +01:00
|
|
|
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
ulong my_strntoul_8bit(CHARSET_INFO *cs,
|
|
|
|
const char *nptr, uint l, int base,
|
|
|
|
char **endptr, int *err)
|
2002-11-13 14:13:29 +01:00
|
|
|
{
|
2002-11-27 15:08:31 +01:00
|
|
|
int negative;
|
2004-05-07 00:43:17 +02:00
|
|
|
register uint32 cutoff;
|
2002-11-27 15:08:31 +01:00
|
|
|
register unsigned int cutlim;
|
2004-05-07 00:43:17 +02:00
|
|
|
register uint32 i;
|
2002-11-27 15:08:31 +01:00
|
|
|
register const char *s;
|
|
|
|
register unsigned char c;
|
|
|
|
const char *save, *e;
|
|
|
|
int overflow;
|
|
|
|
|
2003-01-17 15:33:54 +01:00
|
|
|
*err= 0; /* Initialize error indicator */
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base < 0 || base == 1 || base > 36)
|
|
|
|
base = 10;
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
|
|
|
|
2002-11-27 15:08:31 +01:00
|
|
|
s = nptr;
|
|
|
|
e = nptr+l;
|
|
|
|
|
|
|
|
for( ; s<e && my_isspace(cs, *s); s++);
|
|
|
|
|
|
|
|
if (s==e)
|
|
|
|
{
|
|
|
|
goto noconv;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*s == '-')
|
|
|
|
{
|
|
|
|
negative = 1;
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
else if (*s == '+')
|
|
|
|
{
|
|
|
|
negative = 0;
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
negative = 0;
|
|
|
|
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
|
|
|
|
s += 2;
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
2002-11-27 15:08:31 +01:00
|
|
|
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base == 0)
|
|
|
|
{
|
|
|
|
if (*s == '0')
|
|
|
|
{
|
|
|
|
if (s[1]=='X' || s[1]=='x')
|
|
|
|
{
|
|
|
|
s += 2;
|
|
|
|
base = 16;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
base = 8;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
base = 10;
|
|
|
|
}
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
2002-11-27 15:08:31 +01:00
|
|
|
|
|
|
|
save = s;
|
2004-05-07 00:43:17 +02:00
|
|
|
cutoff = ((uint32)~0L) / (uint32) base;
|
|
|
|
cutlim = (uint) (((uint32)~0L) % (uint32) base);
|
2002-11-27 15:08:31 +01:00
|
|
|
overflow = 0;
|
|
|
|
i = 0;
|
|
|
|
|
|
|
|
for (c = *s; s != e; c = *++s)
|
|
|
|
{
|
|
|
|
if (c>='0' && c<='9')
|
|
|
|
c -= '0';
|
2004-03-15 16:18:30 +01:00
|
|
|
else if (c>='A' && c<='Z')
|
2002-11-27 15:08:31 +01:00
|
|
|
c = c - 'A' + 10;
|
2004-03-15 16:18:30 +01:00
|
|
|
else if (c>='a' && c<='z')
|
2002-11-27 15:08:31 +01:00
|
|
|
c = c - 'a' + 10;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
if (c >= base)
|
|
|
|
break;
|
|
|
|
if (i > cutoff || (i == cutoff && c > cutlim))
|
|
|
|
overflow = 1;
|
|
|
|
else
|
|
|
|
{
|
2004-05-07 00:43:17 +02:00
|
|
|
i *= (uint32) base;
|
2002-11-27 15:08:31 +01:00
|
|
|
i += c;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s == save)
|
|
|
|
goto noconv;
|
|
|
|
|
|
|
|
if (endptr != NULL)
|
|
|
|
*endptr = (char *) s;
|
|
|
|
|
|
|
|
if (overflow)
|
|
|
|
{
|
2003-01-16 14:17:07 +01:00
|
|
|
err[0]= ERANGE;
|
2004-05-07 00:43:17 +02:00
|
|
|
return (~(uint32) 0);
|
2002-11-27 15:08:31 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return (negative ? -((long) i) : (long) i);
|
|
|
|
|
|
|
|
noconv:
|
2003-01-16 14:17:07 +01:00
|
|
|
err[0]= EDOM;
|
2002-11-27 15:08:31 +01:00
|
|
|
if (endptr != NULL)
|
|
|
|
*endptr = (char *) nptr;
|
|
|
|
return 0L;
|
2002-11-13 14:13:29 +01:00
|
|
|
}
|
|
|
|
|
2002-11-27 15:08:31 +01:00
|
|
|
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
|
|
|
const char *nptr, uint l, int base,
|
|
|
|
char **endptr,int *err)
|
2002-11-13 14:13:29 +01:00
|
|
|
{
|
2002-11-27 15:08:31 +01:00
|
|
|
int negative;
|
|
|
|
register ulonglong cutoff;
|
|
|
|
register unsigned int cutlim;
|
|
|
|
register ulonglong i;
|
|
|
|
register const char *s, *e;
|
|
|
|
const char *save;
|
|
|
|
int overflow;
|
|
|
|
|
2003-01-17 15:33:54 +01:00
|
|
|
*err= 0; /* Initialize error indicator */
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base < 0 || base == 1 || base > 36)
|
|
|
|
base = 10;
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
2002-11-27 15:08:31 +01:00
|
|
|
|
|
|
|
s = nptr;
|
|
|
|
e = nptr+l;
|
|
|
|
|
|
|
|
for(; s<e && my_isspace(cs,*s); s++);
|
|
|
|
|
|
|
|
if (s == e)
|
|
|
|
{
|
|
|
|
goto noconv;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*s == '-')
|
|
|
|
{
|
|
|
|
negative = 1;
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
else if (*s == '+')
|
|
|
|
{
|
|
|
|
negative = 0;
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
negative = 0;
|
|
|
|
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base == 16 && s[0] == '0' && (s[1]=='X'|| s[1]=='x'))
|
|
|
|
s += 2;
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
2002-11-27 15:08:31 +01:00
|
|
|
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base == 0)
|
|
|
|
{
|
|
|
|
if (*s == '0')
|
|
|
|
{
|
|
|
|
if (s[1]=='X' || s[1]=='x')
|
|
|
|
{
|
|
|
|
s += 2;
|
|
|
|
base = 16;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
base = 8;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
base = 10;
|
|
|
|
}
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
2002-11-27 15:08:31 +01:00
|
|
|
|
|
|
|
save = s;
|
|
|
|
|
|
|
|
cutoff = (~(ulonglong) 0) / (unsigned long int) base;
|
|
|
|
cutlim = (uint) ((~(ulonglong) 0) % (unsigned long int) base);
|
|
|
|
|
|
|
|
overflow = 0;
|
|
|
|
i = 0;
|
2005-02-28 10:59:46 +01:00
|
|
|
for ( ; s != e; s++)
|
2002-11-27 15:08:31 +01:00
|
|
|
{
|
2005-02-28 10:59:46 +01:00
|
|
|
register unsigned char c= *s;
|
2002-11-27 15:08:31 +01:00
|
|
|
if (c>='0' && c<='9')
|
|
|
|
c -= '0';
|
2004-03-15 16:18:30 +01:00
|
|
|
else if (c>='A' && c<='Z')
|
2002-11-27 15:08:31 +01:00
|
|
|
c = c - 'A' + 10;
|
2004-03-15 16:18:30 +01:00
|
|
|
else if (c>='a' && c<='z')
|
2002-11-27 15:08:31 +01:00
|
|
|
c = c - 'a' + 10;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
if (c >= base)
|
|
|
|
break;
|
|
|
|
if (i > cutoff || (i == cutoff && c > cutlim))
|
|
|
|
overflow = 1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
i *= (ulonglong) base;
|
|
|
|
i += c;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s == save)
|
|
|
|
goto noconv;
|
|
|
|
|
|
|
|
if (endptr != NULL)
|
|
|
|
*endptr = (char *) s;
|
|
|
|
|
|
|
|
if (negative)
|
|
|
|
{
|
|
|
|
if (i > (ulonglong) LONGLONG_MIN)
|
|
|
|
overflow = 1;
|
|
|
|
}
|
|
|
|
else if (i > (ulonglong) LONGLONG_MAX)
|
|
|
|
overflow = 1;
|
|
|
|
|
|
|
|
if (overflow)
|
|
|
|
{
|
2003-01-16 14:17:07 +01:00
|
|
|
err[0]= ERANGE;
|
2002-11-27 15:08:31 +01:00
|
|
|
return negative ? LONGLONG_MIN : LONGLONG_MAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (negative ? -((longlong) i) : (longlong) i);
|
|
|
|
|
|
|
|
noconv:
|
2003-01-16 14:17:07 +01:00
|
|
|
err[0]= EDOM;
|
2002-11-27 15:08:31 +01:00
|
|
|
if (endptr != NULL)
|
|
|
|
*endptr = (char *) nptr;
|
|
|
|
return 0L;
|
2002-11-13 14:13:29 +01:00
|
|
|
}
|
|
|
|
|
2002-11-27 15:08:31 +01:00
|
|
|
|
|
|
|
ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
|
2003-01-16 14:17:07 +01:00
|
|
|
const char *nptr, uint l, int base,
|
|
|
|
char **endptr, int *err)
|
2002-11-13 14:13:29 +01:00
|
|
|
{
|
2002-11-27 15:08:31 +01:00
|
|
|
int negative;
|
|
|
|
register ulonglong cutoff;
|
|
|
|
register unsigned int cutlim;
|
|
|
|
register ulonglong i;
|
|
|
|
register const char *s, *e;
|
|
|
|
const char *save;
|
|
|
|
int overflow;
|
|
|
|
|
2003-01-17 15:33:54 +01:00
|
|
|
*err= 0; /* Initialize error indicator */
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base < 0 || base == 1 || base > 36)
|
|
|
|
base = 10;
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
2002-11-27 15:08:31 +01:00
|
|
|
|
|
|
|
s = nptr;
|
|
|
|
e = nptr+l;
|
|
|
|
|
|
|
|
for(; s<e && my_isspace(cs,*s); s++);
|
|
|
|
|
|
|
|
if (s == e)
|
|
|
|
{
|
|
|
|
goto noconv;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*s == '-')
|
|
|
|
{
|
|
|
|
negative = 1;
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
else if (*s == '+')
|
|
|
|
{
|
|
|
|
negative = 0;
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
negative = 0;
|
|
|
|
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
|
|
|
|
s += 2;
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
2002-11-27 15:08:31 +01:00
|
|
|
|
2003-01-17 15:45:17 +01:00
|
|
|
#ifdef NOT_USED
|
2002-11-27 15:08:31 +01:00
|
|
|
if (base == 0)
|
|
|
|
{
|
|
|
|
if (*s == '0')
|
|
|
|
{
|
|
|
|
if (s[1]=='X' || s[1]=='x')
|
|
|
|
{
|
|
|
|
s += 2;
|
|
|
|
base = 16;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
base = 8;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
base = 10;
|
|
|
|
}
|
2003-01-17 10:17:22 +01:00
|
|
|
#endif
|
2002-11-27 15:08:31 +01:00
|
|
|
|
|
|
|
save = s;
|
|
|
|
|
|
|
|
cutoff = (~(ulonglong) 0) / (unsigned long int) base;
|
|
|
|
cutlim = (uint) ((~(ulonglong) 0) % (unsigned long int) base);
|
|
|
|
|
|
|
|
overflow = 0;
|
|
|
|
i = 0;
|
2005-02-28 10:59:46 +01:00
|
|
|
for ( ; s != e; s++)
|
2002-11-27 15:08:31 +01:00
|
|
|
{
|
2005-02-28 10:59:46 +01:00
|
|
|
register unsigned char c= *s;
|
|
|
|
|
2002-11-27 15:08:31 +01:00
|
|
|
if (c>='0' && c<='9')
|
|
|
|
c -= '0';
|
2004-03-15 16:18:30 +01:00
|
|
|
else if (c>='A' && c<='Z')
|
2002-11-27 15:08:31 +01:00
|
|
|
c = c - 'A' + 10;
|
2004-03-15 16:18:30 +01:00
|
|
|
else if (c>='a' && c<='z')
|
2002-11-27 15:08:31 +01:00
|
|
|
c = c - 'a' + 10;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
if (c >= base)
|
|
|
|
break;
|
|
|
|
if (i > cutoff || (i == cutoff && c > cutlim))
|
|
|
|
overflow = 1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
i *= (ulonglong) base;
|
|
|
|
i += c;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s == save)
|
|
|
|
goto noconv;
|
|
|
|
|
|
|
|
if (endptr != NULL)
|
|
|
|
*endptr = (char *) s;
|
|
|
|
|
|
|
|
if (overflow)
|
|
|
|
{
|
2003-01-16 14:17:07 +01:00
|
|
|
err[0]= ERANGE;
|
2002-11-27 15:08:31 +01:00
|
|
|
return (~(ulonglong) 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (negative ? -((longlong) i) : (longlong) i);
|
|
|
|
|
|
|
|
noconv:
|
2003-01-16 14:17:07 +01:00
|
|
|
err[0]= EDOM;
|
2002-11-27 15:08:31 +01:00
|
|
|
if (endptr != NULL)
|
|
|
|
*endptr = (char *) nptr;
|
|
|
|
return 0L;
|
2002-11-13 14:13:29 +01:00
|
|
|
}
|
|
|
|
|
2003-01-14 13:28:36 +01:00
|
|
|
/*
|
|
|
|
Read double from string
|
|
|
|
|
|
|
|
SYNOPSIS:
|
|
|
|
my_strntod_8bit()
|
|
|
|
cs Character set information
|
|
|
|
str String to convert to double
|
|
|
|
length Optional length for string.
|
2003-01-17 15:33:54 +01:00
|
|
|
end result pointer to end of converted string
|
|
|
|
err Error number if failed conversion
|
2003-01-14 13:28:36 +01:00
|
|
|
|
|
|
|
NOTES:
|
|
|
|
If length is not INT_MAX32 or str[length] != 0 then the given str must
|
|
|
|
be writeable
|
|
|
|
If length == INT_MAX32 the str must be \0 terminated.
|
|
|
|
|
|
|
|
It's implemented this way to save a buffer allocation and a memory copy.
|
|
|
|
|
|
|
|
RETURN
|
2003-01-17 15:33:54 +01:00
|
|
|
Value of number in string
|
2003-01-14 13:28:36 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
double my_strntod_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
2004-02-13 15:27:21 +01:00
|
|
|
char *str, uint length,
|
2003-01-17 15:33:54 +01:00
|
|
|
char **end, int *err)
|
2002-11-13 14:13:29 +01:00
|
|
|
{
|
2003-03-18 10:17:48 +01:00
|
|
|
if (length == INT_MAX32)
|
2005-01-15 11:28:38 +01:00
|
|
|
length= 65535; /* Should be big enough */
|
|
|
|
*end= str + length;
|
|
|
|
return my_strtod(str, end, err);
|
2002-11-13 14:13:29 +01:00
|
|
|
}
|
2002-11-14 13:07:29 +01:00
|
|
|
|
|
|
|
|
2002-12-11 09:30:05 +01:00
|
|
|
/*
|
|
|
|
This is a fast version optimized for the case of radix 10 / -10
|
2003-01-14 13:28:36 +01:00
|
|
|
|
|
|
|
Assume len >= 1
|
2002-12-11 09:30:05 +01:00
|
|
|
*/
|
|
|
|
|
2003-01-15 15:06:07 +01:00
|
|
|
int my_long10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
2002-12-11 09:30:05 +01:00
|
|
|
char *dst, uint len, int radix, long int val)
|
|
|
|
{
|
2002-12-11 12:26:49 +01:00
|
|
|
char buffer[66];
|
|
|
|
register char *p, *e;
|
|
|
|
long int new_val;
|
2003-01-14 13:28:36 +01:00
|
|
|
uint sign=0;
|
|
|
|
|
2002-12-11 12:26:49 +01:00
|
|
|
e = p = &buffer[sizeof(buffer)-1];
|
2003-01-14 13:28:36 +01:00
|
|
|
*p= 0;
|
2002-12-11 12:26:49 +01:00
|
|
|
|
|
|
|
if (radix < 0)
|
|
|
|
{
|
|
|
|
if (val < 0)
|
|
|
|
{
|
2003-01-14 13:28:36 +01:00
|
|
|
val= -val;
|
|
|
|
*dst++= '-';
|
|
|
|
len--;
|
|
|
|
sign= 1;
|
2002-12-11 12:26:49 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
new_val = (long) ((unsigned long int) val / 10);
|
|
|
|
*--p = '0'+ (char) ((unsigned long int) val - (unsigned long) new_val * 10);
|
|
|
|
val = new_val;
|
|
|
|
|
|
|
|
while (val != 0)
|
|
|
|
{
|
|
|
|
new_val=val/10;
|
|
|
|
*--p = '0' + (char) (val-new_val*10);
|
|
|
|
val= new_val;
|
|
|
|
}
|
|
|
|
|
2003-01-14 13:28:36 +01:00
|
|
|
len= min(len, (uint) (e-p));
|
|
|
|
memcpy(dst, p, len);
|
|
|
|
return (int) len+sign;
|
2002-12-11 12:26:49 +01:00
|
|
|
}
|
2002-12-11 09:30:05 +01:00
|
|
|
|
2003-01-14 13:28:36 +01:00
|
|
|
|
2003-01-15 15:06:07 +01:00
|
|
|
int my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
2002-12-11 09:30:05 +01:00
|
|
|
char *dst, uint len, int radix, longlong val)
|
|
|
|
{
|
2002-12-11 12:26:49 +01:00
|
|
|
char buffer[65];
|
|
|
|
register char *p, *e;
|
|
|
|
long long_val;
|
2003-01-14 13:28:36 +01:00
|
|
|
uint sign= 0;
|
2002-12-11 12:26:49 +01:00
|
|
|
|
|
|
|
if (radix < 0)
|
|
|
|
{
|
|
|
|
if (val < 0)
|
|
|
|
{
|
|
|
|
val = -val;
|
2003-01-14 13:28:36 +01:00
|
|
|
*dst++= '-';
|
|
|
|
len--;
|
|
|
|
sign= 1;
|
2002-12-11 12:26:49 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
e = p = &buffer[sizeof(buffer)-1];
|
2003-01-14 13:28:36 +01:00
|
|
|
*p= 0;
|
2002-12-11 12:26:49 +01:00
|
|
|
|
|
|
|
if (val == 0)
|
|
|
|
{
|
2003-01-14 13:28:36 +01:00
|
|
|
*--p= '0';
|
|
|
|
len= 1;
|
2002-12-11 12:26:49 +01:00
|
|
|
goto cnv;
|
|
|
|
}
|
|
|
|
|
|
|
|
while ((ulonglong) val > (ulonglong) LONG_MAX)
|
|
|
|
{
|
|
|
|
ulonglong quo=(ulonglong) val/(uint) 10;
|
|
|
|
uint rem= (uint) (val- quo* (uint) 10);
|
|
|
|
*--p = '0' + rem;
|
|
|
|
val= quo;
|
|
|
|
}
|
|
|
|
|
|
|
|
long_val= (long) val;
|
|
|
|
while (long_val != 0)
|
|
|
|
{
|
|
|
|
long quo= long_val/10;
|
2005-10-18 17:03:26 +02:00
|
|
|
*--p = (char) ('0' + (long_val - quo*10));
|
2002-12-11 12:26:49 +01:00
|
|
|
long_val= quo;
|
|
|
|
}
|
|
|
|
|
2003-01-14 13:28:36 +01:00
|
|
|
len= min(len, (uint) (e-p));
|
2002-12-11 12:26:49 +01:00
|
|
|
cnv:
|
2003-01-14 13:28:36 +01:00
|
|
|
memcpy(dst, p, len);
|
|
|
|
return len+sign;
|
2002-12-11 09:30:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-11-14 13:07:29 +01:00
|
|
|
/*
|
|
|
|
** Compare string against string with wildcard
|
|
|
|
** 0 if matched
|
|
|
|
** -1 if not matched with wildcard
|
|
|
|
** 1 if matched with wildcard
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef LIKE_CMP_TOUPPER
|
|
|
|
#define likeconv(s,A) (uchar) my_toupper(s,A)
|
|
|
|
#else
|
|
|
|
#define likeconv(s,A) (uchar) (s)->sort_order[(uchar) (A)]
|
|
|
|
#endif
|
|
|
|
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
#define INC_PTR(cs,A,B) (A)++
|
2002-11-14 13:07:29 +01:00
|
|
|
|
|
|
|
|
|
|
|
int my_wildcmp_8bit(CHARSET_INFO *cs,
|
|
|
|
const char *str,const char *str_end,
|
|
|
|
const char *wildstr,const char *wildend,
|
|
|
|
int escape, int w_one, int w_many)
|
|
|
|
{
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
int result= -1; /* Not found, using wildcards */
|
2002-11-14 13:07:29 +01:00
|
|
|
|
|
|
|
while (wildstr != wildend)
|
|
|
|
{
|
|
|
|
while (*wildstr != w_many && *wildstr != w_one)
|
|
|
|
{
|
|
|
|
if (*wildstr == escape && wildstr+1 != wildend)
|
|
|
|
wildstr++;
|
|
|
|
|
|
|
|
if (str == str_end || likeconv(cs,*wildstr++) != likeconv(cs,*str++))
|
2003-01-31 08:43:46 +01:00
|
|
|
return(1); /* No match */
|
2002-11-14 13:07:29 +01:00
|
|
|
if (wildstr == wildend)
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
return(str != str_end); /* Match if both are at end */
|
2003-01-31 08:43:46 +01:00
|
|
|
result=1; /* Found an anchor char */
|
2002-11-14 13:07:29 +01:00
|
|
|
}
|
|
|
|
if (*wildstr == w_one)
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
2003-01-31 08:43:46 +01:00
|
|
|
if (str == str_end) /* Skip one char if possible */
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
return(result);
|
2002-11-14 13:07:29 +01:00
|
|
|
INC_PTR(cs,str,str_end);
|
|
|
|
} while (++wildstr < wildend && *wildstr == w_one);
|
|
|
|
if (wildstr == wildend)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (*wildstr == w_many)
|
2003-01-31 08:43:46 +01:00
|
|
|
{ /* Found w_many */
|
2002-11-14 13:07:29 +01:00
|
|
|
uchar cmp;
|
|
|
|
|
|
|
|
wildstr++;
|
|
|
|
/* Remove any '%' and '_' from the wild search string */
|
|
|
|
for (; wildstr != wildend ; wildstr++)
|
|
|
|
{
|
|
|
|
if (*wildstr == w_many)
|
|
|
|
continue;
|
|
|
|
if (*wildstr == w_one)
|
|
|
|
{
|
|
|
|
if (str == str_end)
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
return(-1);
|
2002-11-14 13:07:29 +01:00
|
|
|
INC_PTR(cs,str,str_end);
|
|
|
|
continue;
|
|
|
|
}
|
2003-01-31 08:43:46 +01:00
|
|
|
break; /* Not a wild character */
|
2002-11-14 13:07:29 +01:00
|
|
|
}
|
|
|
|
if (wildstr == wildend)
|
2003-01-31 08:43:46 +01:00
|
|
|
return(0); /* Ok if w_many is last */
|
2002-11-14 13:07:29 +01:00
|
|
|
if (str == str_end)
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
return(-1);
|
2002-11-14 13:07:29 +01:00
|
|
|
|
|
|
|
if ((cmp= *wildstr) == escape && wildstr+1 != wildend)
|
|
|
|
cmp= *++wildstr;
|
|
|
|
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
INC_PTR(cs,wildstr,wildend); /* This is compared trough cmp */
|
|
|
|
cmp=likeconv(cs,cmp);
|
2002-11-14 13:07:29 +01:00
|
|
|
do
|
|
|
|
{
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
while (str != str_end && (uchar) likeconv(cs,*str) != cmp)
|
|
|
|
str++;
|
|
|
|
if (str++ == str_end) return(-1);
|
2002-11-14 13:07:29 +01:00
|
|
|
{
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
int tmp=my_wildcmp_8bit(cs,str,str_end,wildstr,wildend,escape,w_one,
|
|
|
|
w_many);
|
2002-11-14 13:07:29 +01:00
|
|
|
if (tmp <= 0)
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
return(tmp);
|
2002-11-14 13:07:29 +01:00
|
|
|
}
|
|
|
|
} while (str != str_end && wildstr[0] != w_many);
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
}
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
return(str != str_end ? 1 : 0);
|
2002-11-14 13:07:29 +01:00
|
|
|
}
|
2002-11-15 08:44:23 +01:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Calculate min_str and max_str that ranges a LIKE string.
|
|
|
|
** Arguments:
|
|
|
|
** ptr Pointer to LIKE string.
|
|
|
|
** ptr_length Length of LIKE string.
|
|
|
|
** escape Escape character in LIKE. (Normally '\').
|
|
|
|
** All escape characters should be removed from min_str and max_str
|
|
|
|
** res_length Length of min_str and max_str.
|
|
|
|
** min_str Smallest case sensitive string that ranges LIKE.
|
|
|
|
** Should be space padded to res_length.
|
|
|
|
** max_str Largest case sensitive string that ranges LIKE.
|
|
|
|
** Normally padded with the biggest character sort value.
|
|
|
|
**
|
|
|
|
** The function should return 0 if ok and 1 if the LIKE string can't be
|
|
|
|
** optimized !
|
|
|
|
*/
|
|
|
|
|
|
|
|
my_bool my_like_range_simple(CHARSET_INFO *cs,
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
const char *ptr,uint ptr_length,
|
|
|
|
pbool escape, pbool w_one, pbool w_many,
|
|
|
|
uint res_length,
|
|
|
|
char *min_str,char *max_str,
|
|
|
|
uint *min_length,uint *max_length)
|
2002-11-15 08:44:23 +01:00
|
|
|
{
|
2005-09-21 20:10:51 +02:00
|
|
|
const char *end= ptr + ptr_length;
|
2002-11-15 08:44:23 +01:00
|
|
|
char *min_org=min_str;
|
|
|
|
char *min_end=min_str+res_length;
|
2005-09-21 20:10:51 +02:00
|
|
|
uint charlen= res_length / cs->mbmaxlen;
|
2002-11-15 08:44:23 +01:00
|
|
|
|
2005-09-21 20:10:51 +02:00
|
|
|
for (; ptr != end && min_str != min_end && charlen > 0 ; ptr++, charlen--)
|
2002-11-15 08:44:23 +01:00
|
|
|
{
|
|
|
|
if (*ptr == escape && ptr+1 != end)
|
|
|
|
{
|
2003-01-31 08:43:46 +01:00
|
|
|
ptr++; /* Skip escape */
|
2002-11-15 08:44:23 +01:00
|
|
|
*min_str++= *max_str++ = *ptr;
|
|
|
|
continue;
|
|
|
|
}
|
2003-01-31 08:43:46 +01:00
|
|
|
if (*ptr == w_one) /* '_' in SQL */
|
2002-11-15 08:44:23 +01:00
|
|
|
{
|
2003-01-31 08:43:46 +01:00
|
|
|
*min_str++='\0'; /* This should be min char */
|
2004-03-19 07:00:46 +01:00
|
|
|
*max_str++= (char) cs->max_sort_char;
|
2002-11-15 08:44:23 +01:00
|
|
|
continue;
|
|
|
|
}
|
2003-01-31 08:43:46 +01:00
|
|
|
if (*ptr == w_many) /* '%' in SQL */
|
2002-11-15 08:44:23 +01:00
|
|
|
{
|
2004-12-06 01:00:37 +01:00
|
|
|
/* Calculate length of keys */
|
|
|
|
*min_length= ((cs->state & MY_CS_BINSORT) ? (uint) (min_str - min_org) :
|
|
|
|
res_length);
|
|
|
|
*max_length= res_length;
|
2004-03-25 14:05:01 +01:00
|
|
|
do
|
|
|
|
{
|
|
|
|
*min_str++= 0;
|
|
|
|
*max_str++= (char) cs->max_sort_char;
|
2002-11-15 08:44:23 +01:00
|
|
|
} while (min_str != min_end);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
*min_str++= *max_str++ = *ptr;
|
|
|
|
}
|
|
|
|
|
2004-12-06 01:00:37 +01:00
|
|
|
*min_length= *max_length = (uint) (min_str - min_org);
|
2002-11-15 08:44:23 +01:00
|
|
|
while (min_str != min_end)
|
2004-12-06 01:00:37 +01:00
|
|
|
*min_str++= *max_str++ = ' '; /* Because if key compression */
|
2002-11-15 08:44:23 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2003-01-17 15:14:54 +01:00
|
|
|
|
|
|
|
|
|
|
|
ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq)
|
|
|
|
{
|
|
|
|
const char *str0= str;
|
|
|
|
switch (sq)
|
|
|
|
{
|
|
|
|
case MY_SEQ_INTTAIL:
|
|
|
|
if (*str == '.')
|
|
|
|
{
|
|
|
|
for(str++ ; str != end && *str == '0' ; str++);
|
2005-07-26 13:38:10 +02:00
|
|
|
return (ulong) (str - str0);
|
2003-01-17 15:14:54 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case MY_SEQ_SPACES:
|
2003-01-28 11:58:06 +01:00
|
|
|
for ( ; str < end ; str++)
|
2003-01-17 15:14:54 +01:00
|
|
|
{
|
|
|
|
if (!my_isspace(cs,*str))
|
|
|
|
break;
|
|
|
|
}
|
2005-07-26 13:38:10 +02:00
|
|
|
return (ulong) (str - str0);
|
2003-01-17 15:14:54 +01:00
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2003-01-28 11:58:06 +01:00
|
|
|
|
2004-02-17 00:35:17 +01:00
|
|
|
|
2003-01-28 11:58:06 +01:00
|
|
|
void my_fill_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
|
|
|
char *s, uint l, int fill)
|
|
|
|
{
|
|
|
|
bfill(s,l,fill);
|
2003-01-31 13:22:22 +01:00
|
|
|
}
|
|
|
|
|
2004-02-17 00:35:17 +01:00
|
|
|
|
2003-01-31 13:22:22 +01:00
|
|
|
uint my_numchars_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
|
|
|
const char *b, const char *e)
|
|
|
|
{
|
2005-07-26 13:38:10 +02:00
|
|
|
return (uint) (e - b);
|
2003-01-31 13:22:22 +01:00
|
|
|
}
|
|
|
|
|
2004-02-17 00:35:17 +01:00
|
|
|
|
2004-08-25 08:39:43 +02:00
|
|
|
uint my_numcells_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
|
|
|
const char *b, const char *e)
|
|
|
|
{
|
2005-07-26 13:38:10 +02:00
|
|
|
return (uint) (e - b);
|
2004-08-25 08:39:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-01-31 13:22:22 +01:00
|
|
|
uint my_charpos_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
|
|
|
const char *b __attribute__((unused)),
|
|
|
|
const char *e __attribute__((unused)),
|
|
|
|
uint pos)
|
|
|
|
{
|
|
|
|
return pos;
|
|
|
|
}
|
2003-05-23 14:45:52 +02:00
|
|
|
|
2004-02-17 00:35:17 +01:00
|
|
|
|
|
|
|
uint my_well_formed_len_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
2005-04-06 08:53:15 +02:00
|
|
|
const char *start, const char *end,
|
|
|
|
uint nchars, int *error)
|
2004-02-06 13:59:25 +01:00
|
|
|
{
|
2004-02-09 13:59:41 +01:00
|
|
|
uint nbytes= (uint) (end-start);
|
2005-04-06 08:53:15 +02:00
|
|
|
*error= 0;
|
2004-02-17 00:35:17 +01:00
|
|
|
return min(nbytes, nchars);
|
2004-02-06 13:59:25 +01:00
|
|
|
}
|
|
|
|
|
2004-02-17 00:35:17 +01:00
|
|
|
|
2003-09-16 12:43:17 +02:00
|
|
|
uint my_lengthsp_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
|
|
|
const char *ptr, uint length)
|
|
|
|
{
|
|
|
|
const char *end= ptr+length;
|
|
|
|
while (end > ptr && end[-1] == ' ')
|
|
|
|
end--;
|
|
|
|
return (uint) (end-ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-09-25 10:35:21 +02:00
|
|
|
uint my_instr_simple(CHARSET_INFO *cs,
|
2003-10-15 14:34:28 +02:00
|
|
|
const char *b, uint b_length,
|
|
|
|
const char *s, uint s_length,
|
2003-09-25 10:35:21 +02:00
|
|
|
my_match_t *match, uint nmatch)
|
2003-09-19 12:18:19 +02:00
|
|
|
{
|
|
|
|
register const uchar *str, *search, *end, *search_end;
|
|
|
|
|
|
|
|
if (s_length <= b_length)
|
|
|
|
{
|
|
|
|
if (!s_length)
|
2003-09-25 10:35:21 +02:00
|
|
|
{
|
|
|
|
if (nmatch)
|
|
|
|
{
|
|
|
|
match->beg= 0;
|
|
|
|
match->end= 0;
|
2006-12-14 23:51:37 +01:00
|
|
|
match->mb_len= 0;
|
2003-09-25 10:35:21 +02:00
|
|
|
}
|
|
|
|
return 1; /* Empty string is always found */
|
|
|
|
}
|
2003-09-19 12:18:19 +02:00
|
|
|
|
2003-10-15 14:34:28 +02:00
|
|
|
str= (const uchar*) b;
|
|
|
|
search= (const uchar*) s;
|
|
|
|
end= (const uchar*) b+b_length-s_length+1;
|
|
|
|
search_end= (const uchar*) s + s_length;
|
2003-09-19 12:18:19 +02:00
|
|
|
|
2004-02-02 17:25:39 +01:00
|
|
|
skip:
|
2003-09-19 12:18:19 +02:00
|
|
|
while (str != end)
|
|
|
|
{
|
|
|
|
if (cs->sort_order[*str++] == cs->sort_order[*search])
|
|
|
|
{
|
|
|
|
register const uchar *i,*j;
|
|
|
|
|
|
|
|
i= str;
|
|
|
|
j= search+1;
|
|
|
|
|
|
|
|
while (j != search_end)
|
|
|
|
if (cs->sort_order[*i++] != cs->sort_order[*j++])
|
2004-02-02 17:25:39 +01:00
|
|
|
goto skip;
|
2003-09-19 12:18:19 +02:00
|
|
|
|
2003-09-25 10:35:21 +02:00
|
|
|
if (nmatch > 0)
|
|
|
|
{
|
|
|
|
match[0].beg= 0;
|
2005-06-13 12:41:15 +02:00
|
|
|
match[0].end= (uint) (str- (const uchar*)b-1);
|
2006-12-14 23:51:37 +01:00
|
|
|
match[0].mb_len= match[0].end;
|
2003-09-25 10:35:21 +02:00
|
|
|
|
|
|
|
if (nmatch > 1)
|
|
|
|
{
|
|
|
|
match[1].beg= match[0].end;
|
|
|
|
match[1].end= match[0].end+s_length;
|
2006-12-14 23:51:37 +01:00
|
|
|
match[1].mb_len= match[1].end-match[1].beg;
|
2003-09-25 10:35:21 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return 2;
|
2003-09-19 12:18:19 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2003-09-25 10:35:21 +02:00
|
|
|
return 0;
|
2003-09-19 12:18:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-06-11 13:29:16 +02:00
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
int nchars;
|
|
|
|
MY_UNI_IDX uidx;
|
|
|
|
} uni_idx;
|
|
|
|
|
|
|
|
#define PLANE_SIZE 0x100
|
|
|
|
#define PLANE_NUM 0x100
|
|
|
|
#define PLANE_NUMBER(x) (((x)>>8) % PLANE_NUM)
|
|
|
|
|
|
|
|
static int pcmp(const void * f, const void * s)
|
|
|
|
{
|
|
|
|
const uni_idx *F= (const uni_idx*) f;
|
|
|
|
const uni_idx *S= (const uni_idx*) s;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
if (!(res=((S->nchars)-(F->nchars))))
|
|
|
|
res=((F->uidx.from)-(S->uidx.to));
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static my_bool create_fromuni(CHARSET_INFO *cs, void *(*alloc)(uint))
|
|
|
|
{
|
|
|
|
uni_idx idx[PLANE_NUM];
|
|
|
|
int i,n;
|
|
|
|
|
2004-08-12 07:46:16 +02:00
|
|
|
/*
|
|
|
|
Check that Unicode map is loaded.
|
|
|
|
It can be not loaded when the collation is
|
|
|
|
listed in Index.xml but not specified
|
|
|
|
in the character set specific XML file.
|
|
|
|
*/
|
|
|
|
if (!cs->tab_to_uni)
|
|
|
|
return TRUE;
|
|
|
|
|
2004-06-11 13:29:16 +02:00
|
|
|
/* Clear plane statistics */
|
|
|
|
bzero(idx,sizeof(idx));
|
|
|
|
|
|
|
|
/* Count number of characters in each plane */
|
|
|
|
for (i=0; i< 0x100; i++)
|
|
|
|
{
|
|
|
|
uint16 wc=cs->tab_to_uni[i];
|
|
|
|
int pl= PLANE_NUMBER(wc);
|
|
|
|
|
|
|
|
if (wc || !i)
|
|
|
|
{
|
|
|
|
if (!idx[pl].nchars)
|
|
|
|
{
|
|
|
|
idx[pl].uidx.from=wc;
|
|
|
|
idx[pl].uidx.to=wc;
|
|
|
|
}else
|
|
|
|
{
|
|
|
|
idx[pl].uidx.from=wc<idx[pl].uidx.from?wc:idx[pl].uidx.from;
|
|
|
|
idx[pl].uidx.to=wc>idx[pl].uidx.to?wc:idx[pl].uidx.to;
|
|
|
|
}
|
|
|
|
idx[pl].nchars++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sort planes in descending order */
|
|
|
|
qsort(&idx,PLANE_NUM,sizeof(uni_idx),&pcmp);
|
|
|
|
|
|
|
|
for (i=0; i < PLANE_NUM; i++)
|
|
|
|
{
|
|
|
|
int ch,numchars;
|
|
|
|
|
|
|
|
/* Skip empty plane */
|
|
|
|
if (!idx[i].nchars)
|
|
|
|
break;
|
|
|
|
|
|
|
|
numchars=idx[i].uidx.to-idx[i].uidx.from+1;
|
|
|
|
if (!(idx[i].uidx.tab=(uchar*) alloc(numchars * sizeof(*idx[i].uidx.tab))))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
bzero(idx[i].uidx.tab,numchars*sizeof(*idx[i].uidx.tab));
|
|
|
|
|
|
|
|
for (ch=1; ch < PLANE_SIZE; ch++)
|
|
|
|
{
|
|
|
|
uint16 wc=cs->tab_to_uni[ch];
|
|
|
|
if (wc >= idx[i].uidx.from && wc <= idx[i].uidx.to && wc)
|
|
|
|
{
|
|
|
|
int ofs= wc - idx[i].uidx.from;
|
|
|
|
idx[i].uidx.tab[ofs]= ch;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate and fill reverse table for each plane */
|
|
|
|
n=i;
|
|
|
|
if (!(cs->tab_from_uni= (MY_UNI_IDX*) alloc(sizeof(MY_UNI_IDX)*(n+1))))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
for (i=0; i< n; i++)
|
|
|
|
cs->tab_from_uni[i]= idx[i].uidx;
|
|
|
|
|
|
|
|
/* Set end-of-list marker */
|
|
|
|
bzero(&cs->tab_from_uni[i],sizeof(MY_UNI_IDX));
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static my_bool my_cset_init_8bit(CHARSET_INFO *cs, void *(*alloc)(uint))
|
|
|
|
{
|
2005-06-06 13:54:15 +02:00
|
|
|
cs->caseup_multiply= 1;
|
|
|
|
cs->casedn_multiply= 1;
|
2005-10-13 16:16:19 +02:00
|
|
|
cs->pad_char= ' ';
|
2004-06-11 13:29:16 +02:00
|
|
|
return create_fromuni(cs, alloc);
|
|
|
|
}
|
|
|
|
|
2004-06-11 14:50:20 +02:00
|
|
|
static void set_max_sort_char(CHARSET_INFO *cs)
|
|
|
|
{
|
|
|
|
uchar max_char;
|
|
|
|
uint i;
|
|
|
|
|
|
|
|
if (!cs->sort_order)
|
|
|
|
return;
|
|
|
|
|
|
|
|
max_char=cs->sort_order[(uchar) cs->max_sort_char];
|
|
|
|
for (i= 0; i < 256; i++)
|
|
|
|
{
|
|
|
|
if ((uchar) cs->sort_order[i] > max_char)
|
|
|
|
{
|
|
|
|
max_char=(uchar) cs->sort_order[i];
|
|
|
|
cs->max_sort_char= i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static my_bool my_coll_init_simple(CHARSET_INFO *cs,
|
|
|
|
void *(*alloc)(uint) __attribute__((unused)))
|
|
|
|
{
|
|
|
|
set_max_sort_char(cs);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2004-06-11 13:29:16 +02:00
|
|
|
|
2004-09-25 12:29:33 +02:00
|
|
|
longlong my_strtoll10_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
|
|
|
const char *nptr, char **endptr, int *error)
|
|
|
|
{
|
2004-09-25 14:20:50 +02:00
|
|
|
return my_strtoll10(nptr, endptr, error);
|
2004-09-25 12:29:33 +02:00
|
|
|
}
|
|
|
|
|
2004-06-11 13:29:16 +02:00
|
|
|
|
WL#1386 - CTYPE table for unicode character sets
A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
Adding new function
Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
Adding new member into MY_CHARSET_HANDLER
Makefile.am:
Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
new files:
ctype data for unicode,
and the tool to generate it from
a Unicode Character Database file.
include/Makefile.am:
Adding my_uctype.h
include/m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
strings/Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
strings/ctype-big5.c:
Adding new function
strings/ctype-bin.c:
Adding new function
strings/ctype-cp932.c:
Adding new function
strings/ctype-euc_kr.c:
Adding new function
strings/ctype-eucjpms.c:
Adding new function
strings/ctype-gb2312.c:
Adding new function
strings/ctype-gbk.c:
Adding new function
strings/ctype-latin1.c:
Adding new function
strings/ctype-mb.c:
Adding new function
strings/ctype-simple.c:
Adding new function
strings/ctype-sjis.c:
Adding new function
strings/ctype-tis620.c:
Adding new function
strings/ctype-ucs2.c:
Adding new function
strings/ctype-ujis.c:
Adding new function
strings/ctype-utf8.c:
Adding new function
2006-02-02 07:07:47 +01:00
|
|
|
int my_mb_ctype_8bit(CHARSET_INFO *cs, int *ctype,
|
|
|
|
const unsigned char *s, const unsigned char *e)
|
|
|
|
{
|
|
|
|
if (s >= e)
|
|
|
|
{
|
|
|
|
*ctype= 0;
|
2006-03-23 18:41:29 +01:00
|
|
|
return MY_CS_TOOSMALL;
|
WL#1386 - CTYPE table for unicode character sets
A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
Adding new function
Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
Adding new member into MY_CHARSET_HANDLER
Makefile.am:
Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
new files:
ctype data for unicode,
and the tool to generate it from
a Unicode Character Database file.
include/Makefile.am:
Adding my_uctype.h
include/m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
strings/Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
strings/ctype-big5.c:
Adding new function
strings/ctype-bin.c:
Adding new function
strings/ctype-cp932.c:
Adding new function
strings/ctype-euc_kr.c:
Adding new function
strings/ctype-eucjpms.c:
Adding new function
strings/ctype-gb2312.c:
Adding new function
strings/ctype-gbk.c:
Adding new function
strings/ctype-latin1.c:
Adding new function
strings/ctype-mb.c:
Adding new function
strings/ctype-simple.c:
Adding new function
strings/ctype-sjis.c:
Adding new function
strings/ctype-tis620.c:
Adding new function
strings/ctype-ucs2.c:
Adding new function
strings/ctype-ujis.c:
Adding new function
strings/ctype-utf8.c:
Adding new function
2006-02-02 07:07:47 +01:00
|
|
|
}
|
2006-04-11 10:25:02 +02:00
|
|
|
*ctype= cs->ctype[*s + 1];
|
WL#1386 - CTYPE table for unicode character sets
A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
Adding new function
Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
Adding new member into MY_CHARSET_HANDLER
Makefile.am:
Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
new files:
ctype data for unicode,
and the tool to generate it from
a Unicode Character Database file.
include/Makefile.am:
Adding my_uctype.h
include/m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
strings/Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
strings/ctype-big5.c:
Adding new function
strings/ctype-bin.c:
Adding new function
strings/ctype-cp932.c:
Adding new function
strings/ctype-euc_kr.c:
Adding new function
strings/ctype-eucjpms.c:
Adding new function
strings/ctype-gb2312.c:
Adding new function
strings/ctype-gbk.c:
Adding new function
strings/ctype-latin1.c:
Adding new function
strings/ctype-mb.c:
Adding new function
strings/ctype-simple.c:
Adding new function
strings/ctype-sjis.c:
Adding new function
strings/ctype-tis620.c:
Adding new function
strings/ctype-ucs2.c:
Adding new function
strings/ctype-ujis.c:
Adding new function
strings/ctype-utf8.c:
Adding new function
2006-02-02 07:07:47 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-07-20 10:41:12 +02:00
|
|
|
#undef ULONGLONG_MAX
|
|
|
|
/*
|
|
|
|
Needed under MetroWerks Compiler, since MetroWerks compiler does not
|
|
|
|
properly handle a constant expression containing a mod operator
|
|
|
|
*/
|
|
|
|
#if defined(__NETWARE__) && defined(__MWERKS__)
|
|
|
|
static ulonglong ulonglong_max= ~(ulonglong) 0;
|
|
|
|
#define ULONGLONG_MAX ulonglong_max
|
|
|
|
#else
|
|
|
|
#define ULONGLONG_MAX (~(ulonglong) 0)
|
|
|
|
#endif /* __NETWARE__ && __MWERKS__ */
|
|
|
|
|
|
|
|
|
|
|
|
#define CUTOFF (ULONGLONG_MAX / 10)
|
|
|
|
#define CUTLIM (ULONGLONG_MAX % 10)
|
|
|
|
#define DIGITS_IN_ULONGLONG 20
|
|
|
|
|
|
|
|
static ulonglong d10[DIGITS_IN_ULONGLONG]=
|
|
|
|
{
|
|
|
|
1,
|
|
|
|
10,
|
|
|
|
100,
|
|
|
|
1000,
|
|
|
|
10000,
|
|
|
|
100000,
|
|
|
|
1000000,
|
|
|
|
10000000,
|
|
|
|
100000000,
|
|
|
|
1000000000,
|
|
|
|
10000000000ULL,
|
|
|
|
100000000000ULL,
|
|
|
|
1000000000000ULL,
|
|
|
|
10000000000000ULL,
|
|
|
|
100000000000000ULL,
|
|
|
|
1000000000000000ULL,
|
|
|
|
10000000000000000ULL,
|
|
|
|
100000000000000000ULL,
|
|
|
|
1000000000000000000ULL,
|
|
|
|
10000000000000000000ULL
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
Convert a string to unsigned long long integer value
|
|
|
|
with rounding.
|
|
|
|
|
|
|
|
SYNOPSYS
|
|
|
|
my_strntoull10_8bit()
|
|
|
|
cs in pointer to character set
|
|
|
|
str in pointer to the string to be converted
|
|
|
|
length in string length
|
|
|
|
unsigned_flag in whether the number is unsigned
|
|
|
|
endptr out pointer to the stop character
|
|
|
|
error out returned error code
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
This function takes the decimal representation of integer number
|
|
|
|
from string str and converts it to an signed or unsigned
|
|
|
|
long long integer value.
|
|
|
|
Space characters and tab are ignored.
|
|
|
|
A sign character might precede the digit characters.
|
|
|
|
The number may have any number of pre-zero digits.
|
|
|
|
The number may have decimal point and exponent.
|
|
|
|
Rounding is always done in "away from zero" style:
|
|
|
|
0.5 -> 1
|
|
|
|
-0.5 -> -1
|
|
|
|
|
|
|
|
The function stops reading the string str after "length" bytes
|
|
|
|
or at the first character that is not a part of correct number syntax:
|
|
|
|
|
|
|
|
<signed numeric literal> ::=
|
|
|
|
[ <sign> ] <exact numeric literal> [ E [ <sign> ] <unsigned integer> ]
|
|
|
|
|
|
|
|
<exact numeric literal> ::=
|
|
|
|
<unsigned integer> [ <period> [ <unsigned integer> ] ]
|
|
|
|
| <period> <unsigned integer>
|
|
|
|
<unsigned integer> ::= <digit>...
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
Value of string as a signed/unsigned longlong integer
|
|
|
|
|
|
|
|
endptr cannot be NULL. The function will store the end pointer
|
|
|
|
to the stop character here.
|
|
|
|
|
|
|
|
The error parameter contains information how things went:
|
|
|
|
0 ok
|
|
|
|
ERANGE If the the value of the converted number is out of range
|
|
|
|
In this case the return value is:
|
|
|
|
- ULONGLONG_MAX if unsigned_flag and the number was too big
|
|
|
|
- 0 if unsigned_flag and the number was negative
|
|
|
|
- LONGLONG_MAX if no unsigned_flag and the number is too big
|
|
|
|
- LONGLONG_MIN if no unsigned_flag and the number it too big negative
|
|
|
|
|
|
|
|
EDOM If the string didn't contain any digits.
|
|
|
|
In this case the return value is 0.
|
|
|
|
*/
|
|
|
|
|
|
|
|
ulonglong
|
|
|
|
my_strntoull10rnd_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
|
|
|
const char *str, uint length, int unsigned_flag,
|
|
|
|
char **endptr, int *error)
|
|
|
|
{
|
|
|
|
const char *dot, *end9, *beg, *end= str + length;
|
|
|
|
ulonglong ull;
|
|
|
|
ulong ul;
|
|
|
|
unsigned char ch;
|
|
|
|
int shift= 0, digits= 0, negative, addon;
|
|
|
|
|
|
|
|
/* Skip leading spaces and tabs */
|
|
|
|
for ( ; str < end && (*str == ' ' || *str == '\t') ; str++);
|
|
|
|
|
|
|
|
if (str >= end)
|
|
|
|
goto ret_edom;
|
|
|
|
|
|
|
|
if ((negative= (*str == '-')) || *str=='+') /* optional sign */
|
|
|
|
{
|
|
|
|
if (++str == end)
|
|
|
|
goto ret_edom;
|
|
|
|
}
|
|
|
|
|
|
|
|
beg= str;
|
|
|
|
end9= (str + 9) > end ? end : (str + 9);
|
|
|
|
/* Accumulate small number into ulong, for performance purposes */
|
|
|
|
for (ul= 0 ; str < end9 && (ch= (unsigned char) (*str - '0')) < 10; str++)
|
|
|
|
{
|
|
|
|
ul= ul * 10 + ch;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (str >= end) /* Small number without dots and expanents */
|
|
|
|
{
|
|
|
|
*endptr= (char*) str;
|
|
|
|
if (negative)
|
|
|
|
{
|
|
|
|
if (unsigned_flag)
|
|
|
|
{
|
|
|
|
*error= ul ? MY_ERRNO_ERANGE : 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*error= 0;
|
2006-11-30 02:40:42 +01:00
|
|
|
return (ulonglong) (longlong) -(long) ul;
|
2006-07-20 10:41:12 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*error=0;
|
|
|
|
return (ulonglong) ul;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
digits= str - beg;
|
|
|
|
|
|
|
|
/* Continue to accumulate into ulonglong */
|
|
|
|
for (dot= NULL, ull= ul; str < end; str++)
|
|
|
|
{
|
|
|
|
if ((ch= (unsigned char) (*str - '0')) < 10)
|
|
|
|
{
|
|
|
|
if (ull < CUTOFF || (ull == CUTOFF && ch <= CUTLIM))
|
|
|
|
{
|
|
|
|
ull= ull * 10 + ch;
|
|
|
|
digits++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
Adding the next digit would overflow.
|
|
|
|
Remember the next digit in "addon", for rounding.
|
|
|
|
Scan all digits with an optional single dot.
|
|
|
|
*/
|
|
|
|
if (ull == CUTOFF)
|
|
|
|
{
|
|
|
|
ull= ULONGLONG_MAX;
|
|
|
|
addon= 1;
|
|
|
|
str++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
addon= (*str >= '5');
|
|
|
|
for ( ; str < end && (ch= (unsigned char) (*str - '0')) < 10; str++)
|
|
|
|
{
|
|
|
|
if (!dot)
|
|
|
|
shift++;
|
|
|
|
}
|
|
|
|
if (str < end && *str == '.' && !dot)
|
|
|
|
{
|
|
|
|
str++;
|
|
|
|
for ( ; str < end && (ch= (unsigned char) (*str - '0')) < 10; str++);
|
|
|
|
}
|
|
|
|
goto exp;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*str == '.')
|
|
|
|
{
|
|
|
|
if (dot)
|
|
|
|
{
|
|
|
|
/* The second dot character */
|
|
|
|
addon= 0;
|
|
|
|
goto exp;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
dot= str + 1;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Unknown character, exit the loop */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
shift= dot ? dot - str : 0; /* Right shift */
|
|
|
|
addon= 0;
|
|
|
|
|
|
|
|
exp: /* [ E [ <sign> ] <unsigned integer> ] */
|
|
|
|
|
|
|
|
if (!digits)
|
|
|
|
{
|
|
|
|
str= beg;
|
|
|
|
goto ret_edom;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (str < end && (*str == 'e' || *str == 'E'))
|
|
|
|
{
|
|
|
|
str++;
|
|
|
|
if (str < end)
|
|
|
|
{
|
2006-12-14 23:51:37 +01:00
|
|
|
int negative_exp, exponent;
|
2006-07-20 10:41:12 +02:00
|
|
|
if ((negative_exp= (*str == '-')) || *str=='+')
|
|
|
|
{
|
|
|
|
if (++str == end)
|
|
|
|
goto ret_sign;
|
|
|
|
}
|
2006-12-14 23:51:37 +01:00
|
|
|
for (exponent= 0 ;
|
2006-07-20 10:41:12 +02:00
|
|
|
str < end && (ch= (unsigned char) (*str - '0')) < 10;
|
|
|
|
str++)
|
|
|
|
{
|
2006-12-14 23:51:37 +01:00
|
|
|
exponent= exponent * 10 + ch;
|
2006-07-20 10:41:12 +02:00
|
|
|
}
|
2006-12-14 23:51:37 +01:00
|
|
|
shift+= negative_exp ? -exponent : exponent;
|
2006-07-20 10:41:12 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (shift == 0) /* No shift, check addon digit */
|
|
|
|
{
|
|
|
|
if (addon)
|
|
|
|
{
|
|
|
|
if (ull == ULONGLONG_MAX)
|
|
|
|
goto ret_too_big;
|
|
|
|
ull++;
|
|
|
|
}
|
|
|
|
goto ret_sign;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (shift < 0) /* Right shift */
|
|
|
|
{
|
|
|
|
ulonglong d, r;
|
|
|
|
|
|
|
|
if (-shift >= DIGITS_IN_ULONGLONG)
|
|
|
|
goto ret_zero; /* Exponent is a big negative number, return 0 */
|
|
|
|
|
|
|
|
d= d10[-shift];
|
|
|
|
r= (ull % d) * 2;
|
|
|
|
ull /= d;
|
|
|
|
if (r >= d)
|
|
|
|
ull++;
|
|
|
|
goto ret_sign;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (shift > DIGITS_IN_ULONGLONG) /* Huge left shift */
|
|
|
|
{
|
|
|
|
if (!ull)
|
|
|
|
goto ret_sign;
|
|
|
|
goto ret_too_big;
|
|
|
|
}
|
|
|
|
|
|
|
|
for ( ; shift > 0; shift--, ull*= 10) /* Left shift */
|
|
|
|
{
|
|
|
|
if (ull > CUTOFF)
|
|
|
|
goto ret_too_big; /* Overflow, number too big */
|
|
|
|
}
|
|
|
|
|
|
|
|
ret_sign:
|
|
|
|
*endptr= (char*) str;
|
|
|
|
|
|
|
|
if (!unsigned_flag)
|
|
|
|
{
|
|
|
|
if (negative)
|
|
|
|
{
|
|
|
|
if (ull > (ulonglong) LONGLONG_MIN)
|
|
|
|
{
|
|
|
|
*error= MY_ERRNO_ERANGE;
|
|
|
|
return (ulonglong) LONGLONG_MIN;
|
|
|
|
}
|
|
|
|
*error= 0;
|
2006-11-30 02:40:42 +01:00
|
|
|
return (ulonglong) -(longlong) ull;
|
2006-07-20 10:41:12 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (ull > (ulonglong) LONGLONG_MAX)
|
|
|
|
{
|
|
|
|
*error= MY_ERRNO_ERANGE;
|
|
|
|
return (ulonglong) LONGLONG_MAX;
|
|
|
|
}
|
|
|
|
*error= 0;
|
|
|
|
return ull;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Unsigned number */
|
|
|
|
if (negative && ull)
|
|
|
|
{
|
|
|
|
*error= MY_ERRNO_ERANGE;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
*error= 0;
|
|
|
|
return ull;
|
|
|
|
|
|
|
|
ret_zero:
|
|
|
|
*endptr= (char*) str;
|
|
|
|
*error= 0;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret_edom:
|
|
|
|
*endptr= (char*) str;
|
|
|
|
*error= MY_ERRNO_EDOM;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret_too_big:
|
|
|
|
*endptr= (char*) str;
|
|
|
|
*error= MY_ERRNO_ERANGE;
|
|
|
|
return unsigned_flag ?
|
|
|
|
ULONGLONG_MAX :
|
|
|
|
negative ? (ulonglong) LONGLONG_MIN : (ulonglong) LONGLONG_MAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-05-05 18:13:57 +02:00
|
|
|
/*
|
|
|
|
Check if a constant can be propagated
|
|
|
|
|
|
|
|
SYNOPSIS:
|
|
|
|
my_propagate_simple()
|
|
|
|
cs Character set information
|
|
|
|
str String to convert to double
|
|
|
|
length Optional length for string.
|
|
|
|
|
|
|
|
NOTES:
|
|
|
|
Takes the string in the given charset and check
|
|
|
|
if it can be safely propagated in the optimizer.
|
|
|
|
|
|
|
|
create table t1 (
|
|
|
|
s char(5) character set latin1 collate latin1_german2_ci);
|
|
|
|
insert into t1 values (0xf6); -- o-umlaut
|
|
|
|
select * from t1 where length(s)=1 and s='oe';
|
|
|
|
|
|
|
|
The above query should return one row.
|
|
|
|
We cannot convert this query into:
|
|
|
|
select * from t1 where length('oe')=1 and s='oe';
|
|
|
|
|
|
|
|
Currently we don't check the constant itself,
|
|
|
|
and decide not to propagate a constant
|
|
|
|
just if the collation itself allows tricky things
|
|
|
|
like expansions and contractions. In the future
|
|
|
|
we can write a more sophisticated functions to
|
|
|
|
check the constants. For example, 'oa' can always
|
|
|
|
be safety propagated in German2 because unlike
|
|
|
|
'oe' it does not have any special meaning.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
1 if constant can be safely propagated
|
|
|
|
0 if it is not safe to propagate the constant
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
my_bool my_propagate_simple(CHARSET_INFO *cs __attribute__((unused)),
|
|
|
|
const uchar *str __attribute__((unused)),
|
|
|
|
uint length __attribute__((unused)))
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
my_bool my_propagate_complex(CHARSET_INFO *cs __attribute__((unused)),
|
|
|
|
const uchar *str __attribute__((unused)),
|
|
|
|
uint length __attribute__((unused)))
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-23 14:45:52 +02:00
|
|
|
MY_CHARSET_HANDLER my_charset_8bit_handler=
|
|
|
|
{
|
2004-06-11 13:29:16 +02:00
|
|
|
my_cset_init_8bit,
|
2003-05-23 14:45:52 +02:00
|
|
|
NULL, /* ismbchar */
|
2003-10-20 15:53:48 +02:00
|
|
|
my_mbcharlen_8bit, /* mbcharlen */
|
2003-05-23 14:45:52 +02:00
|
|
|
my_numchars_8bit,
|
|
|
|
my_charpos_8bit,
|
2004-02-17 00:35:17 +01:00
|
|
|
my_well_formed_len_8bit,
|
2003-09-16 12:43:17 +02:00
|
|
|
my_lengthsp_8bit,
|
2004-08-25 08:39:43 +02:00
|
|
|
my_numcells_8bit,
|
2003-05-23 14:45:52 +02:00
|
|
|
my_mb_wc_8bit,
|
|
|
|
my_wc_mb_8bit,
|
WL#1386 - CTYPE table for unicode character sets
A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
Adding new function
Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
Adding new member into MY_CHARSET_HANDLER
Makefile.am:
Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
new files:
ctype data for unicode,
and the tool to generate it from
a Unicode Character Database file.
include/Makefile.am:
Adding my_uctype.h
include/m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
strings/Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
strings/ctype-big5.c:
Adding new function
strings/ctype-bin.c:
Adding new function
strings/ctype-cp932.c:
Adding new function
strings/ctype-euc_kr.c:
Adding new function
strings/ctype-eucjpms.c:
Adding new function
strings/ctype-gb2312.c:
Adding new function
strings/ctype-gbk.c:
Adding new function
strings/ctype-latin1.c:
Adding new function
strings/ctype-mb.c:
Adding new function
strings/ctype-simple.c:
Adding new function
strings/ctype-sjis.c:
Adding new function
strings/ctype-tis620.c:
Adding new function
strings/ctype-ucs2.c:
Adding new function
strings/ctype-ujis.c:
Adding new function
strings/ctype-utf8.c:
Adding new function
2006-02-02 07:07:47 +01:00
|
|
|
my_mb_ctype_8bit,
|
2003-05-23 14:45:52 +02:00
|
|
|
my_caseup_str_8bit,
|
|
|
|
my_casedn_str_8bit,
|
|
|
|
my_caseup_8bit,
|
|
|
|
my_casedn_8bit,
|
|
|
|
my_snprintf_8bit,
|
|
|
|
my_long10_to_str_8bit,
|
|
|
|
my_longlong10_to_str_8bit,
|
|
|
|
my_fill_8bit,
|
|
|
|
my_strntol_8bit,
|
|
|
|
my_strntoul_8bit,
|
|
|
|
my_strntoll_8bit,
|
|
|
|
my_strntoull_8bit,
|
|
|
|
my_strntod_8bit,
|
2004-09-25 12:29:33 +02:00
|
|
|
my_strtoll10_8bit,
|
2006-07-20 10:41:12 +02:00
|
|
|
my_strntoull10rnd_8bit,
|
2003-05-23 14:45:52 +02:00
|
|
|
my_scan_8bit
|
|
|
|
};
|
|
|
|
|
|
|
|
MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler =
|
|
|
|
{
|
2004-06-11 14:50:20 +02:00
|
|
|
my_coll_init_simple, /* init */
|
2003-05-23 14:45:52 +02:00
|
|
|
my_strnncoll_simple,
|
|
|
|
my_strnncollsp_simple,
|
|
|
|
my_strnxfrm_simple,
|
2005-01-26 13:34:09 +01:00
|
|
|
my_strnxfrmlen_simple,
|
2003-05-23 14:45:52 +02:00
|
|
|
my_like_range_simple,
|
|
|
|
my_wildcmp_8bit,
|
|
|
|
my_strcasecmp_8bit,
|
2003-09-19 12:18:19 +02:00
|
|
|
my_instr_simple,
|
2005-05-05 18:13:57 +02:00
|
|
|
my_hash_sort_simple,
|
|
|
|
my_propagate_simple
|
2003-05-23 14:45:52 +02:00
|
|
|
};
|