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

Proposed by Laurynas Biveinis on 2014-06-06
Status: Merged
Approved by: Sergei Glushchenko on 2014-06-11
Approved revision: 662
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 2014-06-06 Approve on 2014-06-11
Review via email: mp+222389@code.launchpad.net

Description of the change

To post a comment you must log in.

Approve

review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sql/sql_class.cc'
2--- sql/sql_class.cc 2014-04-25 10:30:37 +0000
3+++ sql/sql_class.cc 2014-06-06 18:03:09 +0000
4@@ -1380,9 +1380,9 @@
5 if (ran_command)
6 {
7 // The replication thread has the COM_CONNECT command.
8- if ((old_command == COM_QUERY || command == COM_CONNECT) &&
9- (lex->sql_command >= 0 && lex->sql_command < SQLCOM_END))
10- {
11+ DBUG_ASSERT(command != COM_SLEEP);
12+ if ((command == COM_QUERY || command == COM_CONNECT) &&
13+ (lex->sql_command >= 0 && lex->sql_command < SQLCOM_END)) {
14 // A SQL query.
15 if (lex->sql_command == SQLCOM_SELECT)
16 {
17
18=== modified file 'sql/sql_class.h'
19--- sql/sql_class.h 2014-04-25 10:30:37 +0000
20+++ sql/sql_class.h 2014-06-06 18:03:09 +0000
21@@ -1672,8 +1672,6 @@
22 */
23 enum enum_server_command command;
24 uint32 server_id;
25- // Used to save the command, before it is set to COM_SLEEP.
26- enum enum_server_command old_command;
27 uint32 file_id; // for LOAD DATA INFILE
28 /* remote (peer) port */
29 uint16 peer_port;
30
31=== modified file 'sql/sql_parse.cc'
32--- sql/sql_parse.cc 2014-04-25 10:30:37 +0000
33+++ sql/sql_parse.cc 2014-06-06 18:03:09 +0000
34@@ -902,10 +902,6 @@
35 (char *) thd->security_ctx->host_or_ip);
36
37 thd->command=command;
38- /* To increment the corrent command counter for user stats, 'command' must
39- be saved because it is set to COM_SLEEP at the end of this function.
40- */
41- thd->old_command= command;
42 /*
43 Commands which always take a long time are logged into
44 the slow log only if opt_log_slow_admin_statements is set.

Subscribers

People subscribed via source and target branches