Don't change FLOAT(X+1,X) to FLOAT(X+2,X)

Docs/manual.texi:
  ChangeLog
mysql-test/r/show_check.result:
  Updated test for SHOW COLUMNS
mysql-test/t/show_check.test:
  Updated test for SHOW COLUMNS

2 files changed, 30 insertions, 0 deletions

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 419b2b4ce7e..44e2b2ec1c9 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -92,3 +92,19 @@ t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL default '0',
   PRIMARY KEY  (`a`)
 ) TYPE=MyISAM
+Field	Type	Null	Key	Default	Extra
+a	decimal(9,2)	YES		NULL	
+b	decimal(9,0)	YES		NULL	
+e	double(9,2)	YES		NULL	
+f	double(5,0)	YES		NULL	
+h	float(3,2)	YES		NULL	
+i	float(3,0)	YES		NULL	
+Field	Type	Null	Key	Default	Extra
+c	decimal(10,0)	YES		NULL	
+d	double	YES		NULL	
+f	float	YES		NULL	
+r	double	YES		NULL	
+Field	Type	Null	Key	Default	Extra
+c	decimal(4,3)	YES		NULL	
+d	double(4,3)	YES		NULL	
+f	float(4,3)	YES		NULL	
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 0981b85c91e..e9c7ffa6bb8 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -73,3 +73,17 @@ drop table t1;
 create table t1 (a int not null, primary key (a));
 show create table t1;
 drop table t1;
+
+create table t1 (a decimal(9,2), b decimal (9,0), e double(9,2), f double(5,0), h float(3,2), i float(3,0));
+show columns from t1;
+drop table t1;
+
+# Check auto conversions of types
+
+create table t1 (c decimal, d double, f float, r real);
+show columns from t1;
+drop table t1;
+
+create table t1 (c decimal(3,3), d double(3,3), f float(3,3));
+show columns from t1;
+drop table t1;