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

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Sergei Glushchenko
Approved revision: no longer in the source branch.
Merged at revision: 669
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1167486-5.5
Merge into: lp:percona-server/5.5
Diff against target: 44 lines (+3/-9)
3 files modified
sql/sql_class.cc (+3/-3)
sql/sql_class.h (+0/-2)
sql/sql_parse.cc (+0/-4)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1167486-5.5
Reviewer Review Type Date Requested Status
Sergei Glushchenko (community) g2 Approve
Review via email: mp+222389@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote :

Approve

review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1380 if (ran_command)1380 if (ran_command)
1381 {1381 {
1382 // The replication thread has the COM_CONNECT command.1382 // The replication thread has the COM_CONNECT command.
1383 if ((old_command == COM_QUERY || command == COM_CONNECT) &&1383 DBUG_ASSERT(command != COM_SLEEP);
1384 (lex->sql_command >= 0 && lex->sql_command < SQLCOM_END))1384 if ((command == COM_QUERY || command == COM_CONNECT) &&
1385 {1385 (lex->sql_command >= 0 && lex->sql_command < SQLCOM_END)) {
1386 // A SQL query.1386 // A SQL query.
1387 if (lex->sql_command == SQLCOM_SELECT)1387 if (lex->sql_command == SQLCOM_SELECT)
1388 {1388 {
13891389
=== 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 @@
1672 */1672 */
1673 enum enum_server_command command;1673 enum enum_server_command command;
1674 uint32 server_id;1674 uint32 server_id;
1675 // Used to save the command, before it is set to COM_SLEEP.
1676 enum enum_server_command old_command;
1677 uint32 file_id; // for LOAD DATA INFILE1675 uint32 file_id; // for LOAD DATA INFILE
1678 /* remote (peer) port */1676 /* remote (peer) port */
1679 uint16 peer_port;1677 uint16 peer_port;
16801678
=== 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 @@
902 (char *) thd->security_ctx->host_or_ip);902 (char *) thd->security_ctx->host_or_ip);
903 903
904 thd->command=command;904 thd->command=command;
905 /* To increment the corrent command counter for user stats, 'command' must
906 be saved because it is set to COM_SLEEP at the end of this function.
907 */
908 thd->old_command= command;
909 /*905 /*
910 Commands which always take a long time are logged into906 Commands which always take a long time are logged into
911 the slow log only if opt_log_slow_admin_statements is set.907 the slow log only if opt_log_slow_admin_statements is set.

Subscribers

People subscribed via source and target branches