summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <pem@mysql.comhem.se>2004-05-14 17:47:11 +0200
committerunknown <pem@mysql.comhem.se>2004-05-14 17:47:11 +0200
commit177922377e4ebd91f870acd4643d2c271e4eee19 (patch)
tree36ffe553426c7d2947507cc07f250ba7f9dd5c5a
parent7edc2cf05dccd6f268fea6c63147e9151083023d (diff)
downloadmariadb-git-177922377e4ebd91f870acd4643d2c271e4eee19.tar.gz
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.)
-rw-r--r--mysql-test/r/greedy_optimizer.result2
-rw-r--r--mysql-test/t/greedy_optimizer.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/greedy_optimizer.result b/mysql-test/r/greedy_optimizer.result
index a6b92d38f74..3adc0a93cec 100644
--- 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,
diff --git a/mysql-test/t/greedy_optimizer.test b/mysql-test/t/greedy_optimizer.test
index 8fd5bbb022a..f488286461b 100644
--- 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,