diff options
| author | unknown <hf@deer.(none)> | 2003-09-08 21:47:41 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-09-08 21:47:41 +0500 |
| commit | 13f0dc32f46da723d6f5e6e8149392975afbff90 (patch) | |
| tree | 848920dbe0a9d99f4f13879e150169818314dbcc | |
| parent | 8aff7009fd50a6d0fc843a8d0342cbef53f4c839 (diff) | |
| parent | d8f676f54323c7f9ff1908c0ee1fd0fa0e163f38 (diff) | |
| download | mariadb-git-13f0dc32f46da723d6f5e6e8149392975afbff90.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
| -rw-r--r-- | client/mysqldump.c | 2 | ||||
| -rw-r--r-- | client/mysqlimport.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 6ef9d75249d..b28373ccd4a 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -307,7 +307,7 @@ static void write_header(FILE *sql_file, char *db_name) fprintf(sql_file, "-- MySQL dump %s\n--\n", DUMP_VERSION); fprintf(sql_file, "-- Host: %s Database: %s\n", current_host ? current_host : "localhost", db_name ? db_name : ""); - fputs("---------------------------------------------------------\n", + fputs("-- ------------------------------------------------------\n", sql_file); fprintf(sql_file, "-- Server version\t%s\n", mysql_get_server_info(&mysql_connection)); diff --git a/client/mysqlimport.c b/client/mysqlimport.c index d7f6c4c0368..c72e32dd2a7 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -46,7 +46,7 @@ static char *opt_password=0, *current_user=0, *escaped=0, *opt_columns=0, *default_charset; static uint opt_mysql_port=0; static my_string opt_mysql_unix_port=0; -static my_string opt_ignore_lines=0; +static longlong opt_ignore_lines= -1; #include <sslopt-vars.h> static struct my_option my_long_options[] = @@ -90,7 +90,7 @@ static struct my_option my_long_options[] = {"ignore", 'i', "If duplicate unique key was found, keep old row.", (gptr*) &ignore, (gptr*) &ignore, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"ignore-lines", OPT_IGN_LINES, "Ignore first n lines of data infile.", - (gptr*) &opt_ignore_lines, (gptr*) &opt_ignore_lines, 0, GET_STR, + (gptr*) &opt_ignore_lines, (gptr*) &opt_ignore_lines, 0, GET_LL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"lines-terminated-by", OPT_LTB, "Lines in the i.file are terminated by ...", (gptr*) &lines_terminated, (gptr*) &lines_terminated, 0, GET_STR, @@ -290,8 +290,9 @@ static int write_to_table(char *filename, MYSQL *sock) " OPTIONALLY ENCLOSED BY"); end= add_load_option(end, escaped, " ESCAPED BY"); end= add_load_option(end, lines_terminated, " LINES TERMINATED BY"); - if (opt_ignore_lines) - end= strmov(strmov(strmov(end, " IGNORE "), opt_ignore_lines), " LINES"); + if (opt_ignore_lines >= 0) + end= strmov(longlong10_to_str(opt_ignore_lines, + strmov(end, " IGNORE "),10), " LINES"); if (opt_columns) end= strmov(strmov(strmov(end, " ("), opt_columns), ")"); *end= '\0'; |