bk commit into 5.0 tree (msvensson:1.2242)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-31 13:11:21+02:00, msvensson@neptunus.(none) +4 -0
  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@stripped, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +1 -0
    Move test of "perror --ndb" to this file

  mysql-test/r/perror.result@stripped, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +0 -1
    Move test of "perror --ndb" to ndb_basic

  mysql-test/t/ndb_basic.test@stripped, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +10 -0
    Move test of "perror --ndb" to this file

  mysql-test/t/perror.test@stripped, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +0 -5
    Move test of "perror --ndb" to ndb_basic

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.34/mysql-test/r/ndb_basic.result	2006-07-31 13:11:25 +02:00
+++ 1.35/mysql-test/r/ndb_basic.result	2006-07-31 13:11:25 +02:00
@@ -748,3 +748,4 @@ f1	f2	f3
 111111	aaaaaa	1
 222222	bbbbbb	2
 drop table t1;
+Illegal ndb error code: 1186

--- 1.35/mysql-test/t/ndb_basic.test	2006-07-31 13:11:25 +02:00
+++ 1.36/mysql-test/t/ndb_basic.test	2006-07-31 13:11:25 +02:00
@@ -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
+

--- 1.2/mysql-test/r/perror.result	2006-07-31 13:11:25 +02:00
+++ 1.3/mysql-test/r/perror.result	2006-07-31 13:11:25 +02:00
@@ -1,2 +1 @@
-Illegal ndb error code: 1186
 Illegal error code: 1186

--- 1.3/mysql-test/t/perror.test	2006-07-31 13:11:25 +02:00
+++ 1.4/mysql-test/t/perror.test	2006-07-31 13:11:25 +02:00
@@ -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