bk commit into 5.0 tree (hf:1.1917)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf 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.1917 05/09/04 17:45:02 hf@deer.(none) +4 -0
  Error message changed for buf #12694 as PeterG suggested

  sql/sql_parse.cc
    1.475 05/09/04 17:44:57 hf@deer.(none) +2 -2
    error message changed

  sql/share/errmsg.txt
    1.41 05/09/04 17:44:57 hf@deer.(none) +2 -0
    error message added

  mysql-test/t/type_float.test
    1.24 05/09/04 17:44:57 hf@deer.(none) +2 -2
    errno fixed

  mysql-test/r/type_float.result
    1.39 05/09/04 17:44:57 hf@deer.(none) +4 -0
    result fixed

# 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:	hf
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.0.12694

--- 1.474/sql/sql_parse.cc	Thu Aug 25 19:20:40 2005
+++ 1.475/sql/sql_parse.cc	Sun Sep  4 17:44:57 2005
@@ -5760,7 +5760,7 @@
     if (new_field->length < new_field->decimals &&
         new_field->decimals != NOT_FIXED_DEC)
     {
-      my_error(ER_SCALE_BIGGER_THAN_PRECISION, MYF(0), field_name);
+      my_error(ER_M_BIGGER_THAN_D, MYF(0), field_name);
       DBUG_RETURN(NULL);
     }
     break;
@@ -5774,7 +5774,7 @@
     if (new_field->length < new_field->decimals &&
         new_field->decimals != NOT_FIXED_DEC)
     {
-      my_error(ER_SCALE_BIGGER_THAN_PRECISION, MYF(0), field_name);
+      my_error(ER_M_BIGGER_THAN_D, MYF(0), field_name);
       DBUG_RETURN(NULL);
     }
     break;

--- 1.40/sql/share/errmsg.txt	Tue Aug 23 10:15:00 2005
+++ 1.41/sql/share/errmsg.txt	Sun Sep  4 17:44:57 2005
@@ -5399,3 +5399,5 @@
         eng "Datetime function: %-.32s field overflow"
 ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
         eng "Can't update table '%-.64s' in stored function/trigger because it is already used by statement which invoked this stored function/trigger."
+ER_M_BIGGER_THAN_D 42000 S1009
+        eng "For float(M,D) or double(M,D), M must be >= D (column '%-.64s')."

--- 1.38/mysql-test/r/type_float.result	Thu Jul  7 21:47:13 2005
+++ 1.39/mysql-test/r/type_float.result	Sun Sep  4 17:44:57 2005
@@ -225,3 +225,7 @@
 reckey	recdesc
 109	Has 109 as key
 drop table t1;
+create table t1 (s1 float(0,2));
+ERROR 42000: For float(M,D) or double(M,D), M must be >= D (column 's1').
+create table t1 (s1 float(1,2));
+ERROR 42000: For float(M,D) or double(M,D), M must be >= D (column 's1').

--- 1.23/mysql-test/t/type_float.test	Thu Aug 25 19:20:40 2005
+++ 1.24/mysql-test/t/type_float.test	Sun Sep  4 17:44:57 2005
@@ -152,7 +152,7 @@
 # bug #12694 (float(m,d) specifications)
 #
 
---error 1427
+--error 1443
 create table t1 (s1 float(0,2));
---error 1427
+--error 1443
 create table t1 (s1 float(1,2));