summaryrefslogtreecommitdiff
path: root/client/mysqltest.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alexander.nozdrin@oracle.com>2011-07-22 11:50:44 +0400
committerAlexander Nozdrin <alexander.nozdrin@oracle.com>2011-07-22 11:50:44 +0400
commitf636987d3bfcd856d6bf844644c20a179b11d097 (patch)
tree1803892d2f884fc5093926d19cf9179cd644c169 /client/mysqltest.cc
parent96a2bbcbdf37b2f543fca1d0d5aee7bf37b31317 (diff)
parentc4dad60a73b601ee2c5c11c7f691b4ac9b37f3a5 (diff)
downloadmariadb-git-f636987d3bfcd856d6bf844644c20a179b11d097.tar.gz
Manual merge from mysql-5.1.
Diffstat (limited to 'client/mysqltest.cc')
-rw-r--r--client/mysqltest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 77289b3380f..cc5dd1f377c 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -22,13 +22,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"
@@ -6438,7 +6431,7 @@ void print_version(void)
void usage()
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2010"));
+ 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);