diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-22 11:46:45 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-22 11:46:45 +0400 |
| commit | 3a786df2d5570bdfed426c5922f0f172c8636586 (patch) | |
| tree | 3c1caacc4212bf46d8923b36979abe10a6e32366 /client/mysqltest.cc | |
| parent | aa3d29681e7ac0e005d04b2c18127746b7bd9f9e (diff) | |
| parent | cb5239954b37f9e07e1e11dbc3bfa603a538c690 (diff) | |
| download | mariadb-git-3a786df2d5570bdfed426c5922f0f172c8636586.tar.gz | |
Manual merge from mysql-5.0.
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index ed9172ddbf8..9985b70fcbc 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -24,13 +24,6 @@ http://dev.mysql.com/doc/mysqltest/en/index.html Please keep the test framework tools identical in all versions! - - Written by: - Sasha Pachev <sasha@mysql.com> - Matt Wagner <matt@mysql.com> - Monty - Jani - Holyfoot */ #define MTEST_VERSION "3.3" @@ -53,6 +46,8 @@ #include <signal.h> #include <my_stacktrace.h> +#include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE + #ifdef __WIN__ #include <crtdbg.h> #define SIGNAL_FMT "exception 0x%x" @@ -6125,8 +6120,7 @@ void print_version(void) void usage() { print_version(); - printf("MySQL AB, by Sasha, Matt, Monty & Jani\n"); - printf("This software comes with ABSOLUTELY NO WARRANTY\n\n"); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); printf("Runs a test against the mysql server and compares output with a results file.\n\n"); printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname); my_print_help(my_long_options); |