diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-12 12:21:51 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-12 12:21:51 +0200 |
| commit | 6288ebb699563c86fbc26660f961fa0e381ae871 (patch) | |
| tree | 22118eeb643bce89493c98e11ef020fc49668cbe /client | |
| parent | 6e37987c512b4fb3b11f347b050eeabf30bfae04 (diff) | |
| parent | 4c221321b624e55238c641b515e24ad1091cdc93 (diff) | |
| download | mariadb-git-6288ebb699563c86fbc26660f961fa0e381ae871.tar.gz | |
merge
configure.in:
Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
client/mysqlimport.c:
Auto merged
sql/ha_isam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 1 | ||||
| -rw-r--r-- | client/mysqlimport.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index df329b04481..7734eeadde0 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -530,6 +530,7 @@ static void usage(int version) -h, --host=... Connect to host.\n\ -H, --html Produce HTML output.\n\ -X, --xml Produce XML output.\n\ + --local-infile=[1|0] Enable/disable LOAD DATA LOCAL INFILE\n\ -L, --skip-line-numbers\n\ Don't write line number for errors.\n"); #ifndef __WIN__ diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 497197f0f89..d1140c74358 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -25,7 +25,7 @@ ** * * ** ************************* */ -#define IMPORT_VERSION "2.7" +#define IMPORT_VERSION "2.8" #include "client_priv.h" #include "mysql_version.h" @@ -397,6 +397,9 @@ static MYSQL *db_connect(char *host, char *database, char *user, char *passwd) mysql_init(&mysql_connection); if (opt_compress) mysql_options(&mysql_connection,MYSQL_OPT_COMPRESS,NullS); + if (opt_local_file) + mysql_options(&mysql_connection,MYSQL_OPT_LOCAL_INFILE, + (char*) &opt_local_file); #ifdef HAVE_OPENSSL if (opt_use_ssl) mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, |