diff options
| author | unknown <kent@mysql.com> | 2006-02-19 23:47:00 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-02-19 23:47:00 +0100 |
| commit | 77d7fd80d09da95c85e9fd40f6accf3a5c1c1644 (patch) | |
| tree | bee5671055d3b782119a929802c5514b62748464 /client | |
| parent | 1c16fb14abb49a822467d2c8a1e2daebd91120d6 (diff) | |
| parent | 4bc61ff95c3957078f021a53431b56447e0806d1 (diff) | |
| download | mariadb-git-77d7fd80d09da95c85e9fd40f6accf3a5c1c1644.tar.gz | |
Merge
client/Makefile.am:
Auto merged
mysql-test/t/disabled.def:
Auto merged
client/mysqlimport.c:
SCCS merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 14 | ||||
| -rw-r--r-- | client/mysqlimport.c | 6 |
2 files changed, 13 insertions, 7 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 0f702d90c4d..98f9dd019b5 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -27,7 +27,7 @@ INCLUDES = -I$(top_builddir)/include \ -I$(top_srcdir)/regex \ $(openssl_includes) $(yassl_includes) LIBS = @CLIENT_LIBS@ -LDADD= @CLIENT_EXTRA_LDFLAGS@ \ +LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \ $(top_builddir)/libmysql/libmysqlclient.la bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ mysqldump mysqlimport mysqltest mysqlbinlog \ @@ -61,7 +61,7 @@ mysqltestmanagerc_SOURCES= mysqlmanagerc.c $(yassl_dummy_link_fix) mysqlcheck_SOURCES= mysqlcheck.c $(yassl_dummy_link_fix) mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix) mysqlslap_SOURCES= mysqlslap.c \ - $(yassl_dummy_link_fix) + $(yassl_dummy_link_fix) mysqldump_SOURCES= mysqldump.c my_user.c $(yassl_dummy_link_fix) mysqlimport_SOURCES= mysqlimport.c \ $(yassl_dummy_link_fix) @@ -75,14 +75,14 @@ link_sources: for f in $(sql_src) ; do \ rm -f $$f; \ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ - done; \ + done; \ for f in $(strings_src) ; do \ rm -f $(srcdir)/$$f; \ @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \ - done; \ - rm -f $(srcdir)/my_user.c; \ - @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c; - + done; \ + rm -f $(srcdir)/my_user.c; \ + @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 4296ab327dd..edaaf20d98b 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -145,11 +145,13 @@ static struct my_option my_long_options[] = (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, #include <sslopt-longopts.h> +#if 0 {"use-threads", OPT_USE_THREADS, "Load files in parallel. The argument is the number " "of threads to use for loading data.", (gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, +#endif #ifndef DONT_ALLOW_USER_CHANGE {"user", 'u', "User for login if not current user.", (gptr*) ¤t_user, (gptr*) ¤t_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -299,7 +301,11 @@ static int write_to_table(char *filename, MYSQL *mysql) { if (verbose) fprintf(stdout, "Deleting the old data from table %s\n", tablename); +#ifdef HAVE_SNPRINTF snprintf(sql_statement, FN_REFLEN*16+256, "DELETE FROM %s", tablename); +#else + sprintf(sql_statement, "DELETE FROM %s", tablename); +#endif if (mysql_query(mysql, sql_statement)) { db_error_with_table(mysql, tablename); |