Merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1182949 into lp:percona-server/5.5

[Sergei Glushchenko]

Merge fix for bug 1182949 from 5.1 series.
Add testcase for this bug with using audit_null plugin.

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/760/

[Laurynas Biveinis (laurynas-biveinis)]

Same questions as in 5.1 MP, and same testcase notes as for bug 1182535 MP.

review: Needs Fixing

Unmerged revisions

462. By Sergei Glushchenko on 2013-06-11

Merge fix for bug 1182949 from 5.1 series.
Add testcase for this bug with using audit_null plugin.

461. By Sergei Glushchenko on 2013-05-22

Bug 1182535: no MYSQL_AUDIT_GENERAL_LOG notifications with general log off
The reason is that MYSQL_AUDIT_GENERAL_LOG events are emitted in the same
method which does general log writes. Method is not called either if
general_log is turned off or if we don't want to log specific command.
Fixed by moving that checks after audit notification is sent.

=== added file 'Percona-Server/mysql-test/r/percona_bug1182949.result'
--- Percona-Server/mysql-test/r/percona_bug1182949.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1182949.result	2013-06-13 13:33:33 +0000
@@ -0,0 +1,12 @@
+SET @general_log_save = @@general_log;
+SET GLOBAL general_log=OFF;
+PREPARE stmt1 FROM 'SHOW STATUS LIKE "Audit_null_general_log"';
+INSTALL PLUGIN NULL_AUDIT SONAME 'AUDIT_NULL';
+EXECUTE stmt1;
+Variable_name	Value
+Audit_null_general_log	2
+DEALLOCATE PREPARE stmt1;
+UNINSTALL PLUGIN NULL_AUDIT;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
+SET GLOBAL general_log=@general_log_save;

=== added file 'Percona-Server/mysql-test/t/percona_bug1182949-master.opt'
--- Percona-Server/mysql-test/t/percona_bug1182949-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1182949-master.opt	2013-06-13 13:33:33 +0000
@@ -0,0 +1,1 @@
+$AUDIT_NULL_OPT

=== added file 'Percona-Server/mysql-test/t/percona_bug1182949.test'
--- Percona-Server/mysql-test/t/percona_bug1182949.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1182949.test	2013-06-13 13:33:33 +0000
@@ -0,0 +1,24 @@
+#########################################################################
+# Test for bug 1182949
+# Prepared statement execution logged after statement is executed
+#########################################################################
+
+--source include/have_audit_null.inc
+
+SET @general_log_save = @@general_log;
+SET GLOBAL general_log=OFF;
+
+PREPARE stmt1 FROM 'SHOW STATUS LIKE "Audit_null_general_log"';
+
+# load audit plugin
+--replace_result $AUDIT_NULL AUDIT_NULL
+--eval INSTALL PLUGIN NULL_AUDIT SONAME '$AUDIT_NULL'
+
+# status variable should show 2 queries
+EXECUTE stmt1;
+
+DEALLOCATE PREPARE stmt1;
+
+UNINSTALL PLUGIN NULL_AUDIT;
+
+SET GLOBAL general_log=@general_log_save;

=== modified file 'Percona-Server/sql/sql_prepare.cc'
--- Percona-Server/sql/sql_prepare.cc	2013-05-15 05:05:18 +0000
+++ Percona-Server/sql/sql_prepare.cc	2013-06-13 13:33:33 +0000
@@ -4088,6 +4088,24 @@
   thd->stmt_arena= this;
   reinit_stmt_before_use(thd, lex);
 
+  /*
+    Log COM_EXECUTE to the general log. Note, that in case of SQL
+    prepared statements this causes two records to be output:
+
+    Query       EXECUTE <statement name>
+    Execute     <statement SQL text>
+
+    This is considered user-friendly, since in the
+    second log entry we output values of parameter markers.
+
+    Do not print anything if this is an SQL prepared statement and
+    we're inside a stored procedure (also called Dynamic SQL) --
+    sub-statements inside stored procedures are not logged into
+    the general log.
+  */
+  if (thd->spcont == NULL)
+    general_log_write(thd, COM_STMT_EXECUTE, thd->query(), thd->query_length());
+
   /* Go! */
 
   if (open_cursor)
@@ -4144,24 +4162,6 @@
       thd->protocol->send_out_parameters(&this->lex->param_list);
   }
 
-  /*
-    Log COM_EXECUTE to the general log. Note, that in case of SQL
-    prepared statements this causes two records to be output:
-
-    Query       EXECUTE <statement name>
-    Execute     <statement SQL text>
-
-    This is considered user-friendly, since in the
-    second log entry we output values of parameter markers.
-
-    Do not print anything if this is an SQL prepared statement and
-    we're inside a stored procedure (also called Dynamic SQL) --
-    sub-statements inside stored procedures are not logged into
-    the general log.
-  */
-  if (error == 0 && thd->spcont == NULL)
-    general_log_write(thd, COM_STMT_EXECUTE, thd->query(), thd->query_length());
-
 error:
   flags&= ~ (uint) IS_IN_USE;
   return error;