Merge lp:~laurynas-biveinis/percona-server/bug1167486-5.6 into lp:percona-server/5.6

[Laurynas Biveinis]

Merge from 5.5.

http://jenkins.percona.com/job/percona-server-5.6-param/620/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'sql/sql_class.cc'
--- sql/sql_class.cc	2014-05-27 08:19:04 +0000
+++ sql/sql_class.cc	2014-06-06 18:03:54 +0000
@@ -1537,9 +1537,9 @@
   if (ran_command)
   {
     // The replication thread has the COM_CONNECT command.
-    if ((old_command == COM_QUERY || get_command() == COM_CONNECT) &&
-        (lex->sql_command >= 0 && lex->sql_command < SQLCOM_END))
-    {
+    DBUG_ASSERT(get_command() != COM_SLEEP);
+    if ((get_command() == COM_QUERY || get_command() == COM_CONNECT) &&
+        (lex->sql_command >= 0 && lex->sql_command < SQLCOM_END)) {
       // A SQL query.
       if (lex->sql_command == SQLCOM_SELECT)
       {

=== modified file 'sql/sql_class.h'
--- sql/sql_class.h	2014-05-27 08:19:04 +0000
+++ sql/sql_class.h	2014-06-06 18:03:54 +0000
@@ -2369,8 +2369,6 @@
 public:
   uint32     unmasked_server_id;
   uint32     server_id;
-  // Used to save the command, before it is set to COM_SLEEP.
-  enum enum_server_command old_command;
   uint32     file_id;			// for LOAD DATA INFILE
   /* remote (peer) port */
   uint16 peer_port;

=== modified file 'sql/sql_parse.cc'
--- sql/sql_parse.cc	2014-05-27 08:19:04 +0000
+++ sql/sql_parse.cc	2014-06-06 18:03:54 +0000
@@ -1253,10 +1253,6 @@
 
   thd->set_command(command);
 
-  /* To increment the current command counter for user stats, 'command' must
-     be saved because it is set to COM_SLEEP at the end of this function.
-  */
-  thd->old_command= command;
   /*
     Commands which always take a long time are logged into
     the slow log only if opt_log_slow_admin_statements is set.