diff options
author | Magne Mahre <magne.mahre@sun.com> | 2009-11-11 21:19:41 +0100 |
---|---|---|
committer | Magne Mahre <magne.mahre@sun.com> | 2009-11-11 21:19:41 +0100 |
commit | 56e603a31bfb396dc87fd9c9765b34b181fa1b84 (patch) | |
tree | 0ed4dcde53a4fde2d779524fa20ba363af8846c5 /libmysql/libmysql.c | |
parent | a176b249129878c2f05ae2b5e9edf8322103fc67 (diff) | |
parent | 1d20b6ffd548d87f20ae999d54fef41f0c696ee0 (diff) | |
download | mariadb-git-56e603a31bfb396dc87fd9c9765b34b181fa1b84.tar.gz |
Bug #33544 UDF_INIT member decimals initialized wrong with
STRING_RESULT argument
There is a "magic" number for precision : NOT_FIXED_DEC.
This means that the precision is not a fixed number.
But this constant was re-defined in several files and
was not available to the UDF developers.
Moved the NOT_FIXED_DEC definition to the correct header
and removed the redundant definitions.
Backported to 5.6.0 (mysql-next-mr-runtime)
client/sql_string.h:
moved NOT_FIXED_DEC to the correct header
include/mysql_com.h:
moved NOT_FIXED_DEC to the correct header
libmysql/libmysql.c:
moved NOT_FIXED_DEC to the correct header
sql/field.h:
moved NOT_FIXED_DEC to the correct header
sql/sql_string.h:
moved NOT_FIXED_DEC to the correct header
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
moved NOT_FIXED_DEC to the correct header
Diffstat (limited to 'libmysql/libmysql.c')
-rw-r--r-- | libmysql/libmysql.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 56a2e492226..a8239137f98 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -3464,10 +3464,7 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, */ char buff[MAX_DOUBLE_STRING_REP_LENGTH]; char *end; - /* TODO: move this to a header shared between client and server. */ -#define NOT_FIXED_DEC 31 if (field->decimals >= NOT_FIXED_DEC) -#undef NOT_FIXED_DEC { /* DBL_DIG below is to ensure that the server and client has the same |