From e473ffaa7e2c90989706d3c731c88fc6a0136e9c Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 17 Nov 2007 19:42:16 +0100 Subject: [PATCH] Bug#24907: unpredictable (display) precission, if input precission increases post-merge fixes: some things work differently in 5.1 mysql-test/r/type_newdecimal.result: post-merge fix: 5.1 throws different warning here sql/sql_select.cc: post-merge fix: signature has changed in 5.1 --- mysql-test/r/type_newdecimal.result | 2 +- sql/sql_select.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result index 32ee4b810b8..71be41b106f 100644 --- a/mysql-test/r/type_newdecimal.result +++ b/mysql-test/r/type_newdecimal.result @@ -1521,7 +1521,7 @@ f1 DROP TABLE t1; CREATE TABLE t1 SELECT 123451234512345123451234512345123451234512345.678906789067890678906789067890678906789067890 AS f1; Warnings: -Warning 1264 Out of range value adjusted for column 'f1' at row 1 +Warning 1264 Out of range value for column 'f1' at row 1 DESC t1; Field Type Null Key Default Extra f1 decimal(59,30) NO 0.000000000000000000000000000000 diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 65d9e3deddb..97b8f3ff14a 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9219,7 +9219,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table, } new_field= new Field_new_decimal(len, maybe_null, item->name, - table, dec, item->unsigned_flag); + dec, item->unsigned_flag); break; } case ROW_RESULT: