database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixning compiler warnings. Fixing build failure for valgrind platform.

Browse Source
This commit is contained in:
Mats Kindahl
2008-08-22 12:40:21 +02:00
parent 25bb56accb
commit 77b7ad3398
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/my_global.h
View File

@ -1130,6 +1130,9 @@ typedef char bool; /* Ordinary boolean values 0 1 */
#define dbug_volatile #define dbug_volatile
#endif #endif
/* Some helper macros */
#define YESNO(X) ((X) ? "yes" : "no")
/* Defines for time function */ /* Defines for time function */
#define SCALE_SEC 100 #define SCALE_SEC 100
#define SCALE_USEC 10000 #define SCALE_USEC 10000

2
sql/log.cc
View File

@ -1448,8 +1448,6 @@ static int binlog_prepare(handlerton *hton, THD *thd, bool all)
return 0; return 0;
} }
#define YESNO(X) ((X) ? "yes" : "no")
/** /**
This function is called once after each statement. This function is called once after each statement.

8
sql/sql_class.cc
View File

@ -3528,22 +3528,24 @@ int THD::binlog_flush_pending_rows_event(bool stmt_end)
} }
#ifndef DBUG_OFF
static const char * static const char *
show_query_type(THD::enum_binlog_query_type qtype) show_query_type(THD::enum_binlog_query_type qtype)
{ {
switch (qtype) { switch (qtype) {
static char buf[64];
case THD::ROW_QUERY_TYPE: case THD::ROW_QUERY_TYPE:
return "ROW"; return "ROW";
case THD::STMT_QUERY_TYPE: case THD::STMT_QUERY_TYPE:
return "STMT"; return "STMT";
case THD::MYSQL_QUERY_TYPE: case THD::MYSQL_QUERY_TYPE:
return "MYSQL"; return "MYSQL";
} default:
static char buf[64];
sprintf(buf, "UNKNOWN#%d", qtype); sprintf(buf, "UNKNOWN#%d", qtype);
return buf; return buf;
} }
}
#endif
/* /*

4
sql/sql_class.h
View File

@ -2100,8 +2100,8 @@ public:
Don't reset binlog format for NDB binlog injector thread. Don't reset binlog format for NDB binlog injector thread.
*/ */
DBUG_PRINT("debug", DBUG_PRINT("debug",
("temporary_tables: %d, in_sub_stmt: %d, system_thread: %s", ("temporary_tables: %s, in_sub_stmt: %s, system_thread: %s",
(int) temporary_tables, in_sub_stmt, YESNO(temporary_tables), YESNO(in_sub_stmt),
show_system_thread(system_thread))); show_system_thread(system_thread)));
if ((temporary_tables == NULL) && (in_sub_stmt == 0) && if ((temporary_tables == NULL) && (in_sub_stmt == 0) &&
(system_thread != SYSTEM_THREAD_NDBCLUSTER_BINLOG)) (system_thread != SYSTEM_THREAD_NDBCLUSTER_BINLOG))