diff options
| author | unknown <monty@narttu.mysql.fi> | 2000-11-15 23:00:06 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2000-11-15 23:00:06 +0200 |
| commit | 9a846a52ae62f701c2d54d3f468e2ead393acf91 (patch) | |
| tree | 622092bf596b26a1f762020729c03d573a5b216d /client/mysqlimport.c | |
| parent | f3d2341f1f30384d92b285c1e421d8c599ee2b79 (diff) | |
| download | mariadb-git-9a846a52ae62f701c2d54d3f468e2ead393acf91.tar.gz | |
changed to use IO_CACHE instead of FILE
BitKeeper/deleted/.del-mf_reccache.c:
***MISSING WEAVE***
Docs/manual.texi:
Fix licence information + update changelog
client/mysqlimport.c:
Fixed typo
client/sql_string.cc:
Added support for IO_CACHE
client/sql_string.h:
Added support for IO_CACHE
include/my_sys.h:
More options for IO_CACHE
mysql.proj:
Update
mysys/Makefile.am:
Remoced mf_reccache.c
mysys/mf_cache.c:
Fixed return value on error and optimzed used of write cache files
mysys/mf_iocache.c:
More options for IO_CACHE
mysys/my_vsnprintf.c:
Optimized code
sql/mf_iocache.cc:
merge with mf_iocache.c
sql/net_pkg.cc:
cleanup
sql/sql_class.cc:
Support for transaction safe log files
sql/sql_string.cc:
Added support for IO_CACHE
sql/sql_string.h:
Added support for IO_CACHE
sql/time.cc:
cleanup
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 68cd84fbbb7..d00c99d4061 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -25,7 +25,7 @@ ** * * ** ************************* */ -#define IMPORT_VERSION "2.5" +#define IMPORT_VERSION "2.6" #include <global.h> #include <my_sys.h> @@ -125,7 +125,7 @@ file. The SQL command 'LOAD DATA INFILE' is used to import the rows.\n"); Give the column names in a comma separated list.\n\ This is same as giving columns to LOAD DATA INFILE.\n\ -C, --compress Use compression in server/client protocol\n\ - -d, --delete Deletes first all rows from table.\n\ + -d, --delete First delete all rows from table.\n\ -f, --force Continue even if we get an sql-error.\n\ -h, --host=... Connect to host.\n\ -i, --ignore If duplicate unique key was found, keep old row.\n\ |