diff options
| author | unknown <kaa@polly.(none)> | 2007-11-22 14:39:07 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-11-22 14:39:07 +0300 |
| commit | 0515b1402032b82d99d7bf1a0a90241e69d645a5 (patch) | |
| tree | b9070d1d88813c45dbb89dca5a044e154980cc64 /tests/bug25714.c | |
| parent | 0280133ac034637bcff34a5118f4cb2a6ec4742a (diff) | |
| parent | c4d0901d00bdeb496aeffedc80e6d583711086d3 (diff) | |
| download | mariadb-git-0515b1402032b82d99d7bf1a0a90241e69d645a5.tar.gz | |
Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445
into polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445
BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952:
Auto merged
BitKeeper/deleted/.del-mytest.c~9a99338689e5de8:
Auto merged
BitKeeper/deleted/.del-mytest.dsw~2324698861155335:
Auto merged
libmysql/Makefile.am:
Auto merged
tests/bug25714.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9:
Auto merged
BitKeeper/deleted/.del-mytest_1.c:
Merge rename: BitKeeper/deleted/.del-mytest.c -> BitKeeper/deleted/.del-mytest_1.c
BitKeeper/deleted/.del-myTest-package.dsp~ec9faf3287cbe2b9:
Auto merged
BitKeeper/deleted/.del-myTest-package_ia64.dsp~e423b69f2c624850:
Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
Auto merged
BitKeeper/deleted/.del-myTest_ia64.dsp~b17572b217d092e6:
Auto merged
libmysql/CMakeLists.txt:
Manual merge.
Diffstat (limited to 'tests/bug25714.c')
| -rw-r--r-- | tests/bug25714.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/bug25714.c b/tests/bug25714.c index 4782178e2f2..03d28f59aa4 100644 --- a/tests/bug25714.c +++ b/tests/bug25714.c @@ -29,8 +29,12 @@ int main (int argc, char **argv) MY_INIT(argv[0]); - if (argc != 2) + if (argc != 2 || !strcmp(argv[1], "--help")) + { + fprintf(stderr, "This program is a part of the MySQL test suite. " + "It is not intended to be executed directly by a user.\n"); return -1; + } mysql_init(&conn); if (!mysql_real_connect( |