summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/ndb_dd_advance2.result5
-rwxr-xr-xmysql-test/t/ndb_dd_advance2.test5
2 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/ndb_dd_advance2.result b/mysql-test/r/ndb_dd_advance2.result
index 00490fbc32b..545a356bbb6 100644
--- a/mysql-test/r/ndb_dd_advance2.result
+++ b/mysql-test/r/ndb_dd_advance2.result
@@ -41,12 +41,12 @@ t2 CREATE TABLE `t2` (
) TABLESPACE ts2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
INSERT INTO test.t1 VALUES (1,'111111','aaaaaaaa');
INSERT INTO test.t1 VALUES (2,'222222','bbbbbbbb');
-SELECT * FROM test.t1;
+SELECT * FROM test.t1 ORDER BY a1;
a1 a2 a3
1 111111 aaaaaaaa
2 222222 bbbbbbbb
INSERT INTO test.t2(a1,a2,a3) SELECT * FROM test.t1;
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a1;
a1 a2 a3
1 111111 aaaaaaaa
2 222222 bbbbbbbb
@@ -299,6 +299,7 @@ test.fn2(50, 'new BLOB content')
new BLOB content
DELETE FROM test.t1;
DROP FUNCTION test.fn1;
+DROP FUNCTION test.fn2;
DROP TABLE test.t1;
ALTER TABLESPACE ts1
DROP DATAFILE './table_space1/datafile.dat'
diff --git a/mysql-test/t/ndb_dd_advance2.test b/mysql-test/t/ndb_dd_advance2.test
index c10a009c224..cb33d788684 100755
--- a/mysql-test/t/ndb_dd_advance2.test
+++ b/mysql-test/t/ndb_dd_advance2.test
@@ -58,9 +58,9 @@ DROP TABLE IF EXISTS test.t3;
INSERT INTO test.t1 VALUES (1,'111111','aaaaaaaa');
INSERT INTO test.t1 VALUES (2,'222222','bbbbbbbb');
- SELECT * FROM test.t1;
+ SELECT * FROM test.t1 ORDER BY a1;
INSERT INTO test.t2(a1,a2,a3) SELECT * FROM test.t1;
- SELECT * FROM test.t2;
+ SELECT * FROM test.t2 ORDER BY a1;
DROP TABLE test.t1, test.t2;
@@ -332,6 +332,7 @@ delimiter //;
DELETE FROM test.t1;
DROP FUNCTION test.fn1;
+ DROP FUNCTION test.fn2;
DROP TABLE test.t1;
ALTER TABLESPACE ts1