bk commit into 5.1 tree (gkodinov:1.2585) BUG#33544

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of gkodinov.  When gkodinov does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-05 16:27:35+02:00, gkodinov@stripped +8 -0
  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.

  client/sql_string.cc@stripped, 2008-03-05 16:27:34+02:00, gkodinov@stripped +1 -0
    Bug #33544: moved NOT_FIXED_DEC to the correct header

  client/sql_string.h@stripped, 2008-03-05 16:27:34+02:00, gkodinov@stripped +0 -4
    Bug #33544: moved NOT_FIXED_DEC to the correct header

  include/mysql_com.h@stripped, 2008-03-05 16:27:34+02:00, gkodinov@stripped +1 -0
    Bug #33544: moved NOT_FIXED_DEC to the correct header

  libmysql/libmysql.c@stripped, 2008-03-05 16:27:34+02:00, gkodinov@stripped +0 -3
    Bug #33544: moved NOT_FIXED_DEC to the correct header

  sql/field.h@stripped, 2008-03-05 16:27:34+02:00, gkodinov@stripped +0 -1
    Bug #33544: moved NOT_FIXED_DEC to the correct header

  sql/sql_string.cc@stripped, 2008-03-05 16:27:34+02:00, gkodinov@stripped +1 -0
    Bug #33544: moved NOT_FIXED_DEC to the correct header

  sql/sql_string.h@stripped, 2008-03-05 16:27:34+02:00, gkodinov@stripped +0 -4
    Bug #33544: moved NOT_FIXED_DEC to the correct header

  storage/ndb/include/kernel/signaldata/DictTabInfo.hpp@stripped, 2008-03-05 16:27:34+02:00,
gkodinov@stripped +0 -4
    Bug #33544: moved NOT_FIXED_DEC to the correct header

diff -Nrup a/client/sql_string.cc b/client/sql_string.cc
--- a/client/sql_string.cc	2007-08-13 16:11:09 +03:00
+++ b/client/sql_string.cc	2008-03-05 16:27:34 +02:00
@@ -23,6 +23,7 @@
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
+#include <mysql_com.h>
 #ifdef HAVE_FCONVERT
 #include <floatingpoint.h>
 #endif
diff -Nrup a/client/sql_string.h b/client/sql_string.h
--- a/client/sql_string.h	2007-03-08 05:24:17 +02:00
+++ b/client/sql_string.h	2008-03-05 16:27:34 +02:00
@@ -19,10 +19,6 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
-#ifndef NOT_FIXED_DEC
-#define NOT_FIXED_DEC			31
-#endif
-
 class String;
 int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
 String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
diff -Nrup a/include/mysql_com.h b/include/mysql_com.h
--- a/include/mysql_com.h	2007-12-14 15:01:09 +02:00
+++ b/include/mysql_com.h	2008-03-05 16:27:34 +02:00
@@ -468,4 +468,5 @@ uchar *net_store_length(uchar *pkg, ulon
 #define MYSQL_STMT_HEADER       4
 #define MYSQL_LONG_DATA_HEADER  6
 
+#define NOT_FIXED_DEC           31
 #endif
diff -Nrup a/libmysql/libmysql.c b/libmysql/libmysql.c
--- a/libmysql/libmysql.c	2008-02-28 15:31:00 +02:00
+++ b/libmysql/libmysql.c	2008-03-05 16:27:34 +02:00
@@ -3794,10 +3794,7 @@ static void fetch_float_with_conversion(
     */
     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
     {
       /*
         The 14 below is to ensure that the server and client has the same
diff -Nrup a/sql/field.h b/sql/field.h
--- a/sql/field.h	2008-02-13 11:04:10 +02:00
+++ b/sql/field.h	2008-03-05 16:27:34 +02:00
@@ -23,7 +23,6 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
-#define NOT_FIXED_DEC			31
 #define DATETIME_DEC                     6
 const uint32 max_field_size= (uint32) 4294967295U;
 
diff -Nrup a/sql/sql_string.cc b/sql/sql_string.cc
--- a/sql/sql_string.cc	2007-12-19 20:04:21 +02:00
+++ b/sql/sql_string.cc	2008-03-05 16:27:34 +02:00
@@ -23,6 +23,7 @@
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
+#include <mysql_com.h>
 #ifdef HAVE_FCONVERT
 #include <floatingpoint.h>
 #endif
diff -Nrup a/sql/sql_string.h b/sql/sql_string.h
--- a/sql/sql_string.h	2007-01-24 19:57:01 +02:00
+++ b/sql/sql_string.h	2008-03-05 16:27:34 +02:00
@@ -19,10 +19,6 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
-#ifndef NOT_FIXED_DEC
-#define NOT_FIXED_DEC			31
-#endif
-
 class String;
 int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
 String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
diff -Nrup a/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
--- a/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp	2007-04-26 14:45:26 +03:00
+++ b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp	2008-03-05 16:27:34 +02:00
@@ -30,10 +30,6 @@
 
 #define DECIMAL_MAX_LENGTH ((8 * 9) - 8)
 
-#ifndef NOT_FIXED_DEC
-#define NOT_FIXED_DEC                   31
-#endif
-
 C_MODE_START
 extern int decimal_bin_size(int, int);
 C_MODE_END