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

[Sergei Glushchenko]

Merge from 5.5
Jenkins is quite busy these days
http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/482/

[Alexey Kopytov (akopytov)]

review: Approve

[Sergei Glushchenko (sergei.glushchenko)]

added .result file and started http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/483/

=== added file 'Percona-Server/mysql-test/r/percona_bug1266980.result'
--- Percona-Server/mysql-test/r/percona_bug1266980.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1266980.result	2014-01-13 15:36:54 +0000
@@ -0,0 +1,5 @@
+SELECT GROUP_CONCAT(1, 2 ORDER BY 1, , );
+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
+SELECT GROUP_CONCAT(1, 2 ORDER BY 1);
+GROUP_CONCAT(1, 2 ORDER BY 1)
+12

=== added file 'Percona-Server/mysql-test/t/percona_bug1266980.test'
--- Percona-Server/mysql-test/t/percona_bug1266980.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1266980.test	2014-01-13 15:36:54 +0000
@@ -0,0 +1,5 @@
+# crash in group_concat in case of syntax error in prev group_concat
+
+--error 1064
+SELECT GROUP_CONCAT(1, 2 ORDER BY 1, , );
+SELECT GROUP_CONCAT(1, 2 ORDER BY 1);