diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-11-03 14:51:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-11-03 14:51:15 +0200 |
| commit | 00e092cac4e04d036cd6d7e3abe26e003ee34bc0 (patch) | |
| tree | 1cf822d23a6b6d3d90cacac28ee52ec49dd96419 /storage | |
| parent | a5352c8970674b21aa88771e7997edc159fb9663 (diff) | |
| parent | dfe39f68a97d08f5037b6bdd82bfb63bb0657a76 (diff) | |
| download | mariadb-git-00e092cac4e04d036cd6d7e3abe26e003ee34bc0.tar.gz | |
Merge mysql-5.1-innodb to mysql-5.5-innodb.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/sync/sync0rw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c index 4dbaaa97bd9..783cff3bf82 100644 --- a/storage/innobase/sync/sync0rw.c +++ b/storage/innobase/sync/sync0rw.c @@ -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) { |