diff options
| author | monty@mysql.com/nosik.monty.fi <> | 2007-07-30 11:33:50 +0300 |
|---|---|---|
| committer | monty@mysql.com/nosik.monty.fi <> | 2007-07-30 11:33:50 +0300 |
| commit | b16289a5e05397211fd47e05ce08fe12f93ec38a (patch) | |
| tree | b1f9aa6b9e6bcbc36eded4aeb066d360e7541e72 /sql/item_xmlfunc.cc | |
| parent | a33c863ffd1e0de7bf72a590a90ee5c50180a677 (diff) | |
| download | mariadb-git-b16289a5e05397211fd47e05ce08fe12f93ec38a.tar.gz | |
Slow query log to file now displays queries with microsecond precission
--long-query-time is now given in seconds with microseconds as decimals
--min_examined_row_limit added for slow query log
long_query_time user variable is now double with 6 decimals
Added functions to get time in microseconds
Added faster time() functions for system that has gethrtime() (Solaris)
We now do less time() calls.
Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers
set_var.cc and my_getopt() can now handle DOUBLE variables.
All time() calls changed to my_time()
my_time() now does retry's if time() call fails.
Added debug function for stopping in mysql_admin_table() when tables are locked
Some trivial function and struct variable renames to avoid merge errors.
Fixed compiler warnings
Initialization of some time variables on windows moved to my_init()
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index f8457a1ae50..6bc73f49a5a 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -2767,7 +2767,7 @@ 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 %lu: %s", + my_snprintf(buf, sizeof(buf)-1, "parse error at line %d pos %u: %s", my_xml_error_lineno(&p) + 1, my_xml_error_pos(&p) + 1, my_xml_error_string(&p)); |