diff options
| author | Mats Kindahl <mats@mysql.com> | 2008-08-22 12:40:21 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@mysql.com> | 2008-08-22 12:40:21 +0200 |
| commit | 8b637b284784d92b912318cd3b52d1550920fa09 (patch) | |
| tree | 08c21d059849cad6cc8d0abd2edf15881718a197 /sql/sql_class.h | |
| parent | 7207b18b25c5b0627a9a5c5b4261bd9a55cdd722 (diff) | |
| download | mariadb-git-8b637b284784d92b912318cd3b52d1550920fa09.tar.gz | |
Fixning compiler warnings. Fixing build failure for valgrind platform.
include/my_global.h:
Moving YESNO() macro here from log.cc (it prints either "yes" or "no" depending on a boolean value).
sql/log.cc:
Moving YESNO() function to my_global.h.
sql/sql_class.cc:
Adding default case to printout function to avoid warning.
Only defining function for debug builds since it isn't used
in non-debug build (hence produce a warning).
sql/sql_class.h:
Printing yes/no answer instead of memory address since the
case produces an error/warning on valgrind platform.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 7381930dc93..0bc8d00b22c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2100,8 +2100,8 @@ public: Don't reset binlog format for NDB binlog injector thread. */ DBUG_PRINT("debug", - ("temporary_tables: %d, in_sub_stmt: %d, system_thread: %s", - (int) temporary_tables, in_sub_stmt, + ("temporary_tables: %s, in_sub_stmt: %s, system_thread: %s", + YESNO(temporary_tables), YESNO(in_sub_stmt), show_system_thread(system_thread))); if ((temporary_tables == NULL) && (in_sub_stmt == 0) && (system_thread != SYSTEM_THREAD_NDBCLUSTER_BINLOG)) |