diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-22 11:50:44 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-22 11:50:44 +0400 |
| commit | f636987d3bfcd856d6bf844644c20a179b11d097 (patch) | |
| tree | 1803892d2f884fc5093926d19cf9179cd644c169 /client/mysqlimport.c | |
| parent | 96a2bbcbdf37b2f543fca1d0d5aee7bf37b31317 (diff) | |
| parent | c4dad60a73b601ee2c5c11c7f691b4ac9b37f3a5 (diff) | |
| download | mariadb-git-f636987d3bfcd856d6bf844644c20a179b11d097.tar.gz | |
Manual merge from mysql-5.1.
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index d02c63fbc1f..44807edc970 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -18,14 +18,8 @@ /* ** mysqlimport.c - Imports all given files ** into a table(s). -** -** ************************* -** * * -** * AUTHOR: Monty & Jani * -** * DATE: June 24, 1997 * -** * * -** ************************* */ + #define IMPORT_VERSION "3.7" #include "client_priv.h" @@ -44,6 +38,8 @@ pthread_mutex_t counter_mutex; pthread_cond_t count_threshhold; #endif +#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ + static void db_error_with_table(MYSQL *mysql, char *table); static void db_error(MYSQL *mysql); static char *field_escape(char *to,const char *from,uint length); @@ -203,7 +199,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2010")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); printf("\ Loads tables from text files in various formats. The base name of the\n\ text file must be the name of the table that should be used.\n\ |