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

9ec93a89 · pem@mysql.comhem.se · df69f93a · 9ec93a89 · 9ec93a89
Commit 9ec93a89 authored May 14, 2004 by pem@mysql.comhem.se
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/greedy_optimizer.result mysql-test/r/greedy_optimizer.result +1 -1

mysql-test/t/greedy_optimizer.test mysql-test/t/greedy_optimizer.test +1 -1

No files found.
--- a/mysql-test/r/greedy_optimizer.result
+++ b/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,

--- a/mysql-test/t/greedy_optimizer.test
+++ b/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,