List:Commits« Previous MessageNext Message »
From:Marc Alff Date:June 29 2011 9:00am
Subject:bzr push into mysql-trunk branch (marc.alff:3240 to 3241)
View as plain text  
 3241 Marc Alff	2011-06-29 [merge]
      Merge mysql-5.5 --> mysql-trunk

    modified:
      sql/sql_parse.cc
 3240 Marko Mäkelä	2011-06-29 [merge]
      Merge mysql-5.5 to mysql-trunk.

    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-24 09:29:07 +0000
+++ b/sql/sql_parse.cc	2011-06-29 08:58:39 +0000
@@ -1444,7 +1444,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).
Thread
bzr push into mysql-trunk branch (marc.alff:3240 to 3241) Marc Alff29 Jun