summaryrefslogtreecommitdiff
path: root/client/mysqltest.cc
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2009-10-08 11:30:03 +0200
committerBjorn Munch <Bjorn.Munch@sun.com>2009-10-08 11:30:03 +0200
commit9edd40c87e355890aabec9b7961a992c6ddc9558 (patch)
treedd266eeb9fdf5dfd38c8697d140324ca70880f1b /client/mysqltest.cc
parentb1b958ffab63f4988dc0a8331acd3f3bf357994f (diff)
downloadmariadb-git-9edd40c87e355890aabec9b7961a992c6ddc9558.tar.gz
Bug #47218 mysqltest ignores "error" command inside if inside loop
This was affected by same problem as append_file etc. Added Q_ERROR to special handling, and added small test
Diffstat (limited to 'client/mysqltest.cc')
-rw-r--r--client/mysqltest.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index aaa08441e51..00131621bf5 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -7708,6 +7708,7 @@ int main(int argc, char **argv)
if (!ok_to_do)
{
if (command->type == Q_SOURCE ||
+ command->type == Q_ERROR ||
command->type == Q_WRITE_FILE ||
command->type == Q_APPEND_FILE ||
command->type == Q_PERL)