bk commit into 5.0 tree (evgen:1.2096)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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
  1.2096 06/04/26 22:35:40 evgen@stripped +2 -0
  Merge

  sql/share/errmsg.txt
    1.65 06/04/26 22:35:39 evgen@stripped +0 -0
    SCCS merged

  sql/item.cc
    1.217 06/04/26 22:34:29 evgen@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/tmp_merge-5.0-mysql/RESYNC

--- 1.216/sql/item.cc	2006-04-24 17:49:31 +04:00
+++ 1.217/sql/item.cc	2006-04-26 22:34:29 +04:00
@@ -1991,6 +1991,16 @@
 }
 
 
+void Item_decimal::set_decimal_value(my_decimal *value_par)
+{
+  my_decimal2decimal(value_par, &decimal_value);
+  decimals= (uint8) decimal_value.frac;
+  unsigned_flag= !decimal_value.sign();
+  max_length= my_decimal_precision_to_length(decimal_value.intg + decimals,
+                                             decimals, unsigned_flag);
+}
+
+
 String *Item_float::val_str(String *str)
 {
   // following assert is redundant, because fixed=1 assigned in constructor

--- 1.64/sql/share/errmsg.txt	2006-04-24 17:52:12 +04:00
+++ 1.65/sql/share/errmsg.txt	2006-04-26 22:35:39 +04:00
@@ -5614,6 +5614,6 @@
 ER_MAX_PREPARED_STMT_COUNT_REACHED 42000
         eng "Can't create more than max_prepared_stmt_count statements (current value:
%lu)"
 ER_VIEW_RECURSIVE
-        eng "`%-.64s`.`%-.64s` contain view recursion"
+        eng "`%-.64s`.`%-.64s` contains view recursion"
 ER_NON_GROUPING_FIELD_USED 42000
 	eng "non-grouping field '%-.64s' is used in %-.64s clause"