Merge

sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 6 insertions, 18 deletions

diff --git a/sql/protocol.cc b/sql/protocol.cc
index cfd7a955951..03d02d37d51 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -840,15 +840,9 @@ bool Protocol_simple::store_decimal(const my_decimal *d)
               field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL);
   field_pos++;
 #endif
-  int buf_size= my_decimal_string_length(d);
-  char *buff= (char *)my_alloca(buf_size);
-  String str(buff, buf_size, &my_charset_bin);
-  if (my_decimal2string(E_DEC_FATAL_ERROR, d, 0, 0, 0, &str))
-  {
-    my_afree(buff);
-    return TRUE;
-  }
-  my_afree(buff);
+  char buff[DECIMAL_MAX_STR_LENGTH];
+  String str(buff, sizeof(buff), &my_charset_bin);
+  (void) my_decimal2string(E_DEC_FATAL_ERROR, d, 0, 0, 0, &str);
   return net_store_data(str.ptr(), str.length());
 }
 
@@ -1074,15 +1068,9 @@ bool Protocol_prep::store_decimal(const my_decimal *d)
               field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL);
   field_pos++;
 #endif
-  int buf_size= my_decimal_string_length(d);
-  char *buff= (char *)my_alloca(buf_size);
-  String str(buff, buf_size, &my_charset_bin);
-  if (my_decimal2string(E_DEC_FATAL_ERROR, d, 0, 0, 0, &str))
-  {
-    my_afree(buff);
-    return TRUE;
-  }
-  my_afree(buff);
+  char buff[DECIMAL_MAX_STR_LENGTH];
+  String str(buff, sizeof(buff), &my_charset_bin);
+  (void) my_decimal2string(E_DEC_FATAL_ERROR, d, 0, 0, 0, &str);
   return store(str.ptr(), str.length(), str.charset());
 }