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

[Laurynas Biveinis]

Merge from 5.1.

http://jenkins.percona.com/job/percona-server-5.5-param/1004/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'sql/sql_class.cc'
--- sql/sql_class.cc	2014-04-25 10:30:37 +0000
+++ sql/sql_class.cc	2014-06-06 18:03:09 +0000
@@ -1380,9 +1380,9 @@
   if (ran_command)
   {
     // The replication thread has the COM_CONNECT command.
-    if ((old_command == COM_QUERY || command == COM_CONNECT) &&
-        (lex->sql_command >= 0 && lex->sql_command < SQLCOM_END))
-    {
+    DBUG_ASSERT(command != COM_SLEEP);
+    if ((command == COM_QUERY || 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-04-25 10:30:37 +0000
+++ sql/sql_class.h	2014-06-06 18:03:09 +0000
@@ -1672,8 +1672,6 @@
   */
   enum enum_server_command command;
   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-04-25 10:30:37 +0000
+++ sql/sql_parse.cc	2014-06-06 18:03:09 +0000
@@ -902,10 +902,6 @@
                       (char *) thd->security_ctx->host_or_ip);
   
   thd->command=command;
-  /* To increment the corrent 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.