Fix after running on a 4-node system.

mysql-test/r/ndb_autodiscover.result:
  Removed one test that needs manual interaction
  Added order by in some places
mysql-test/t/ndb_autodiscover.test:
  Removed one test that needs manual interaction
  Added order by in some places
sql/ha_ndbcluster.cc:
  Using HA_WRONG_ASCII_ORDER to activate filesort on a not "sorted" ordered index.

1 files changed, 2 insertions, 33 deletions

diff --git a/mysql-test/r/ndb_autodiscover.result b/mysql-test/r/ndb_autodiscover.result
index ea2c7464f5d..32d9fd0d80f 100644
--- a/mysql-test/r/ndb_autodiscover.result
+++ b/mysql-test/r/ndb_autodiscover.result
@@ -22,11 +22,11 @@ show status like 'handler_discover%';
 Variable_name	Value
 Handler_discover	2
 flush tables;
-select * from t1;
+select * from t1 order by id;
 id	name
+1	Autodiscover
 2	Auto 2
 3	Discover 3
-1	Autodiscover
 show status like 'handler_discover%';
 Variable_name	Value
 Handler_discover	3
@@ -119,29 +119,6 @@ Variable_name	Value
 Handler_discover	2
 drop table t3;
 flush status;
-create table t4(
-id int not null primary key,
-name char(27)
-) engine=ndb;
-insert into t4 values (1, "Automatic");
-select * from t4;
-id	name
-1	Automatic
-select * from t4;
-ERROR HY000: Got error 284 'Table not defined in transaction coordinator' from ndbcluster
-flush table t4;
-select * from t4;
-ERROR HY000: Can't open file: 't4' (errno: 709)
-show status like 'handler_discover%';
-Variable_name	Value
-Handler_discover	0
-drop table t4;
-flush tables;
-show tables;
-Tables_in_test
-select * from t4;
-ERROR 42S02: Table 'test.t4' doesn't exist
-flush status;
 show status like 'handler_discover%';
 Variable_name	Value
 Handler_discover	0
@@ -157,10 +134,6 @@ ALTER TABLE t5 ADD COLUMN adress char(255) FIRST;
 select * from t5;
 adress	id	name
 NULL	1	Magnus
-flush table t5;
-select * from t5;
-adress	id	name
-NULL	1	Magnus
 insert into t5 values 
 ("Adress for record 2", 2, "Carl-Gustav"), 
 ("Adress for record 3", 3, "Karl-Emil");
@@ -190,10 +163,6 @@ ALTER TABLE t6 ADD COLUMN adress char(255) FIRST;
 select * from t6;
 adress	id	name
 NULL	1	Magnus
-flush table t6;
-select * from t6;
-adress	id	name
-NULL	1	Magnus
 insert into t6 values 
 ("Adress for record 2", 2, "Carl-Gustav"), 
 ("Adress for record 3", 3, "Karl-Emil");