summaryrefslogtreecommitdiff
path: root/unittest/mysys
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-09-18 13:07:31 +0200
committerSergei Golubchik <sergii@pisem.net>2013-09-18 13:07:31 +0200
commit4ec2e9d7eda78d409d1b017ef4d8928fe9055438 (patch)
tree6c3a74a740d3c1c5f3a7d1f8154d8a791b435b3f /unittest/mysys
parent1a2a9d74fe1256554eceb09bbc6752a6376df87d (diff)
parent197bdbae4db78ba65f3668803bebd3c4a4509ae5 (diff)
downloadmariadb-git-4ec2e9d7eda78d409d1b017ef4d8928fe9055438.tar.gz
5.5 merge and fixes for compiler/test errors
Diffstat (limited to 'unittest/mysys')
-rw-r--r--unittest/mysys/explain_filename-t.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/unittest/mysys/explain_filename-t.cc b/unittest/mysys/explain_filename-t.cc
index 096fdf3b168..69ce51c0446 100644
--- a/unittest/mysys/explain_filename-t.cc
+++ b/unittest/mysys/explain_filename-t.cc
@@ -65,7 +65,7 @@ int main(int argc __attribute__((unused)),char *argv[])
{
MY_INIT(argv[0]);
setup();
- plan(NO_PLAN);
+ plan(22);
test_1("test/t1.ibd",
"Database \"test\", Table \"t1.ibd\"",
@@ -160,6 +160,6 @@ int main(int argc __attribute__((unused)),char *argv[])
EXPLAIN_PARTITIONS_AS_COMMENT);
my_end(0);
- return 0;
+ return exit_status();
}