#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:marko.makela@strippedo0gcguyo592i
3223 Marko Mäkelä 2010-11-03 [merge]
Merge mysql-5.1-innodb to mysql-5.5-innodb.
modified:
storage/innobase/sync/sync0rw.c
=== modified file 'storage/innobase/sync/sync0rw.c'
--- a/storage/innobase/sync/sync0rw.c revid:marko.makela@stripped092514-w73qo0gcguyo592i
+++ b/storage/innobase/sync/sync0rw.c revid:marko.makela@strippedgyeatvgz2
@@ -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) {
Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20101103125115-xg1b5zsgyeatvgz2.bundle
| Thread |
|---|
| • bzr commit into mysql-5.5-innodb branch (marko.makela:3223) | marko.makela | 3 Nov |
