diff --git a/mysql-test/r/perror.result b/mysql-test/r/perror.result index 6539955bba6..a26bdb0e068 100644 --- a/mysql-test/r/perror.result +++ b/mysql-test/r/perror.result @@ -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 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