From a5cfa416b4f5d888db856739c69fbb0124fdd8a3 Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Mon, 6 May 2019 22:31:46 +0200 Subject: Let us close library and only then free defaults. --- client/mysqlimport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/mysqlimport.c') diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 02caf2df198..8f42e6f5a8f 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -514,11 +514,11 @@ static void safe_exit(int error, MYSQL *mysql) if (mysql) mysql_close(mysql); + mysql_library_end(); #ifdef HAVE_SMEM my_free(shared_memory_base_name); #endif free_defaults(argv_to_free); - mysql_library_end(); my_free(opt_password); if (error) sf_leaking_memory= 1; /* dirty exit, some threads are still running */ -- cgit v1.2.1 From 5543b75550962f07b4adcd47a6e52accec0a7d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Sat, 11 May 2019 21:29:06 +0300 Subject: Update FSF Address * Update wrong zip-code --- client/mysqlimport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/mysqlimport.c') diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 9fd96965213..cf857390008 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* -- cgit v1.2.1 From a941e58fb8a1911b1dabcd85c8f906e88466318d Mon Sep 17 00:00:00 2001 From: Robert Bindar Date: Mon, 13 May 2019 12:30:35 +0300 Subject: MDEV-788 mysqlimport should support the ability to disable foreign keys --- client/mysqlimport.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'client/mysqlimport.c') diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 38cec6da668..4cd51477e32 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -48,8 +48,8 @@ static char *add_load_option(char *ptr,const char *object, const char *statement); static my_bool verbose=0,lock_tables=0,ignore_errors=0,opt_delete=0, - replace=0,silent=0,ignore=0,opt_compress=0, - opt_low_priority= 0, tty_password= 0; + replace, silent, ignore, ignore_foreign_keys, + opt_compress, opt_low_priority, tty_password; static my_bool debug_info_flag= 0, debug_check_flag= 0; static uint opt_use_threads=0, opt_local_file=0, my_end_arg= 0; static char *opt_password=0, *current_user=0, @@ -123,6 +123,10 @@ static struct my_option my_long_options[] = ¤t_host, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"ignore", 'i', "If duplicate unique key was found, keep old row.", &ignore, &ignore, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + {"ignore-foreign-keys", 'k', + "Disable foreign key checks while importing the data.", + &ignore_foreign_keys, &ignore_foreign_keys, 0, GET_BOOL, NO_ARG, + 0, 0, 0, 0, 0, 0}, {"ignore-lines", OPT_IGN_LINES, "Ignore first n lines of data infile.", &opt_ignore_lines, &opt_ignore_lines, 0, GET_LL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -487,6 +491,9 @@ static MYSQL *db_connect(char *host, char *database, ignore_errors=0; db_error(mysql); } + if (ignore_foreign_keys) + mysql_query(mysql, "set foreign_key_checks= 0;"); + return mysql; } -- cgit v1.2.1