Merge mysql-5.1-innodb to mysql-5.5-innodb.

This commit is contained in:
Marko Mäkelä 2010-11-03 14:51:15 +02:00
commit 515c24480e

View file

@ -1002,7 +1002,7 @@ rw_lock_debug_print(
rwt = info->lock_type;
fprintf(stderr, "Locked: thread %ld file %s line %ld ",
fprintf(stderr, "Locked: thread %lu file %s line %lu ",
(ulong) os_thread_pf(info->thread_id), info->file_name,
(ulong) info->line);
if (rwt == RW_LOCK_SHARED) {