diff options
| author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2012-08-07 19:07:13 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2012-08-07 19:07:13 +0530 |
| commit | ffdc4bc8cdac169a406a0d0fbad7b3733a173a32 (patch) | |
| tree | 0f759f6310d21c1917beeb39e70765d26fb2e098 /client/mysqlimport.c | |
| parent | d0affa9bceadeec2129b70b33cfecf75f0c2f572 (diff) | |
| parent | 5ad8292c63a89db63a54f9cfed6ceb3a35656f7b (diff) | |
| download | mariadb-git-ffdc4bc8cdac169a406a0d0fbad7b3733a173a32.tar.gz | |
Merge of patch for Bug#13928675 from mysql-5.1.
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 44807edc970..2045c94619b 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,8 +38,6 @@ 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); @@ -199,7 +197,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000")); 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\ |