Commit 414dda49 authored by unknown's avatar unknown

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:
  Move test of "perror --ndb" to this file
mysql-test/r/perror.result:
  Move test of "perror --ndb" to ndb_basic
mysql-test/t/ndb_basic.test:
  Move test of "perror --ndb" to this file
mysql-test/t/perror.test:
  Move test of "perror --ndb" to ndb_basic
parent f0aec16d
...@@ -748,3 +748,4 @@ f1 f2 f3 ...@@ -748,3 +748,4 @@ f1 f2 f3
111111 aaaaaa 1 111111 aaaaaa 1
222222 bbbbbb 2 222222 bbbbbb 2
drop table t1; drop table t1;
Illegal ndb error code: 1186
Illegal ndb error code: 1186
Illegal error code: 1186 Illegal error code: 1186
...@@ -700,3 +700,13 @@ select * from t1 order by f1; ...@@ -700,3 +700,13 @@ select * from t1 order by f1;
select * from t1 order by f2; select * from t1 order by f2;
select * from t1 order by f3; select * from t1 order by f3;
drop table t1; 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
...@@ -13,11 +13,6 @@ enable_query_log; ...@@ -13,11 +13,6 @@ enable_query_log;
# Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror # 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 # As there is an error code defined for 1186, expect error
--error 1 --error 1
--exec $MY_PERROR 1186 2>&1 --exec $MY_PERROR 1186 2>&1
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment