Commit 77b7ad33 authored by Mats Kindahl's avatar Mats Kindahl
Browse files

Fixning compiler warnings. Fixing build failure for valgrind platform.

parent 25bb56ac

include/my_global.h

+3 −0
Original line number Diff line number Diff line
@@ -1130,6 +1130,9 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 
#define dbug_volatile

#endif



/* Some helper macros */

#define YESNO(X) ((X) ? "yes" : "no")



/* Defines for time function */

#define SCALE_SEC	100

#define SCALE_USEC	10000

sql/log.cc

+0 −2
Original line number Diff line number Diff line
@@ -1448,8 +1448,6 @@ static int binlog_prepare(handlerton *hton, THD *thd, bool all) 
  return 0;

}



#define YESNO(X) ((X) ? "yes" : "no")



/**

  This function is called once after each statement.

sql/sql_class.cc

+6 −4
Original line number Diff line number Diff line
@@ -3528,22 +3528,24 @@ int THD::binlog_flush_pending_rows_event(bool stmt_end) 
}





#ifndef DBUG_OFF

static const char *

show_query_type(THD::enum_binlog_query_type qtype)

{

  switch (qtype) {

    static char buf[64];

  case THD::ROW_QUERY_TYPE:

    return "ROW";

  case THD::STMT_QUERY_TYPE:

    return "STMT";

  case THD::MYSQL_QUERY_TYPE:

    return "MYSQL";

  }



  static char buf[64];

  default:

    sprintf(buf, "UNKNOWN#%d", qtype);

    return buf;

  }

}

#endif





/*

sql/sql_class.h

+2 −2
Original line number Diff line number Diff line
@@ -2100,8 +2100,8 @@ class THD :public Statement, 
      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))