summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2005-01-13 02:13:19 +0300
committerunknown <konstantin@mysql.com>2005-01-13 02:13:19 +0300
commit069d260b0ea1bd77d1f8c31f2b137dd809830858 (patch)
tree93dd7ea025294ea12e5aa167afbd6f0053b09f4c /sql
parentec459b583b6281f6c918e8d56d7ca9316ddfa5c8 (diff)
downloadmariadb-git-069d260b0ea1bd77d1f8c31f2b137dd809830858.tar.gz
Add logging of COM_EXECUTE in the general query log.
sql/sql_parse.cc: A shorter name for COM_EXECUTE command.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_parse.cc2
-rw-r--r--sql/sql_prepare.cc5
2 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 2b273f4b84c..4d802ad4f34 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -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
};
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 20ebc23e240..ecf01824755 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -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