Commit eaba3ed3 authored by unknown's avatar unknown
Browse files

Error message changed for buf #12694 as PeterG suggested 


mysql-test/r/type_float.result:
  result fixed
mysql-test/t/type_float.test:
  errno fixed
sql/share/errmsg.txt:
  error message added
sql/sql_parse.cc:
  error message changed
parent ca084e0f

mysql-test/r/type_float.result

+4 −0
Original line number Diff line number Diff line
@@ -225,3 +225,7 @@ select * from t1 where reckey=1.09E2; 
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').

mysql-test/t/type_float.test

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ drop table t1; 
# 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));

sql/share/errmsg.txt

+2 −0
Original line number Diff line number Diff line
@@ -5399,3 +5399,5 @@ ER_DATETIME_FUNCTION_OVERFLOW 22008 
        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')."

sql/sql_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -5760,7 +5760,7 @@ new_create_field(THD *thd, char *field_name, enum_field_types type, 
    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 @@ new_create_field(THD *thd, char *field_name, enum_field_types type, 
    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;