After-merge fix: Use matching format

dr-m · dr-m · commit f40c11d88bbe · 2018-02-15T16:10:59.000+02:00
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
@@ -4709,7 +4709,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
       if (!(tab_part_info= tab_part_info->get_clone(thd)))
         DBUG_RETURN(TRUE);
     }
-    DBUG_PRINT("info", ("*fast_alter_table flags: 0x%x", flags));
+    DBUG_PRINT("info", ("*fast_alter_table flags: 0x%llx", flags));
     if ((alter_info->flags & Alter_info::ALTER_ADD_PARTITION) ||
         (alter_info->flags & Alter_info::ALTER_REORGANIZE_PARTITION))
     {

Original file line number	Diff line number	Diff line change
`@@ -4709,7 +4709,7 @@ uint prep_alter_part_table(THD thd, TABLE table, Alter_info *alter_info,`
`4709`	`4709`	`if (!(tab_part_info= tab_part_info->get_clone(thd)))`
`4710`	`4710`	`DBUG_RETURN(TRUE);`
`4711`	`4711`	`}`
`4712`		`- DBUG_PRINT("info", ("*fast_alter_table flags: 0x%x", flags));`
	`4712`	`+ DBUG_PRINT("info", ("*fast_alter_table flags: 0x%llx", flags));`
`4713`	`4713`	`if ((alter_info->flags & Alter_info::ALTER_ADD_PARTITION) \|\|`
`4714`	`4714`	`(alter_info->flags & Alter_info::ALTER_REORGANIZE_PARTITION))`
`4715`	`4715`	`{`