summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-11-30 17:06:53 -0200
committerDavi Arnaut <davi.arnaut@oracle.com>2010-11-30 17:06:53 -0200
commite1e81ceb83dfc344cb20675604d46e8cb0e7403d (patch)
tree4abb7ef6876679d4b98b722cfbfc15c06e604e99 /client
parenta542943c911fb090a238b301a66dd6bb699efbe5 (diff)
parentd5e928959e55b4c124a783b83c2c70069dbedbca (diff)
downloadmariadb-git-e1e81ceb83dfc344cb20675604d46e8cb0e7403d.tar.gz
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index fc111bf7645..9613bc2e929 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -8074,13 +8074,16 @@ static void dump_backtrace(void)
{
struct st_connection *conn= cur_con;
- my_safe_print_str("read_command_buf", read_command_buf,
- sizeof(read_command_buf));
+ fprintf(stderr, "read_command_buf (%p): ", read_command_buf);
+ my_safe_print_str(read_command_buf, sizeof(read_command_buf));
+
if (conn)
{
- my_safe_print_str("conn->name", conn->name, conn->name_len);
+ fprintf(stderr, "conn->name (%p): ", conn->name);
+ my_safe_print_str(conn->name, conn->name_len);
#ifdef EMBEDDED_LIBRARY
- my_safe_print_str("conn->cur_query", conn->cur_query, conn->cur_query_len);
+ fprintf(stderr, "conn->cur_query (%p): ", conn->cur_query);
+ my_safe_print_str(conn->cur_query, conn->cur_query_len);
#endif
}
fputs("Attempting backtrace...\n", stderr);