diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 19:55:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 19:55:54 +0200 |
| commit | 172f5e28ba9efceb3d3cee40c8373d2ee66f7c7a (patch) | |
| tree | 2699ed6525a405595de40da2ec5e31793ee63f16 /sql | |
| parent | 02b8232629807ca3e37b99489f8191c549f7569a (diff) | |
| download | mariadb-git-172f5e28ba9efceb3d3cee40c8373d2ee66f7c7a.tar.gz | |
add safemalloc back
... but differently
client/mysqltest.cc:
my_safe_print_str() don't append \n anymore
dbug/dbug.c:
restore safemalloc as a part of dbug suite
dbug/user.r:
restore 'S' flag documentation
include/my_dbug.h:
restore safemalloc as a part of dbug suite
include/my_sys.h:
move valgrind defines to a dedicated header
mysys/my_malloc.c:
use new safemalloc
mysys/stacktrace.c:
don't append \n. let the calller do it, if needed
sql/mysqld.cc:
my_safe_print_str() don't append \n anymore
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 49912b6fa9e..4ecd9410210 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2610,7 +2610,7 @@ the thread stack. Please read http://dev.mysql.com/doc/mysql/en/linux.html\n\n", "Some pointers may be invalid and cause the dump to abort.\n"); fprintf(stderr, "Query (%p): ", thd->query()); my_safe_print_str(thd->query(), min(1024, thd->query_length())); - fprintf(stderr, "Connection ID (thread ID): %lu\n", (ulong) thd->thread_id); + fprintf(stderr, "\nConnection ID (thread ID): %lu\n", (ulong) thd->thread_id); fprintf(stderr, "Status: %s\n", kreason); fputc('\n', stderr); } |