From 004464a04abf126c0cfd5f297d71c8ead89c14be Mon Sep 17 00:00:00 2001
From: unknown <jmiller/ndbdev@mysql.com/ndb08.mysql.com>
Date: Wed, 6 Sep 2006 19:42:01 +0200
Subject: [PATCH] Updated test case due to pb test failure on sol10-sparc-a'
 -max

---
 mysql-test/r/ndb_dd_disk2memory.result  | 24 +++++++++++++++++-------
 mysql-test/r/ndb_dd_sql_features.result |  4 ++--
 mysql-test/t/ndb_dd_disk2memory.test    | 10 +++++-----
 mysql-test/t/ndb_dd_sql_features.test   |  4 ++--
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/mysql-test/r/ndb_dd_disk2memory.result b/mysql-test/r/ndb_dd_disk2memory.result
index 34f8199f68e..7300665aee8 100644
--- a/mysql-test/r/ndb_dd_disk2memory.result
+++ b/mysql-test/r/ndb_dd_disk2memory.result
@@ -444,21 +444,31 @@ COUNT(a2)	(a2+1)	COUNT(a2)*(a2+0)
 1	21	20
 1	22	21
 a
-4
-3
+8
+7
+6
+5
 a	c
+8	Clavin
+7	Serge
+6	Jeb
+5	Stewart
 4	Martin
-4	Clavin
-3	Serge
 3	Pekka
 a
+2
 3
 4
+5
+6
+7
+8
 a	c
-3	Serge
-3	Pekka
 4	Martin
-4	Clavin
+5	Stewart
+6	Jeb
+7	Serge
+8	Clavin
 a
 1
 1
diff --git a/mysql-test/r/ndb_dd_sql_features.result b/mysql-test/r/ndb_dd_sql_features.result
index 776b8a41c90..2cac0ea3942 100644
--- a/mysql-test/r/ndb_dd_sql_features.result
+++ b/mysql-test/r/ndb_dd_sql_features.result
@@ -13,12 +13,12 @@ ENGINE=NDB;
 CREATE TABLESPACE ts1
 ADD DATAFILE './table_space1/datafile.dat'
  USE LOGFILE GROUP lg
-INITIAL_SIZE 20M
+INITIAL_SIZE 25M
 ENGINE NDB;
 CREATE TABLESPACE ts2
 ADD DATAFILE './table_space2/datafile.dat'
  USE LOGFILE GROUP lg
-INITIAL_SIZE 12M
+INITIAL_SIZE 20M
 ENGINE NDB;
 CREATE TABLE test.t1 (a1 int NOT NULL PRIMARY KEY, a2 VARCHAR(256), a3 BLOB) 
 TABLESPACE ts1 STORAGE DISK  ENGINE=NDB;
diff --git a/mysql-test/t/ndb_dd_disk2memory.test b/mysql-test/t/ndb_dd_disk2memory.test
index 56519645354..0f819b54fb2 100644
--- a/mysql-test/t/ndb_dd_disk2memory.test
+++ b/mysql-test/t/ndb_dd_disk2memory.test
@@ -234,12 +234,12 @@ b CHAR(5), c TEXT, d INT NOT NULL PRIMARY KEY) TABLESPACE
 table_space1 STORAGE DISK ENGINE=NDB;
 
 insert into test.t1 (a,b,c,d) values (1,'a','Jonas',1),(2,'b','Tomas',2),
-(3,'c','Pekka',3),(4,'d','Martin',4),(1,'e','Stewart',5),(2,'f','Jeb',6),
-(3,'g','Serge',7),(4,'h','Clavin',8);
-select distinct a from test.t1 group by b,a having a > 2 order by a desc;
+(3,'c','Pekka',3),(4,'d','Martin',4),(5,'e','Stewart',5),(6,'f','Jeb',6),
+(7,'g','Serge',7),(8,'h','Clavin',8);
+select distinct a from test.t1 group by b,a having a > 4 order by a desc;
 select distinct a,c from test.t1 group by b,c,a having a > 2 order by a desc;
-select distinct a from test.t1 group by b,a having a > 2 order by a asc;
-select distinct a,c from test.t1 group by b,c,a having a > 2 order by a asc;
+select distinct a from test.t1 group by b,a having a > 1 order by a asc;
+select distinct a,c from test.t1 group by b,c,a having a > 3 order by a asc;
 drop table test.t1;
 
 create table test.t1 (a char(1), key(a)) TABLESPACE table_space1 
diff --git a/mysql-test/t/ndb_dd_sql_features.test b/mysql-test/t/ndb_dd_sql_features.test
index c390f30fc85..6c27ecf397b 100644
--- a/mysql-test/t/ndb_dd_sql_features.test
+++ b/mysql-test/t/ndb_dd_sql_features.test
@@ -49,13 +49,13 @@ DROP TABLE IF EXISTS test.t3;
  CREATE TABLESPACE ts1
  ADD DATAFILE './table_space1/datafile.dat'
  USE LOGFILE GROUP lg
- INITIAL_SIZE 20M
+ INITIAL_SIZE 25M
  ENGINE NDB;
 
  CREATE TABLESPACE ts2
  ADD DATAFILE './table_space2/datafile.dat'
  USE LOGFILE GROUP lg
- INITIAL_SIZE 12M
+ INITIAL_SIZE 20M
  ENGINE NDB;
 
  CREATE TABLE test.t1 (a1 int NOT NULL PRIMARY KEY, a2 VARCHAR(256), a3 BLOB)