Commit 069d260b authored by unknown's avatar unknown
Browse files

Add logging of COM_EXECUTE in the general query log. 


sql/sql_parse.cc:
  A shorter name for COM_EXECUTE command.
parent ec459b58

sql/sql_parse.cc

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ const char *command_name[]={ 
  "Drop DB", "Refresh", "Shutdown", "Statistics", "Processlist",

  "Connect","Kill","Debug","Ping","Time","Delayed insert","Change user",

  "Binlog Dump","Table Dump",  "Connect Out", "Register Slave",

  "Prepare", "Prepare Execute", "Long Data", "Close stmt",

  "Prepare", "Execute", "Long Data", "Close stmt",

  "Reset stmt", "Set option",

  "Error"					// Last command number

};

sql/sql_prepare.cc

+4 −1
Original line number Diff line number Diff line
@@ -1592,7 +1592,7 @@ int mysql_stmt_prepare(THD *thd, char *packet, uint packet_length, 
    DBUG_RETURN(1);

  }



  mysql_log.write(thd, COM_PREPARE, "%s", packet);

  mysql_log.write(thd, COM_PREPARE, "[%lu] %s", stmt->id, packet);



  thd->current_arena= stmt;

  mysql_init_query(thd, (uchar *) thd->query, thd->query_length);
@@ -1792,6 +1792,9 @@ void mysql_stmt_execute(THD *thd, char *packet, uint packet_length) 
  if (stmt->param_count && stmt->set_params_data(stmt, &expanded_query))

    goto set_params_data_err;

#endif

  mysql_log.write(thd, COM_EXECUTE, "[%lu] %s", stmt->id,

                  expanded_query.length() ? expanded_query.c_ptr() :

                                            stmt->query);

  thd->protocol= &thd->protocol_prep;           // Switch to binary protocol

  execute_stmt(thd, stmt, &expanded_query, TRUE);

  thd->protocol= &thd->protocol_simple;         // Use normal protocol