bzr push into mysql-5.5 branch (marc.alff:3473)

[Marc Alff]

 3473 Marc Alff	2011-06-29 [merge]
      local merge

    modified:
      storage/innobase/include/row0row.h
      storage/innobase/include/row0row.ic
      storage/innobase/include/row0upd.ic
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/row/row0row.c
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2011-06-16 15:18:16 +0000
+++ b/sql/sql_parse.cc	2011-06-29 08:15:05 +0000
@@ -1308,7 +1308,7 @@ bool dispatch_command(enum enum_server_c
     length= my_snprintf(buff, buff_len - 1,
                         "Uptime: %lu  Threads: %d  Questions: %lu  "
                         "Slow queries: %lu  Opens: %lu  Flush tables: %lu  "
-                        "Open tables: %u  Queries per second avg: %u.%u",
+                        "Open tables: %u  Queries per second avg: %u.%03u",
                         uptime,
                         (int) thread_count, (ulong) thd->query_id,
                         current_global_status_var.long_query_count,

No bundle (reason: useless for push emails).