bk commit into 5.0 tree (msvensson:1.2236)

[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-26 14:21:40+02:00, msvensson@neptunus.(none) +2 -0
  Update test result for perror

  mysql-test/r/perror.result@stripped, 2006-07-26 14:21:38+02:00, msvensson@neptunus.(none) +2
-3
    Add error result for 1186
    Remove the result for the others

  mysql-test/t/perror.test@stripped, 2006-07-26 14:21:38+02:00, msvensson@neptunus.(none) +5 -4
    As it's only just interesting to see that perror doesn't crash(and as result varies
across platforms), send result to /dev/null

# 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/my50-m-bug20145

--- 1.1/mysql-test/r/perror.result	2006-07-26 14:21:45 +02:00
+++ 1.2/mysql-test/r/perror.result	2006-07-26 14:21:45 +02:00
@@ -1,3 +1,2 @@
-MySQL error code 150: Foreign key constraint is incorrectly formed
-Is a named type file
-Didn't find key on read or update
+Illegal ndb error code: 1186
+Illegal error code: 1186

--- 1.2/mysql-test/t/perror.test	2006-07-26 14:21:45 +02:00
+++ 1.3/mysql-test/t/perror.test	2006-07-26 14:21:45 +02:00
@@ -6,8 +6,8 @@ disable_query_log;
 eval select LENGTH("$MY_PERROR") > 0 as "have_perror";
 enable_query_log;
 
---exec $MY_PERROR 150
---exec $MY_PERROR --silent 120
+--exec $MY_PERROR 150 > /dev/null
+--exec $MY_PERROR --silent 120 > /dev/null
 
 #
 # Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror
@@ -16,7 +16,8 @@ enable_query_log;
 # 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
+--exec $MY_PERROR --ndb 1186 2>&1
 
 # As there is an error code defined for 1186, expect error
---exec $MY_PERROR 1186
+--error 1
+--exec $MY_PERROR 1186 2>&1