Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~sergei.glushchenko/percona-server/5.1-ps-bug1266980 into lp:percona-server/5.1

  1. 5.1-ps-bug1266980
  2. Merge into 5.1
Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 606
Proposed branch: lp:~sergei.glushchenko/percona-server/5.1-ps-bug1266980
Merge into: lp:percona-server/5.1
Diff against target: 31 lines (+11/-0)
3 files modified
Percona-Server/mysql-test/r/percona_bug1266980.result (+5/-0)
Percona-Server/mysql-test/t/percona_bug1266980.test (+5/-0)
Percona-Server/sql/sql_lex.cc (+1/-0)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.1-ps-bug1266980
Reviewer Review Type Date Requested Status
Sergei Glushchenko (community) Approve
Alexey Kopytov (community) Approve
Review via email: mp+201421@code.launchpad.net

Description of the change

Port fix to 5.1, provide test case.

http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/593/

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

Opps, just realized that there is no .result file.

review: Needs Fixing
Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote :

percona_bug1266980.result is in place and I verified that percona_bug1266980 passed locally.
started jenkins build just for a case
http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/594/

Now it looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Percona-Server/mysql-test/r/percona_bug1266980.result'
2--- Percona-Server/mysql-test/r/percona_bug1266980.result 1970-01-01 00:00:00 +0000
3+++ Percona-Server/mysql-test/r/percona_bug1266980.result 2014-01-13 15:33:54 +0000
4@@ -0,0 +1,5 @@
5+SELECT GROUP_CONCAT(1, 2 ORDER BY 1, , );
6+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' )' at line 1
7+SELECT GROUP_CONCAT(1, 2 ORDER BY 1);
8+GROUP_CONCAT(1, 2 ORDER BY 1)
9+12
10
11=== added file 'Percona-Server/mysql-test/t/percona_bug1266980.test'
12--- Percona-Server/mysql-test/t/percona_bug1266980.test 1970-01-01 00:00:00 +0000
13+++ Percona-Server/mysql-test/t/percona_bug1266980.test 2014-01-13 15:33:54 +0000
14@@ -0,0 +1,5 @@
15+# crash in group_concat in case of syntax error in prev group_concat
16+
17+--error 1064
18+SELECT GROUP_CONCAT(1, 2 ORDER BY 1, , );
19+SELECT GROUP_CONCAT(1, 2 ORDER BY 1);
20
21=== modified file 'Percona-Server/sql/sql_lex.cc'
22--- Percona-Server/sql/sql_lex.cc 2013-06-03 03:53:55 +0000
23+++ Percona-Server/sql/sql_lex.cc 2014-01-13 15:33:54 +0000
24@@ -325,6 +325,7 @@
25 lex->select_lex.ftfunc_list= &lex->select_lex.ftfunc_list_alloc;
26 lex->select_lex.group_list.empty();
27 lex->select_lex.order_list.empty();
28+ lex->select_lex.gorder_list.empty();
29 lex->sql_command= SQLCOM_END;
30 lex->duplicates= DUP_ERROR;
31 lex->ignore= 0;

Subscribers

People subscribed via source and target branches