Post-merge post-merge post fix. ;-)

mysql-test/r/greedy_optimizer.result:
  Post-merge post-merge post fix. ;-)
  (Syntax errror in create table.)
mysql-test/t/greedy_optimizer.test:
  Post-merge post-merge post fix. ;-)
  (Syntax errror in create table.)

mysql-test/r/greedy_optimizer.result

@@ -4,7 +4,7 @@ c11 integer,c12 integer,c13 integer,c14 integer,c15 integer,c16 integer,
 primary key (c11)
 );
 create table t2 (
-c21 integer,c22 integer,c23 integer,c24 integer,c25 integer,c26 integer,
+c21 integer,c22 integer,c23 integer,c24 integer,c25 integer,c26 integer
 );
 create table t3 (
 c31 integer,c32 integer,c33 integer,c34 integer,c35 integer,c36 integer,

mysql-test/t/greedy_optimizer.test

@@ -15,7 +15,7 @@ create table t1 (
   primary key (c11)
 );
 create table t2 (
-  c21 integer,c22 integer,c23 integer,c24 integer,c25 integer,c26 integer,
+  c21 integer,c22 integer,c23 integer,c24 integer,c25 integer,c26 integer
 );
 create table t3 (
   c31 integer,c32 integer,c33 integer,c34 integer,c35 integer,c36 integer,