database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/mydev/mysql-5.0

Browse Source 
into  mysql.com:/home/mydev/mysql-5.0-5000
This commit is contained in:
unknown
2005-09-26 13:13:29 +02:00
parent e2829d4199 6f126ba4d0
commit 526a1a92b5
5 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
innobase/row/row0ins.c
View File

@ -591,15 +591,17 @@ row_ins_set_detailed(
FILE* tf = os_file_create_tmpfile(); FILE* tf = os_file_create_tmpfile();
ut_a(tf); if (tf) {
ut_print_name(tf, trx, foreign->foreign_table_name);
ut_print_name(tf, trx, foreign->foreign_table_name); dict_print_info_on_foreign_key_in_create_format(tf, trx,
dict_print_info_on_foreign_key_in_create_format(tf, trx, foreign, FALSE);
foreign, FALSE);
trx_set_detailed_error_from_file(trx, tf); trx_set_detailed_error_from_file(trx, tf);
fclose(tf); fclose(tf);
} else {
trx_set_detailed_error(trx, "temp file creation failed");
}
} }
/************************************************************************* /*************************************************************************

4
mysql-test/r/type_float.result
View File

@ -225,3 +225,7 @@ select * from t1 where reckey=1.09E2;
reckey recdesc reckey recdesc
109 Has 109 as key 109 Has 109 as key
drop table t1; 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').

9
mysql-test/t/type_float.test
View File

@ -147,3 +147,12 @@ select * from t1 where reckey=1.09E2;
drop table t1; drop table t1;
# End of 4.1 tests # End of 4.1 tests
#
# bug #12694 (float(m,d) specifications)
#
--error 1453
create table t1 (s1 float(0,2));
--error 1453
create table t1 (s1 float(1,2));

2
sql/share/errmsg.txt
View File

@ -5419,3 +5419,5 @@ ER_ROW_IS_REFERENCED_2 23000
eng "Cannot delete or update a parent row: a foreign key constraint fails (%.192s)" eng "Cannot delete or update a parent row: a foreign key constraint fails (%.192s)"
ER_NO_REFERENCED_ROW_2 23000 ER_NO_REFERENCED_ROW_2 23000
eng "Cannot add or update a child row: a foreign key constraint fails (%.192s)" eng "Cannot add or update a child row: a foreign key constraint fails (%.192s)"
ER_M_BIGGER_THAN_D 42000 S1009
eng "For float(M,D) or double(M,D), M must be >= D (column '%-.64s')."

16
sql/sql_parse.cc
View File

@ -5814,19 +5814,31 @@ new_create_field(THD *thd, char *field_name, enum_field_types type,
new_field->decimals= NOT_FIXED_DEC; new_field->decimals= NOT_FIXED_DEC;
break; break;
} }
if (!length) if (!length && !decimals)
{ {
new_field->length = FLT_DIG+6; new_field->length = FLT_DIG+6;
new_field->decimals= NOT_FIXED_DEC; new_field->decimals= NOT_FIXED_DEC;
} }
if (new_field->length < new_field->decimals &&
new_field->decimals != NOT_FIXED_DEC)
{
my_error(ER_M_BIGGER_THAN_D, MYF(0), field_name);
DBUG_RETURN(NULL);
}
break; break;
case FIELD_TYPE_DOUBLE: case FIELD_TYPE_DOUBLE:
allowed_type_modifier= AUTO_INCREMENT_FLAG; allowed_type_modifier= AUTO_INCREMENT_FLAG;
if (!length) if (!length && !decimals)
{ {
new_field->length = DBL_DIG+7; new_field->length = DBL_DIG+7;
new_field->decimals=NOT_FIXED_DEC; new_field->decimals=NOT_FIXED_DEC;
} }
if (new_field->length < new_field->decimals &&
new_field->decimals != NOT_FIXED_DEC)
{
my_error(ER_M_BIGGER_THAN_D, MYF(0), field_name);
DBUG_RETURN(NULL);
}
break; break;
case FIELD_TYPE_TIMESTAMP: case FIELD_TYPE_TIMESTAMP:
if (!length) if (!length)