From 0c9a3e597d329c5475d4fec0a6f95ac87d65ca19 Mon Sep 17 00:00:00 2001
From: unknown <monty@mysql.com/nosik.monty.fi>
Date: Wed, 1 Aug 2007 22:59:05 +0300
Subject: Fixes Bug#30127: --debug-info no longer prints memory usage in mysql
 Fixed compiler warnings, errors and link errors Fixed new bug on Solaris with
 gethrtime() Added --debug-check option to all mysql clients to print errors
 and memory leaks Added --debug-info to all clients. This now works as
 --debug-check but also prints memory and cpu usage

BUILD/compile-solaris-sparc-debug:
  Remove old cpu options
client/client_priv.h:
  Added OPT_DBUG_CHECK
client/mysql.cc:
  --debug-info now prints memory usage
  Added --debug-check
client/mysql_upgrade.c:
  --debug-info now prints memory usage
  Added --debug-check
client/mysqladmin.cc:
  --debug-info now prints memory usage
  Added --debug-check
client/mysqlbinlog.cc:
  --debug-info now prints memory usage
  Added --debug-check
client/mysqlcheck.c:
  --debug-info now prints memory usage
  Added --debug-check
client/mysqldump.c:
  --debug-info now prints memory usage
  Added --debug-check
client/mysqlimport.c:
  --debug-info now prints memory usage
  Added --debug-check
client/mysqlshow.c:
  --debug-info now prints memory usage
  Added --debug-check
client/mysqlslap.c:
  --debug-info now prints memory usage
  Added --debug-check
client/mysqltest.c:
  --debug-info now prints memory usage
  Added --debug-check
include/my_sys.h:
  Added extra option to TERMINATE to not print statistics
libmysql/libmysql.c:
  Fixed compiler warning
mysql-test/mysql-test-run.pl:
  --debug-info -> --debug-check to not print memory usage
mysys/my_getsystime.c:
  Moved fast time calculation to my_micro_time_and_time()
  Fixed bug in previous push related to HAVE_GETHRTIME
mysys/my_init.c:
  Print not freed memory in my_end() if MY_CHECK_ERROR is given
mysys/my_static.c:
  Cleanup
mysys/safemalloc.c:
  Added extra option to TERMINATE to not print statistics
sql/item_xmlfunc.cc:
  Fixed compiler warning
sql/sql_test.cc:
  Fixed TERMINATE() call
unittest/mysys/base64-t.c:
  Fixed link error
unittest/mysys/bitmap-t.c:
  Fixed link error
unittest/mysys/my_atomic-t.c:
  Fixed link error
---
 sql/item_xmlfunc.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/item_xmlfunc.cc')

diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc
index 6bc73f49a5a..067af930d6f 100644
--- a/sql/item_xmlfunc.cc
+++ b/sql/item_xmlfunc.cc
@@ -2767,9 +2767,9 @@ String *Item_xml_str_func::parse_xml(String *raw_xml, String *parsed_xml_buf)
   if ((rc= my_xml_parse(&p, raw_xml->ptr(), raw_xml->length())) != MY_XML_OK)
   {
     char buf[128];
-    my_snprintf(buf, sizeof(buf)-1, "parse error at line %d pos %u: %s",
+    my_snprintf(buf, sizeof(buf)-1, "parse error at line %d pos %lu: %s",
                 my_xml_error_lineno(&p) + 1,
-                my_xml_error_pos(&p) + 1,
+                (ulong) my_xml_error_pos(&p) + 1,
                 my_xml_error_string(&p));
     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                         ER_WRONG_VALUE,
-- 
cgit v1.2.1