diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-05 02:06:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-05 02:06:51 +0200 |
| commit | f84f577aa15a193f24c3119eafdee554cb9775fb (patch) | |
| tree | ee531580839374516db09b2409ec4bd57a847e8a /storage/innobase/sync | |
| parent | f07b3463e7a4ff32316e1cc94d553b5009ac51f2 (diff) | |
| parent | 31c803e8d0543b330aa8e61ef878da43fe1f68f7 (diff) | |
| download | mariadb-git-f84f577aa15a193f24c3119eafdee554cb9775fb.tar.gz | |
Merge tag 'mysql-5.5.44' into bb-5.5-serg
Diffstat (limited to 'storage/innobase/sync')
| -rw-r--r-- | storage/innobase/sync/sync0arr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c index 5c4ba2058bd..62d35ccd302 100644 --- a/storage/innobase/sync/sync0arr.c +++ b/storage/innobase/sync/sync0arr.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Copyright (c) 2013, 2014, MariaDB Corporation. All Rights Reserved. @@ -1078,8 +1078,9 @@ sync_array_output_info( os_thread_id_t r; fprintf(file, - "OS WAIT ARRAY INFO: reservation count %ld, signal count %ld\n", - (long) arr->res_count, (long) arr->sg_count); + "OS WAIT ARRAY INFO: reservation count " ULINTPF + ", signal count " ULINTPF "\n", + arr->res_count, arr->sg_count); i = 0; count = 0; |