diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-28 14:38:59 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-28 14:38:59 +0200 |
| commit | b2beb40728ba2f61a0c923a590512cf9dc0e11c3 (patch) | |
| tree | 121832507249bdb31fa8ea2191df4e0f2c0b65d8 /sql/sql_class.cc | |
| parent | 0574bc894b5f13f1759c47ec994555c11aada1df (diff) | |
| parent | 7c56b08216d5ff709d10e4ca662d0215cd823c09 (diff) | |
| download | mariadb-git-b2beb40728ba2f61a0c923a590512cf9dc0e11c3.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 15c8e33f73e..a832deccd57 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2363,7 +2363,6 @@ bool select_export::send_data(List<Item> &items) { // Fill with space if (item->max_length > used_length) { - /* QQ: Fix by adding a my_b_fill() function */ if (!space_inited) { space_inited=1; @@ -4122,8 +4121,8 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, char const *query_arg, int errcode) { DBUG_ENTER("THD::binlog_query"); - DBUG_PRINT("enter", ("qtype: %s query: '%s'", - show_query_type(qtype), query_arg)); + DBUG_PRINT("enter", ("qtype: %s query: '%-.*s'", + show_query_type(qtype), (int) query_len, query_arg)); DBUG_ASSERT(query_arg && mysql_bin_log.is_open()); /* @@ -4159,7 +4158,7 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, char const *query_arg, { sql_print_warning("%s Statement: %.*s", ER(ER_BINLOG_UNSAFE_STATEMENT), - MYSQL_ERRMSG_SIZE, query_arg); + (int) min(MYSQL_ERRMSG_SIZE, query_len), query_arg); binlog_flags|= BINLOG_FLAG_UNSAFE_STMT_PRINTED; } } |