diff options
| author | monty@mysql.com/nosik.monty.fi <> | 2007-08-01 22:59:05 +0300 |
|---|---|---|
| committer | monty@mysql.com/nosik.monty.fi <> | 2007-08-01 22:59:05 +0300 |
| commit | 96f90711a7fb6f6c33b56b0c6519e1f1a7226277 (patch) | |
| tree | ea014474c5b5d34f211415d0a43cbc13631ccdfc /sql/item_xmlfunc.cc | |
| parent | b16289a5e05397211fd47e05ce08fe12f93ec38a (diff) | |
| download | mariadb-git-96f90711a7fb6f6c33b56b0c6519e1f1a7226277.tar.gz | |
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
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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, |