From 823ead0775f70253a7a85d38fc2812ae4ba920bd Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Mon, 31 Jul 2006 13:11:21 +0200
Subject: [PATCH] perror returns 2 if it does not understand the option --ndb
 Move that perror test to ndb_basic so it's only run when there is support for
 --ndb

---
 mysql-test/r/ndb_basic.result |  1 +
 mysql-test/r/perror.result    |  1 -
 mysql-test/t/ndb_basic.test   | 10 ++++++++++
 mysql-test/t/perror.test      |  5 -----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result
index 09c4f9b29f9..d2111db24fe 100644
--- a/mysql-test/r/ndb_basic.result
+++ b/mysql-test/r/ndb_basic.result
@@ -748,3 +748,4 @@ f1	f2	f3
 111111	aaaaaa	1
 222222	bbbbbb	2
 drop table t1;
+Illegal ndb error code: 1186
diff --git a/mysql-test/r/perror.result b/mysql-test/r/perror.result
index a26bdb0e068..05639197391 100644
--- a/mysql-test/r/perror.result
+++ b/mysql-test/r/perror.result
@@ -1,2 +1 @@
-Illegal ndb error code: 1186
 Illegal error code: 1186
diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index 5d79d5eb9f9..6c1a4e44f4b 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/mysql-test/t/ndb_basic.test
@@ -700,3 +700,13 @@ select * from t1 order by f1;
 select * from t1 order by f2;
 select * from t1 order by f3;
 drop table t1;
+
+#
+# Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror
+#
+
+# As long there is no error code 1186 defined by NDB
+# we should get a message "Illegal ndb error code: 1186"
+--error 1
+--exec $MY_PERROR --ndb 1186 2>&1
+
diff --git a/mysql-test/t/perror.test b/mysql-test/t/perror.test
index e6c9546161b..21297fccd95 100644
--- a/mysql-test/t/perror.test
+++ b/mysql-test/t/perror.test
@@ -13,11 +13,6 @@ enable_query_log;
 # Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror
 #
 
-# As long there is no error code 1186 defined by NDB
-# we should get a message "Illegal ndb error code: 1186"
---error 1
---exec $MY_PERROR --ndb 1186 2>&1
-
 # As there is an error code defined for 1186, expect error
 --error 1
 --exec $MY_PERROR 1186 2>&1