summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2005-12-14 11:34:08 +0100
committerunknown <jonas@perch.ndb.mysql.com>2005-12-14 11:34:08 +0100
commitfd0e953cff95feca3bf60978e0023baae6f46c9f (patch)
tree1b77cc958af0e450485e739522a12fce15740152 /mysql-test
parent32f9246a83f7692a1b7b32dc09c67b885f9b6d67 (diff)
parent9d707d489fb009a84ab07bddcc6392c87bc9ed3d (diff)
downloadmariadb-git-fd0e953cff95feca3bf60978e0023baae6f46c9f.tar.gz
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged ndb/src/kernel/vm/SimulatedBlock.cpp: merge
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ndb_basic.result16
-rw-r--r--mysql-test/t/ndb_basic.test11
2 files changed, 27 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result
index 55cbbd89b3c..9dd75f1390c 100644
--- a/mysql-test/r/ndb_basic.result
+++ b/mysql-test/r/ndb_basic.result
@@ -677,3 +677,19 @@ select * from atablewithareallylongandirritatingname;
a
2
drop table atablewithareallylongandirritatingname;
+create table t1 (f1 varchar(50), f2 text,f3 int, primary key(f1)) engine=NDB;
+insert into t1 (f1,f2,f3)VALUES("111111","aaaaaa",1);
+insert into t1 (f1,f2,f3)VALUES("222222","bbbbbb",2);
+select * from t1 order by f1;
+f1 f2 f3
+111111 aaaaaa 1
+222222 bbbbbb 2
+select * from t1 order by f2;
+f1 f2 f3
+111111 aaaaaa 1
+222222 bbbbbb 2
+select * from t1 order by f3;
+f1 f2 f3
+111111 aaaaaa 1
+222222 bbbbbb 2
+drop table t1;
diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index 0510651a417..12aca73d82b 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/mysql-test/t/ndb_basic.test
@@ -623,3 +623,14 @@ create table atablewithareallylongandirritatingname (a int);
insert into atablewithareallylongandirritatingname values (2);
select * from atablewithareallylongandirritatingname;
drop table atablewithareallylongandirritatingname;
+
+#
+# Bug#15682
+#
+create table t1 (f1 varchar(50), f2 text,f3 int, primary key(f1)) engine=NDB;
+insert into t1 (f1,f2,f3)VALUES("111111","aaaaaa",1);
+insert into t1 (f1,f2,f3)VALUES("222222","bbbbbb",2);
+select * from t1 order by f1;
+select * from t1 order by f2;
+select * from t1 order by f3;
+drop table t1;