diff options
| author | Tor Didriksen <tor.didriksen@sun.com> | 2010-06-10 13:21:35 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@sun.com> | 2010-06-10 13:21:35 +0200 |
| commit | ce5927dc8943368395cb770639995cc609975b62 (patch) | |
| tree | c5eea40caa24595e89d2a08ff0182c08184189b2 /unittest/mytap/tap.h | |
| parent | 3b3de28816513e97415922bff9230ce5b7982cb5 (diff) | |
| parent | a24df71e95fb6379a3ba86322c9941a82b8d6527 (diff) | |
| download | mariadb-git-ce5927dc8943368395cb770639995cc609975b62.tar.gz | |
Merge fix for Bug#53303 from 5.1-bugteam
text conflict: unittest/examples/Makefile.am
Diffstat (limited to 'unittest/mytap/tap.h')
| -rw-r--r-- | unittest/mytap/tap.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/unittest/mytap/tap.h b/unittest/mytap/tap.h index d8f617c88fb..1f6edfbba07 100644 --- a/unittest/mytap/tap.h +++ b/unittest/mytap/tap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 MySQL AB +/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -90,10 +90,9 @@ extern int skip_big_tests; /** Set number of tests that is planned to execute. - The function also accepts the predefined constant - <code>NO_PLAN</code>. If the function is not called, it is as if - it was called with <code>NO_PLAN</code>, i.e., the test plan will - be printed after all the test lines. + The function also accepts the predefined constant <code>NO_PLAN</code>. + If invoked with this constant -- or not invoked at all -- + the test plan will be printed after all the test lines. The plan() function will install signal handlers for all signals that generate a core, so if you want to override these signals, do |