diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-06 09:22:39 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-06 09:22:39 +0300 |
commit | 6dc157f8a6a6f12fcb6877c65c23a2e7692e38fe (patch) | |
tree | a143f8592261301d3e0a42dcc33bddc3634227d9 /client | |
parent | 286acaa796cd3c7e7a8d20eba20673ae1ab70b61 (diff) | |
parent | 8d6421aa48de5f1581e0706cc65c3515954bcead (diff) | |
download | mariadb-git-6dc157f8a6a6f12fcb6877c65c23a2e7692e38fe.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqlimport.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 395b64d1119..185cf69b9b6 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2011, 2017, MariaDB + Copyright (c) 2011, 2022, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -382,11 +382,7 @@ 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); |