diff options
| author | Luis Soares <luis.soares@oracle.com> | 2011-07-11 17:13:27 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2011-07-11 17:13:27 +0100 |
| commit | d3324c0098cb440343b64b9b9254531aa52f3ec9 (patch) | |
| tree | 2f2a988be121cc5e70b92b9728f7495e09fcf437 /client | |
| parent | e3fab622c2bedd11415ef069b176e7b953c07660 (diff) | |
| parent | cc17ce723aa4254b7e58b2c5b6e8b0c6b6278f42 (diff) | |
| download | mariadb-git-d3324c0098cb440343b64b9b9254531aa52f3ec9.tar.gz | |
BUG#12695969
Manually merged mysql-5.0 into mysql-5.1.
conflicts
=========
client/mysqlibinlog.cc
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 0f97a4c8dc3..db48675ade2 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -36,6 +36,7 @@ #include "mysql_priv.h" #include "log_event.h" #include "sql_common.h" +#include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE #define BIN_LOG_HEADER_SIZE 4 #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4) @@ -1249,10 +1250,7 @@ static void print_version() static void usage() { print_version(); - puts("By Monty and Sasha, for your professional use\n\ -This software comes with NO WARRANTY: This is free software,\n\ -and you are welcome to modify and redistribute it under the GPL license.\n"); - + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); printf("\ Dumps a MySQL binary log in a format usable for viewing or for piping to\n\ the mysql command line client.\n\n"); |