Commit 9fe42e98 authored by Marko Mäkelä's avatar Marko Mäkelä

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

parents 984f6811 bc6f7739
...@@ -1002,7 +1002,7 @@ rw_lock_debug_print( ...@@ -1002,7 +1002,7 @@ rw_lock_debug_print(
rwt = info->lock_type; 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) os_thread_pf(info->thread_id), info->file_name,
(ulong) info->line); (ulong) info->line);
if (rwt == RW_LOCK_SHARED) { if (rwt == RW_LOCK_SHARED) {
......
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