diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 10:56:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 10:56:57 +0300 |
| commit | 5197d81cdb59c3d5881cec9fbc607218ff1bde4f (patch) | |
| tree | 376fc075b124b5016b53f693356969386bf0f18e /client | |
| parent | 55e07d9ade51e9e969f528d903509806142f4d1e (diff) | |
| parent | 618d82064618bda06bcd080af5b664b3d173dbe3 (diff) | |
| download | mariadb-git-5197d81cdb59c3d5881cec9fbc607218ff1bde4f.tar.gz | |
Merge 10.8 into 10.9
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 2 | ||||
| -rw-r--r-- | client/mysqlimport.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index f0a81344206..cd5e65c6161 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -1921,7 +1921,7 @@ that may lead to an endless loop.", &opt_binlog_rows_event_max_encoded_size, 0, GET_ULONG, REQUIRED_ARG, UINT_MAX/4, 256, ULONG_MAX, 0, 256, 0}, #endif - {"verify-binlog-checksum", 'c', "Verify checksum binlog events.", + {"verify-binlog-checksum", 'c', "Verify binlog event checksums.", (uchar**) &opt_verify_binlog_checksum, (uchar**) &opt_verify_binlog_checksum, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"rewrite-db", OPT_REWRITE_DB, diff --git a/client/mysqlimport.c b/client/mysqlimport.c index bcbc366e949..9d30fd989ca 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); |