From 2dfbfce83154216390a2653cf7f7b9b783d8220c Mon Sep 17 00:00:00 2001 From: dcoppa Date: Thu, 19 May 2011 08:35:15 +0000 Subject: [PATCH] Fix floating point string printing in MySQL status output (MySQL Bug #61205) OK Brad (maintainer) --- databases/mysql/Makefile | 4 ++-- databases/mysql/patches/patch-sql_sql_parse_cc | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 databases/mysql/patches/patch-sql_sql_parse_cc diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile index fd8a829b04d..116b859b704 100644 --- a/databases/mysql/Makefile +++ b/databases/mysql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.189 2011/03/08 10:46:31 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.190 2011/05/19 08:35:15 dcoppa Exp $ SHARED_ONLY= Yes @@ -11,7 +11,7 @@ DISTNAME= mysql-${VERSION} PKGNAME-main= mysql-client-${VERSION} REVISION-main= 0 PKGNAME-server= mysql-server-${VERSION} -REVISION-server=5 +REVISION-server=6 PKGNAME-tests= mysql-tests-${VERSION} CATEGORIES= databases V= MySQL-5.1 diff --git a/databases/mysql/patches/patch-sql_sql_parse_cc b/databases/mysql/patches/patch-sql_sql_parse_cc new file mode 100644 index 00000000000..93d9d6ffab0 --- /dev/null +++ b/databases/mysql/patches/patch-sql_sql_parse_cc @@ -0,0 +1,16 @@ +$OpenBSD: patch-sql_sql_parse_cc,v 1.9 2011/05/19 08:35:15 dcoppa Exp $ + +Fix floating point string printing in MySQL status output +(MySQL Bug #61205) + +--- sql/sql_parse.cc.orig Wed May 18 12:36:24 2011 ++++ sql/sql_parse.cc Wed May 18 12:37:14 2011 +@@ -1558,7 +1558,7 @@ bool dispatch_command(enum enum_server_command command + 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,