Merge 10.2 into 10.3

Author: dr-m

storage/innobase/btr/btr0scrub.cc

@@ -147,10 +147,10 @@ btr_scrub_lock_dict_func(ulint space_id, bool lock_to_close_table,
 
 if (now >= last + 30) {
 fprintf(stderr,
-"WARNING: %s:%u waited " TIMETPF " seconds for"
+"WARNING: %s:%u waited %ld seconds for"
 " dict_sys lock, space: " ULINTPF
 " lock_to_close_table: %d\n",
-file, line, now - start, space_id,
+file, line, long(now - start), space_id,
 lock_to_close_table);
 
 last = now;