summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <istruewing@stella.local>2007-11-27 18:42:59 +0100
committerunknown <istruewing@stella.local>2007-11-27 18:42:59 +0100
commit8a7f5a1d7b826fdd112ffeaaf28b890e9dd4874c (patch)
tree92ca76cbf49275c34c53f5d3dfdfa4176e070fc6
parent76468de853d0e3ed0afe0d0d25eea8424141c9bc (diff)
parent1a73853c04c907ec72e4e333b609d6d5b1068fe8 (diff)
downloadmariadb-git-8a7f5a1d7b826fdd112ffeaaf28b890e9dd4874c.tar.gz
Merge stella.local:/home2/mydev/mysql-5.0-ateam
into stella.local:/home2/mydev/mysql-5.0-axmrg
-rw-r--r--mysql-test/r/archive.result2
-rw-r--r--mysql-test/t/archive.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result
index a0b13b14b17..0fc43f58908 100644
--- a/mysql-test/r/archive.result
+++ b/mysql-test/r/archive.result
@@ -2618,7 +2618,7 @@ auto fld1 companynr fld3 fld4 fld5 fld6
INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
-OPTIMIZE TABLE t2 EXTENDED;
+OPTIMIZE TABLE t2;
Table Op Msg_type Msg_text
test.t2 optimize status OK
SELECT * FROM t2;
diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test
index 2d29cab041d..14a124a96bc 100644
--- a/mysql-test/t/archive.test
+++ b/mysql-test/t/archive.test
@@ -1317,7 +1317,7 @@ SELECT * FROM t2;
INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
-OPTIMIZE TABLE t2 EXTENDED;
+OPTIMIZE TABLE t2;
SELECT * FROM t2;
REPAIR TABLE t2;
SELECT * FROM t2;