mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
a07e48eca0
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
206 lines
5.1 KiB
C
206 lines
5.1 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
strtol,strtoul,strtoll,strtoull
|
|
convert string to long, unsigned long, long long or unsigned long long.
|
|
strtoxx(char *src,char **ptr,int base)
|
|
converts the string pointed to by src to an long of appropriate long and
|
|
returnes it. It skips leading spaces and tabs (but not newlines, formfeeds,
|
|
backspaces), then it accepts an optional sign and a sequence of digits
|
|
in the specified radix.
|
|
If the value of ptr is not (char **)NULL, a pointer to the character
|
|
terminating the scan is returned in the location pointed to by ptr.
|
|
Trailing spaces will NOT be skipped.
|
|
|
|
If an error is detected, the result will be LONG_MIN, 0 or LONG_MAX,
|
|
(or LONGLONG..) and errno will be set to
|
|
EDOM if there are no digits
|
|
ERANGE if the result would overflow.
|
|
the ptr will be set to src.
|
|
This file is based on the strtol from the the GNU C Library.
|
|
it can be compiled with the UNSIGNED and/or LONGLONG flag set
|
|
*/
|
|
|
|
#include <my_global.h>
|
|
#include "m_string.h"
|
|
#include "m_ctype.h"
|
|
#include "my_sys.h" /* defines errno */
|
|
#include <errno.h>
|
|
|
|
#undef strtoull
|
|
#undef strtoll
|
|
#undef strtoul
|
|
#undef strtol
|
|
#ifdef USE_LONGLONG
|
|
#define UTYPE_MAX (~(ulonglong) 0)
|
|
#define TYPE_MIN LONGLONG_MIN
|
|
#define TYPE_MAX LONGLONG_MAX
|
|
#define longtype longlong
|
|
#define ulongtype ulonglong
|
|
#ifdef USE_UNSIGNED
|
|
#define function ulongtype strtoull
|
|
#else
|
|
#define function longtype strtoll
|
|
#endif
|
|
#else
|
|
#define UTYPE_MAX (ulong) ~0L
|
|
#define TYPE_MIN LONG_MIN
|
|
#define TYPE_MAX LONG_MAX
|
|
#define longtype long
|
|
#define ulongtype unsigned long
|
|
#ifdef USE_UNSIGNED
|
|
#define function ulongtype strtoul
|
|
#else
|
|
#define function longtype strtol
|
|
#endif
|
|
#endif
|
|
|
|
|
|
/* Convert NPTR to an `unsigned long int' or `long int' in base BASE.
|
|
If BASE is 0 the base is determined by the presence of a leading
|
|
zero, indicating octal or a leading "0x" or "0X", indicating hexadecimal.
|
|
If BASE is < 2 or > 36, it is reset to 10.
|
|
If ENDPTR is not NULL, a pointer to the character after the last
|
|
one converted is stored in *ENDPTR. */
|
|
|
|
|
|
function (const char *nptr,char **endptr,int base)
|
|
{
|
|
int negative;
|
|
register ulongtype cutoff;
|
|
register unsigned int cutlim;
|
|
register ulongtype i;
|
|
register const char *s;
|
|
register unsigned char c;
|
|
const char *save;
|
|
int overflow;
|
|
|
|
if (base < 0 || base == 1 || base > 36)
|
|
base = 10;
|
|
|
|
s = nptr;
|
|
|
|
/* Skip white space. */
|
|
while (my_isspace(&my_charset_latin1, *s))
|
|
++s;
|
|
if (*s == '\0')
|
|
{
|
|
goto noconv;
|
|
}
|
|
|
|
/* Check for a sign. */
|
|
negative= 0;
|
|
if (*s == '-')
|
|
{
|
|
negative = 1;
|
|
++s;
|
|
}
|
|
else if (*s == '+')
|
|
{
|
|
++s;
|
|
}
|
|
|
|
|
|
if (base == 16 && s[0] == '0' && my_toupper (&my_charset_latin1, s[1]) == 'X')
|
|
s += 2;
|
|
|
|
/* If BASE is zero, figure it out ourselves. */
|
|
if (base == 0)
|
|
{
|
|
if (*s == '0')
|
|
{
|
|
if (my_toupper (&my_charset_latin1, s[1]) == 'X')
|
|
{
|
|
s += 2;
|
|
base = 16;
|
|
}
|
|
else
|
|
base = 8;
|
|
}
|
|
else
|
|
base = 10;
|
|
}
|
|
|
|
/* Save the pointer so we can check later if anything happened. */
|
|
save = s;
|
|
|
|
cutoff = UTYPE_MAX / (unsigned long int) base;
|
|
cutlim = (uint) (UTYPE_MAX % (unsigned long int) base);
|
|
|
|
overflow = 0;
|
|
i = 0;
|
|
for (c = *s; c != '\0'; c = *++s)
|
|
{
|
|
if (my_isdigit (&my_charset_latin1, c))
|
|
c -= '0';
|
|
else if (my_isalpha (&my_charset_latin1, c))
|
|
c = my_toupper (&my_charset_latin1, c) - 'A' + 10;
|
|
else
|
|
break;
|
|
if (c >= base)
|
|
break;
|
|
/* Check for overflow. */
|
|
if (i > cutoff || (i == cutoff && c > cutlim))
|
|
overflow = 1;
|
|
else
|
|
{
|
|
i *= (ulongtype) base;
|
|
i += c;
|
|
}
|
|
}
|
|
|
|
/* Check if anything actually happened. */
|
|
if (s == save)
|
|
goto noconv;
|
|
|
|
/* Store in ENDPTR the address of one character
|
|
past the last character we converted. */
|
|
if (endptr != NULL)
|
|
*endptr = (char *) s;
|
|
|
|
#ifndef USE_UNSIGNED
|
|
/* Check for a value that is within the range of
|
|
`unsigned long int', but outside the range of `long int'. */
|
|
if (negative)
|
|
{
|
|
if (i > (ulongtype) TYPE_MIN)
|
|
overflow = 1;
|
|
}
|
|
else if (i > (ulongtype) TYPE_MAX)
|
|
overflow = 1;
|
|
#endif
|
|
|
|
if (overflow)
|
|
{
|
|
my_errno=ERANGE;
|
|
#ifdef USE_UNSIGNED
|
|
return UTYPE_MAX;
|
|
#else
|
|
return negative ? TYPE_MIN : TYPE_MAX;
|
|
#endif
|
|
}
|
|
|
|
/* Return the result of the appropriate sign. */
|
|
return (negative ? -((longtype) i) : (longtype) i);
|
|
|
|
noconv:
|
|
/* There was no number to convert. */
|
|
my_errno=EDOM;
|
|
if (endptr != NULL)
|
|
*endptr = (char *) nptr;
|
|
return 0L;
|
|
}
|