Tests and results fixed with last precision/decimal related modifications

3 files changed, 10 insertions, 1 deletions

diff --git a/mysql-test/t/func_group.test b/mysql-test/t/func_group.test
index 9b6f91067d4..459a40cfe87 100644
--- a/mysql-test/t/func_group.test
+++ b/mysql-test/t/func_group.test
@@ -6,6 +6,9 @@
 drop table if exists t1,t2;
 --enable_warnings
 
+set @sav_dpi= @@div_precision_increment;
+set div_precision_increment= 5;
+show variables like 'div_precision_increment';
 create table t1 (grp int, a bigint unsigned, c char(10) not null);
 insert into t1 values (1,1,"a");
 insert into t1 values (2,2,"b");
@@ -623,4 +626,5 @@ SELECT b/c as v, SUM(a) FROM t1 GROUP BY v;
 SELECT SUM(a) FROM t1 GROUP BY b/c;
 
 DROP TABLE t1;
+set div_precision_increment= @sav_dpi;
 
diff --git a/mysql-test/t/olap.test b/mysql-test/t/olap.test
index 03b26e0b6c6..378f195406b 100644
--- a/mysql-test/t/olap.test
+++ b/mysql-test/t/olap.test
@@ -2,6 +2,10 @@
 drop table if exists t1,t2;
 --enable_warnings
 
+set @sav_dpi= @@div_precision_increment;
+set div_precision_increment= 5;
+show variables like 'div_precision_increment';
+
 create table t1 (product varchar(32), country_id int not null, year int, profit int);
 insert into t1  values ( 'Computer', 2,2000, 1200),
 ( 'TV', 1, 1999, 150),
@@ -191,3 +195,4 @@ SELECT a, SUM(a) m FROM  t1 GROUP BY a WITH ROLLUP;
 SELECT * FROM ( SELECT a, SUM(a) m FROM  t1 GROUP BY a WITH ROLLUP ) t2;
 
 DROP TABLE t1;
+set div_precision_increment= @sav_dpi;
diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test
index f86113ac66b..7ce54847506 100644
--- a/mysql-test/t/type_decimal.test
+++ b/mysql-test/t/type_decimal.test
@@ -308,7 +308,7 @@ create table t1 (d decimal);
 show create table t1;
 drop table t1;
 --error 1063
-create table t1 (d decimal(65,0));
+create table t1 (d decimal(66,0));
 
 #
 # Test example from manual