Commit 65474d92 authored by Marko Mäkelä's avatar Marko Mäkelä

Follow-up to "Fixed wrong printf in mariabackup"

This amends commit 4dc20ff6.

Starting with MariaDB 10.2, InnoDB defines
typedef size_t ulint;

The standard format for size_t uses the z modifier, for example,
"%zu" as in the macro ULINTPF.

"%lu" is wrong for size_t, because sizeof(unsigned long) can be
something else than sizeof(size_t). On Windows, the former would
always be 4 bytes, while size_t would be 4 or 8 bytes.
parent 4fa9eaf4
...@@ -672,7 +672,7 @@ static void backup_optimized_ddl_op(ulint space_id) ...@@ -672,7 +672,7 @@ static void backup_optimized_ddl_op(ulint space_id)
*/ */
static void backup_optimized_ddl_op_fail(ulint space_id) { static void backup_optimized_ddl_op_fail(ulint space_id) {
ut_a(opt_no_lock); ut_a(opt_no_lock);
msg("DDL tracking : optimized DDL on space %lu\n", space_id); msg("DDL tracking : optimized DDL on space %zu\n", space_id);
if (ddl_tracker.tables_in_backup.find(space_id) != ddl_tracker.tables_in_backup.end()) { if (ddl_tracker.tables_in_backup.find(space_id) != ddl_tracker.tables_in_backup.end()) {
msg("ERROR : Optimized DDL operation detected in the late phase of backup." msg("ERROR : Optimized DDL operation detected in the late phase of backup."
"Backup is inconsistent. Remove --no-lock option to fix.\n"); "Backup is inconsistent. Remove --no-lock option to fix.\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment