2011-06-30 17:46:53 +02:00
|
|
|
/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
2005-02-08 23:50:45 +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.
|
2005-02-08 23:50:45 +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
|
2011-06-30 17:46:53 +02:00
|
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
2005-02-19 17:58:27 +01:00
|
|
|
|
2010-12-21 13:00:26 +01:00
|
|
|
#include <my_global.h>
|
2010-03-31 16:05:33 +02:00
|
|
|
#include "sql_priv.h"
|
2006-10-25 17:14:39 +02:00
|
|
|
#include <time.h>
|
|
|
|
|
2010-03-31 16:05:33 +02:00
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
#include "sql_class.h" // THD
|
|
|
|
#endif
|
2005-02-08 23:50:45 +01:00
|
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
report result of decimal operation.
|
2005-02-08 23:50:45 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param result decimal library return code (E_DEC_* see include/decimal.h)
|
2005-02-08 23:50:45 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@todo
|
2005-02-15 15:45:00 +01:00
|
|
|
Fix error messages
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@return
|
2005-02-08 23:50:45 +01:00
|
|
|
result
|
|
|
|
*/
|
2005-02-15 15:45:00 +01:00
|
|
|
|
2005-02-08 23:50:45 +01:00
|
|
|
int decimal_operation_results(int result)
|
|
|
|
{
|
2005-02-15 15:45:00 +01:00
|
|
|
switch (result) {
|
2005-02-08 23:50:45 +01:00
|
|
|
case E_DEC_OK:
|
|
|
|
break;
|
|
|
|
case E_DEC_TRUNCATED:
|
|
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
WARN_DATA_TRUNCATED, ER(WARN_DATA_TRUNCATED),
|
|
|
|
"", (long)-1);
|
|
|
|
break;
|
|
|
|
case E_DEC_OVERFLOW:
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
2005-05-06 16:04:58 +02:00
|
|
|
ER_TRUNCATED_WRONG_VALUE,
|
|
|
|
ER(ER_TRUNCATED_WRONG_VALUE),
|
|
|
|
"DECIMAL", "");
|
2005-02-08 23:50:45 +01:00
|
|
|
break;
|
|
|
|
case E_DEC_DIV_ZERO:
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
2005-02-08 23:50:45 +01:00
|
|
|
ER_DIVISION_BY_ZERO, ER(ER_DIVISION_BY_ZERO));
|
|
|
|
break;
|
|
|
|
case E_DEC_BAD_NUM:
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
2005-02-08 23:50:45 +01:00
|
|
|
ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,
|
|
|
|
ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD),
|
|
|
|
"decimal", "", "", (long)-1);
|
|
|
|
break;
|
|
|
|
case E_DEC_OOM:
|
|
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
DBUG_ASSERT(0);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-05 09:38:57 +02:00
|
|
|
/**
|
|
|
|
@brief Converting decimal to string
|
2005-02-08 23:50:45 +01:00
|
|
|
|
2007-10-05 09:38:57 +02:00
|
|
|
@details Convert given my_decimal to String; allocate buffer as needed.
|
|
|
|
|
|
|
|
@param[in] mask what problems to warn on (mask of E_DEC_* values)
|
|
|
|
@param[in] d the decimal to print
|
|
|
|
@param[in] fixed_prec overall number of digits if ZEROFILL, 0 otherwise
|
|
|
|
@param[in] fixed_dec number of decimal places (if fixed_prec != 0)
|
|
|
|
@param[in] filler what char to pad with (ZEROFILL et al.)
|
|
|
|
@param[out] *str where to store the resulting string
|
2005-02-08 23:50:45 +01:00
|
|
|
|
2007-10-05 09:38:57 +02:00
|
|
|
@return error coce
|
|
|
|
@retval E_DEC_OK
|
|
|
|
@retval E_DEC_TRUNCATED
|
|
|
|
@retval E_DEC_OVERFLOW
|
|
|
|
@retval E_DEC_OOM
|
2005-02-08 23:50:45 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
int my_decimal2string(uint mask, const my_decimal *d,
|
2005-05-05 17:06:49 +02:00
|
|
|
uint fixed_prec, uint fixed_dec,
|
2005-02-15 15:45:00 +01:00
|
|
|
char filler, String *str)
|
2005-02-08 23:50:45 +01:00
|
|
|
{
|
2007-10-05 09:38:57 +02:00
|
|
|
/*
|
|
|
|
Calculate the size of the string: For DECIMAL(a,b), fixed_prec==a
|
|
|
|
holds true iff the type is also ZEROFILL, which in turn implies
|
|
|
|
UNSIGNED. Hence the buffer for a ZEROFILLed value is the length
|
|
|
|
the user requested, plus one for a possible decimal point, plus
|
|
|
|
one if the user only wanted decimal places, but we force a leading
|
2010-11-11 10:46:49 +01:00
|
|
|
zero on them, plus one for the '\0' terminator. Because the type
|
|
|
|
is implicitly UNSIGNED, we do not need to reserve a character for
|
|
|
|
the sign. For all other cases, fixed_prec will be 0, and
|
|
|
|
my_decimal_string_length() will be called instead to calculate the
|
|
|
|
required size of the buffer.
|
2007-10-05 09:38:57 +02:00
|
|
|
*/
|
|
|
|
int length= (fixed_prec
|
|
|
|
? (fixed_prec + ((fixed_prec == fixed_dec) ? 1 : 0) + 1)
|
|
|
|
: my_decimal_string_length(d));
|
2005-02-08 23:50:45 +01:00
|
|
|
int result;
|
|
|
|
if (str->alloc(length))
|
2005-02-15 15:45:00 +01:00
|
|
|
return check_result(mask, E_DEC_OOM);
|
2005-03-21 13:58:34 +01:00
|
|
|
result= decimal2string((decimal_t*) d, (char*) str->ptr(),
|
2005-05-05 17:06:49 +02:00
|
|
|
&length, (int)fixed_prec, fixed_dec,
|
2005-02-15 15:45:00 +01:00
|
|
|
filler);
|
2005-02-08 23:50:45 +01:00
|
|
|
str->length(length);
|
WL#2649 Number-to-string conversions
added:
include/ctype_numconv.inc
mysql-test/include/ctype_numconv.inc
mysql-test/r/ctype_binary.result
mysql-test/t/ctype_binary.test
Adding tests
modified:
mysql-test/r/bigint.result
mysql-test/r/case.result
mysql-test/r/create.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_ucs.result
mysql-test/r/func_gconcat.result
mysql-test/r/func_str.result
mysql-test/r/metadata.result
mysql-test/r/ps_1general.result
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/show_check.result
mysql-test/r/type_datetime.result
mysql-test/r/type_ranges.result
mysql-test/r/union.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/t/ctype_cp1251.test
mysql-test/t/ctype_latin1.test
mysql-test/t/ctype_ucs.test
mysql-test/t/func_str.test
Fixing tests
@ sql/field.cc
- Return str result using my_charset_numeric.
- Using real multi-byte aware str_to_XXX functions
to handle tricky charset values propely (e.g. UCS2)
@ sql/field.h
- Changing derivation of non-string field types to DERIVATION_NUMERIC.
- Changing binary() for numeric/datetime fields to always
return TRUE even if charset is not my_charset_bin. We need
this to keep ha_base_keytype() return HA_KEYTYPE_BINARY.
- Adding BINARY_FLAG into some fields, because it's not
being set automatically anymore with
"my_charset_bin to my_charset_numeric" change.
- Changing derivation for numeric/datetime datatypes to a weaker
value, to make "SELECT concat('string', field)" use character
set of the string literal for the result of the function.
@ sql/item.cc
- Implementing generic val_str_ascii().
- Using max_char_length() instead of direct read of max_length
to make "tricky" charsets like UCS2 work.
NOTE: in the future we'll possibly remove all direct reads of max_length
- Fixing Item_num::safe_charset_converter().
Previously it alligned binary string to
character string (for example by adding leading 0x00
when doing binary->UCS2 conversion). Now it just
converts from my_charset_numbner to "tocs".
- Using val_str_ascii() in Item::get_time() to make UCS2 arguments work.
- Other misc changes
@ sql/item.h
- Changing MY_COLL_CMP_CONV and MY_COLL_ALLOW_CONV to
bit operations instead of hard-coded bit masks.
- Addding new method DTCollation.set_numeric().
- Adding new methods to Item.
- Adding helper functions to make code look nicer:
agg_item_charsets_for_string_result()
agg_item_charsets_for_comparison()
- Changing charset for Item_num-derived items
from my_charset_bin to my_charset_numeric
(which is an alias for latin1).
@ sql/item_cmpfunc.cc
- Using new helper functions
- Other misc changes
@ sql/item_cmpfunc.h
- Fixing strcmp() to return max_length=2.
Previously it returned 1, which was wrong,
because it did not fit '-1'.
@ sql/item_func.cc
- Using new helper functions
- Other minor changes
@ sql/item_func.h
- Removing unused functions
- Adding helper functions
agg_arg_charsets_for_string_result()
agg_arg_charsets_for_comparison()
- Adding set_numeric() into constructors of numeric items.
- Using fix_length_and_charset() and fix_char_length()
instead of direct write to max_length.
@ sql/item_geofunc.cc
- Changing class for Item_func_geometry_type and
Item_func_as_wkt from Item_str_func to
Item_str_ascii_func, to make them return UCS2 result
properly (when character_set_connection=ucs2).
@ sql/item_geofunc.h
- Changing class for Item_func_geometry_type and
Item_func_as_wkt from Item_str_func to
Item_str_ascii_func, to make them return UCS2 result
properly (when @@character_set_connection=ucs2).
@ sql/item_strfunc.cc
- Implementing Item_str_func::val_str().
- Renaming val_str to val_str_ascii for some items,
to make them work with UCS2 properly.
- Using new helper functions
- All single-argument functions that expect string
result now call this method:
agg_arg_charsets_for_string_result(collation, args, 1);
This enables character set conversion to @@character_set_connection
in case of pure numeric input.
@ sql/item_strfunc.h
- Introducing Item_str_ascii_func - for functions
which return pure ASCII data, for performance purposes,
as well as for the cases when the old implementation
of val_str() was heavily 8-bit oriented and implementing
a UCS2-aware version is tricky.
@ sql/item_sum.cc
- Using new helper functions.
@ sql/item_timefunc.cc
- Using my_charset_numeric instead of my_charset_bin.
- Using fix_char_length(), fix_length_and_charset()
and fix_length_and_charset_datetime()
instead of direct write to max_length.
- Using tricky-charset aware function str_to_time_with_warn()
@ sql/item_timefunc.h
- Using new helper functions for charset and length initialization.
- Changing base class for Item_func_get_format() to make
it return UCS2 properly (when character_set_connection=ucs2).
@ sql/item_xmlfunc.cc
- Using new helper function
@ sql/my_decimal.cc
- Adding a new DECIMAL to CHAR converter
with real multibyte support (e.g. UCS2)
@ sql/mysql_priv.h
- Introducing a new derivation level for numeric/datetime data types.
- Adding macros for my_charset_numeric and MY_REPERTOIRE_NUMERIC.
- Adding prototypes for str_set_decimal()
- Adding prototypes for character-set aware str_to_xxx() functions.
@ sql/protocol.cc
- Changing charsetnr to "binary" client-side metadata for
numeric/datetime data types.
@ sql/time.cc
- Adding to_ascii() helper function, to convert a string
in any character set to ascii representation. In the
future can be extended to understand digits written
in various non-Latin word scripts.
- Adding real multy-byte character set aware versions for str_to_XXXX,
to make these these type of queries work correct:
INSERT INTO t1 SET datetime_column=ucs2_expression;
@ strings/ctype-ucs2.c
- endptr was not calculated correctly. INSERTing of UCS2
values into numeric columns returned warnings about
truncated wrong data.
2010-02-11 05:17:25 +01:00
|
|
|
str->set_charset(&my_charset_numeric);
|
2005-02-15 15:45:00 +01:00
|
|
|
return check_result(mask, result);
|
2005-02-08 23:50:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
WL#2649 Number-to-string conversions
added:
include/ctype_numconv.inc
mysql-test/include/ctype_numconv.inc
mysql-test/r/ctype_binary.result
mysql-test/t/ctype_binary.test
Adding tests
modified:
mysql-test/r/bigint.result
mysql-test/r/case.result
mysql-test/r/create.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_ucs.result
mysql-test/r/func_gconcat.result
mysql-test/r/func_str.result
mysql-test/r/metadata.result
mysql-test/r/ps_1general.result
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/show_check.result
mysql-test/r/type_datetime.result
mysql-test/r/type_ranges.result
mysql-test/r/union.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/t/ctype_cp1251.test
mysql-test/t/ctype_latin1.test
mysql-test/t/ctype_ucs.test
mysql-test/t/func_str.test
Fixing tests
@ sql/field.cc
- Return str result using my_charset_numeric.
- Using real multi-byte aware str_to_XXX functions
to handle tricky charset values propely (e.g. UCS2)
@ sql/field.h
- Changing derivation of non-string field types to DERIVATION_NUMERIC.
- Changing binary() for numeric/datetime fields to always
return TRUE even if charset is not my_charset_bin. We need
this to keep ha_base_keytype() return HA_KEYTYPE_BINARY.
- Adding BINARY_FLAG into some fields, because it's not
being set automatically anymore with
"my_charset_bin to my_charset_numeric" change.
- Changing derivation for numeric/datetime datatypes to a weaker
value, to make "SELECT concat('string', field)" use character
set of the string literal for the result of the function.
@ sql/item.cc
- Implementing generic val_str_ascii().
- Using max_char_length() instead of direct read of max_length
to make "tricky" charsets like UCS2 work.
NOTE: in the future we'll possibly remove all direct reads of max_length
- Fixing Item_num::safe_charset_converter().
Previously it alligned binary string to
character string (for example by adding leading 0x00
when doing binary->UCS2 conversion). Now it just
converts from my_charset_numbner to "tocs".
- Using val_str_ascii() in Item::get_time() to make UCS2 arguments work.
- Other misc changes
@ sql/item.h
- Changing MY_COLL_CMP_CONV and MY_COLL_ALLOW_CONV to
bit operations instead of hard-coded bit masks.
- Addding new method DTCollation.set_numeric().
- Adding new methods to Item.
- Adding helper functions to make code look nicer:
agg_item_charsets_for_string_result()
agg_item_charsets_for_comparison()
- Changing charset for Item_num-derived items
from my_charset_bin to my_charset_numeric
(which is an alias for latin1).
@ sql/item_cmpfunc.cc
- Using new helper functions
- Other misc changes
@ sql/item_cmpfunc.h
- Fixing strcmp() to return max_length=2.
Previously it returned 1, which was wrong,
because it did not fit '-1'.
@ sql/item_func.cc
- Using new helper functions
- Other minor changes
@ sql/item_func.h
- Removing unused functions
- Adding helper functions
agg_arg_charsets_for_string_result()
agg_arg_charsets_for_comparison()
- Adding set_numeric() into constructors of numeric items.
- Using fix_length_and_charset() and fix_char_length()
instead of direct write to max_length.
@ sql/item_geofunc.cc
- Changing class for Item_func_geometry_type and
Item_func_as_wkt from Item_str_func to
Item_str_ascii_func, to make them return UCS2 result
properly (when character_set_connection=ucs2).
@ sql/item_geofunc.h
- Changing class for Item_func_geometry_type and
Item_func_as_wkt from Item_str_func to
Item_str_ascii_func, to make them return UCS2 result
properly (when @@character_set_connection=ucs2).
@ sql/item_strfunc.cc
- Implementing Item_str_func::val_str().
- Renaming val_str to val_str_ascii for some items,
to make them work with UCS2 properly.
- Using new helper functions
- All single-argument functions that expect string
result now call this method:
agg_arg_charsets_for_string_result(collation, args, 1);
This enables character set conversion to @@character_set_connection
in case of pure numeric input.
@ sql/item_strfunc.h
- Introducing Item_str_ascii_func - for functions
which return pure ASCII data, for performance purposes,
as well as for the cases when the old implementation
of val_str() was heavily 8-bit oriented and implementing
a UCS2-aware version is tricky.
@ sql/item_sum.cc
- Using new helper functions.
@ sql/item_timefunc.cc
- Using my_charset_numeric instead of my_charset_bin.
- Using fix_char_length(), fix_length_and_charset()
and fix_length_and_charset_datetime()
instead of direct write to max_length.
- Using tricky-charset aware function str_to_time_with_warn()
@ sql/item_timefunc.h
- Using new helper functions for charset and length initialization.
- Changing base class for Item_func_get_format() to make
it return UCS2 properly (when character_set_connection=ucs2).
@ sql/item_xmlfunc.cc
- Using new helper function
@ sql/my_decimal.cc
- Adding a new DECIMAL to CHAR converter
with real multibyte support (e.g. UCS2)
@ sql/mysql_priv.h
- Introducing a new derivation level for numeric/datetime data types.
- Adding macros for my_charset_numeric and MY_REPERTOIRE_NUMERIC.
- Adding prototypes for str_set_decimal()
- Adding prototypes for character-set aware str_to_xxx() functions.
@ sql/protocol.cc
- Changing charsetnr to "binary" client-side metadata for
numeric/datetime data types.
@ sql/time.cc
- Adding to_ascii() helper function, to convert a string
in any character set to ascii representation. In the
future can be extended to understand digits written
in various non-Latin word scripts.
- Adding real multy-byte character set aware versions for str_to_XXXX,
to make these these type of queries work correct:
INSERT INTO t1 SET datetime_column=ucs2_expression;
@ strings/ctype-ucs2.c
- endptr was not calculated correctly. INSERTing of UCS2
values into numeric columns returned warnings about
truncated wrong data.
2010-02-11 05:17:25 +01:00
|
|
|
/**
|
|
|
|
@brief Converting decimal to string with character set conversion
|
|
|
|
|
|
|
|
@details Convert given my_decimal to String; allocate buffer as needed.
|
|
|
|
|
|
|
|
@param[in] mask what problems to warn on (mask of E_DEC_* values)
|
|
|
|
@param[in] val the decimal to print
|
|
|
|
@param[in] fixed_prec overall number of digits if ZEROFILL, 0 otherwise
|
|
|
|
@param[in] fixed_dec number of decimal places (if fixed_prec != 0)
|
|
|
|
@param[in] filler what char to pad with (ZEROFILL et al.)
|
|
|
|
@param[out] *str where to store the resulting string
|
|
|
|
@param[in] cs character set
|
|
|
|
|
|
|
|
@return error coce
|
|
|
|
@retval E_DEC_OK
|
|
|
|
@retval E_DEC_TRUNCATED
|
|
|
|
@retval E_DEC_OVERFLOW
|
|
|
|
@retval E_DEC_OOM
|
|
|
|
|
|
|
|
Would be great to make it a method of the String class,
|
|
|
|
but this would need to include
|
|
|
|
my_decimal.h from sql_string.h and sql_string.cc, which is not desirable.
|
|
|
|
*/
|
|
|
|
bool
|
|
|
|
str_set_decimal(uint mask, const my_decimal *val,
|
|
|
|
uint fixed_prec, uint fixed_dec, char filler,
|
|
|
|
String *str, CHARSET_INFO *cs)
|
|
|
|
{
|
|
|
|
if (!(cs->state & MY_CS_NONASCII))
|
|
|
|
{
|
|
|
|
/* For ASCII-compatible character sets we can use my_decimal2string */
|
|
|
|
my_decimal2string(mask, val, fixed_prec, fixed_dec, filler, str);
|
|
|
|
str->set_charset(cs);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
For ASCII-incompatible character sets (like UCS2) we
|
|
|
|
call my_decimal2string() on a temporary buffer first,
|
|
|
|
and then convert the result to the target character
|
|
|
|
with help of str->copy().
|
|
|
|
*/
|
|
|
|
uint errors;
|
|
|
|
char buf[DECIMAL_MAX_STR_LENGTH];
|
|
|
|
String tmp(buf, sizeof(buf), &my_charset_latin1);
|
|
|
|
my_decimal2string(mask, val, fixed_prec, fixed_dec, filler, &tmp);
|
|
|
|
return str->copy(tmp.ptr(), tmp.length(), &my_charset_latin1, cs, &errors);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-08 23:50:45 +01:00
|
|
|
/*
|
|
|
|
Convert from decimal to binary representation
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
my_decimal2binary()
|
|
|
|
mask error processing mask
|
|
|
|
d number for conversion
|
|
|
|
bin pointer to buffer where to write result
|
|
|
|
prec overall number of decimal digits
|
|
|
|
scale number of decimal digits after decimal point
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
Before conversion we round number if it need but produce truncation
|
|
|
|
error in this case
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
E_DEC_OK
|
|
|
|
E_DEC_TRUNCATED
|
|
|
|
E_DEC_OVERFLOW
|
|
|
|
*/
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
int my_decimal2binary(uint mask, const my_decimal *d, uchar *bin, int prec,
|
2005-02-08 23:50:45 +01:00
|
|
|
int scale)
|
|
|
|
{
|
|
|
|
int err1= E_DEC_OK, err2;
|
|
|
|
my_decimal rounded;
|
|
|
|
my_decimal2decimal(d, &rounded);
|
2005-05-05 17:06:49 +02:00
|
|
|
rounded.frac= decimal_actual_fraction(&rounded);
|
2005-02-08 23:50:45 +01:00
|
|
|
if (scale < rounded.frac)
|
|
|
|
{
|
|
|
|
err1= E_DEC_TRUNCATED;
|
|
|
|
/* decimal_round can return only E_DEC_TRUNCATED */
|
|
|
|
decimal_round(&rounded, &rounded, scale, HALF_UP);
|
|
|
|
}
|
|
|
|
err2= decimal2bin(&rounded, bin, prec, scale);
|
|
|
|
if (!err2)
|
|
|
|
err2= err1;
|
|
|
|
return check_result(mask, err2);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Convert string for decimal when string can be in some multibyte charset
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
str2my_decimal()
|
|
|
|
mask error processing mask
|
|
|
|
from string to process
|
|
|
|
length length of given string
|
|
|
|
charset charset of given string
|
|
|
|
decimal_value buffer for result storing
|
|
|
|
|
|
|
|
RESULT
|
|
|
|
E_DEC_OK
|
|
|
|
E_DEC_TRUNCATED
|
|
|
|
E_DEC_OVERFLOW
|
|
|
|
E_DEC_BAD_NUM
|
|
|
|
E_DEC_OOM
|
|
|
|
*/
|
2005-02-19 17:58:27 +01:00
|
|
|
|
2005-02-08 23:50:45 +01:00
|
|
|
int str2my_decimal(uint mask, const char *from, uint length,
|
|
|
|
CHARSET_INFO *charset, my_decimal *decimal_value)
|
|
|
|
{
|
2005-02-19 17:58:27 +01:00
|
|
|
char *end, *from_end;
|
2005-02-08 23:50:45 +01:00
|
|
|
int err;
|
|
|
|
char buff[STRING_BUFFER_USUAL_SIZE];
|
|
|
|
String tmp(buff, sizeof(buff), &my_charset_bin);
|
|
|
|
if (charset->mbminlen > 1)
|
|
|
|
{
|
|
|
|
uint dummy_errors;
|
|
|
|
tmp.copy(from, length, charset, &my_charset_latin1, &dummy_errors);
|
|
|
|
from= tmp.ptr();
|
|
|
|
length= tmp.length();
|
|
|
|
charset= &my_charset_bin;
|
|
|
|
}
|
2005-02-19 17:58:27 +01:00
|
|
|
from_end= end= (char*) from+length;
|
2005-03-21 13:58:34 +01:00
|
|
|
err= string2decimal((char *)from, (decimal_t*) decimal_value, &end);
|
2005-02-19 17:58:27 +01:00
|
|
|
if (end != from_end && !err)
|
|
|
|
{
|
2005-04-01 14:04:50 +02:00
|
|
|
/* Give warning if there is something other than end space */
|
2005-02-19 17:58:27 +01:00
|
|
|
for ( ; end < from_end; end++)
|
|
|
|
{
|
|
|
|
if (!my_isspace(&my_charset_latin1, *end))
|
|
|
|
{
|
|
|
|
err= E_DEC_TRUNCATED;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2005-10-15 18:57:32 +02:00
|
|
|
check_result_and_overflow(mask, err, decimal_value);
|
2005-02-08 23:50:45 +01:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-03-23 21:08:31 +01:00
|
|
|
my_decimal *date2my_decimal(MYSQL_TIME *ltime, my_decimal *dec)
|
2006-10-25 17:14:39 +02:00
|
|
|
{
|
|
|
|
longlong date;
|
|
|
|
date = (ltime->year*100L + ltime->month)*100L + ltime->day;
|
|
|
|
if (ltime->time_type > MYSQL_TIMESTAMP_DATE)
|
|
|
|
date= ((date*100L + ltime->hour)*100L+ ltime->minute)*100L + ltime->second;
|
2008-11-26 09:28:17 +01:00
|
|
|
if (int2my_decimal(E_DEC_FATAL_ERROR, ltime->neg ? -date : date, FALSE, dec))
|
2006-10-25 17:14:39 +02:00
|
|
|
return dec;
|
|
|
|
if (ltime->second_part)
|
|
|
|
{
|
|
|
|
dec->buf[(dec->intg-1) / 9 + 1]= ltime->second_part * 1000;
|
|
|
|
dec->frac= 6;
|
|
|
|
}
|
|
|
|
return dec;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-05-11 15:19:47 +02:00
|
|
|
void my_decimal_trim(ulong *precision, uint *scale)
|
|
|
|
{
|
|
|
|
if (!(*precision) && !(*scale))
|
|
|
|
{
|
|
|
|
*precision= 10;
|
|
|
|
*scale= 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-08 23:50:45 +01:00
|
|
|
#ifndef DBUG_OFF
|
|
|
|
/* routines for debugging print */
|
|
|
|
|
2005-11-23 19:16:06 +01:00
|
|
|
#define DIG_PER_DEC1 9
|
|
|
|
#define ROUND_UP(X) (((X)+DIG_PER_DEC1-1)/DIG_PER_DEC1)
|
|
|
|
|
2005-02-08 23:50:45 +01:00
|
|
|
/* print decimal */
|
|
|
|
void
|
|
|
|
print_decimal(const my_decimal *dec)
|
|
|
|
{
|
2005-11-23 19:16:06 +01:00
|
|
|
int i, end;
|
|
|
|
char buff[512], *pos;
|
|
|
|
pos= buff;
|
2010-07-09 14:00:17 +02:00
|
|
|
pos+= sprintf(buff, "Decimal: sign: %d intg: %d frac: %d { ",
|
|
|
|
dec->sign(), dec->intg, dec->frac);
|
2005-11-23 19:16:06 +01:00
|
|
|
end= ROUND_UP(dec->frac)+ROUND_UP(dec->intg)-1;
|
|
|
|
for (i=0; i < end; i++)
|
2010-07-09 14:00:17 +02:00
|
|
|
pos+= sprintf(pos, "%09d, ", dec->buf[i]);
|
|
|
|
pos+= sprintf(pos, "%09d }\n", dec->buf[i]);
|
2005-11-23 19:16:06 +01:00
|
|
|
fputs(buff, DBUG_FILE);
|
2005-02-08 23:50:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* print decimal with its binary representation */
|
|
|
|
void
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
print_decimal_buff(const my_decimal *dec, const uchar* ptr, int length)
|
2005-02-08 23:50:45 +01:00
|
|
|
{
|
|
|
|
print_decimal(dec);
|
|
|
|
fprintf(DBUG_FILE, "Record: ");
|
2005-02-19 17:58:27 +01:00
|
|
|
for (int i= 0; i < length; i++)
|
2005-02-08 23:50:45 +01:00
|
|
|
{
|
|
|
|
fprintf(DBUG_FILE, "%02X ", (uint)((uchar *)ptr)[i]);
|
|
|
|
}
|
|
|
|
fprintf(DBUG_FILE, "\n");
|
|
|
|
}
|
2005-02-19 17:58:27 +01:00
|
|
|
|
|
|
|
|
2005-05-05 17:06:49 +02:00
|
|
|
const char *dbug_decimal_as_string(char *buff, const my_decimal *val)
|
2005-02-19 17:58:27 +01:00
|
|
|
{
|
2010-11-11 10:46:49 +01:00
|
|
|
int length= DECIMAL_MAX_STR_LENGTH + 1; /* minimum size for buff */
|
2005-02-19 17:58:27 +01:00
|
|
|
if (!val)
|
2005-05-05 17:06:49 +02:00
|
|
|
return "NULL";
|
|
|
|
(void)decimal2string((decimal_t*) val, buff, &length, 0,0,0);
|
|
|
|
return buff;
|
2005-02-19 17:58:27 +01:00
|
|
|
}
|
|
|
|
|
2005-05-05 17:06:49 +02:00
|
|
|
#endif /*DBUG_OFF*/
|
2005-02-08 23:50:45 +01:00
|
|
|
|
|
|
|
|
|
|
|
#endif /*MYSQL_CLIENT*/
|