summaryrefslogtreecommitdiff
path: root/mysql-test/t/perror.test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-07-26 14:21:40 +0200
committerunknown <msvensson@neptunus.(none)>2006-07-26 14:21:40 +0200
commitb8f3ae0750e797cb9382f720a9ac54f12d85af12 (patch)
tree47fca8bfb619e1cb36e74ed3bae162f855d6848d /mysql-test/t/perror.test
parent352c956626b295e6e17a37c8848f82e15c046f9c (diff)
downloadmariadb-git-b8f3ae0750e797cb9382f720a9ac54f12d85af12.tar.gz
Update test result for perror
mysql-test/r/perror.result: Add error result for 1186 Remove the result for the others mysql-test/t/perror.test: As it's only just interesting to see that perror doesn't crash(and as result varies across platforms), send result to /dev/null
Diffstat (limited to 'mysql-test/t/perror.test')
-rw-r--r--mysql-test/t/perror.test9
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/t/perror.test b/mysql-test/t/perror.test
index 63f2301f18e..e6c9546161b 100644
--- a/mysql-test/t/perror.test
+++ b/mysql-test/t/perror.test
@@ -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