bk commit into 5.0 tree (ramil:1.2595)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-27 21:30:00+04:00, ramil@stripped +2 -0
  after-merge fixup: archive test/result adjusted.

  mysql-test/r/archive.result@stripped, 2007-11-27 21:29:58+04:00, ramil@stripped +1 -1
    after-merge fixup: archive test/result adjusted.

  mysql-test/t/archive.test@stripped, 2007-11-27 21:29:58+04:00, ramil@stripped +1 -1
    after-merge fixup: archive test/result adjusted.

diff -Nrup a/mysql-test/r/archive.result b/mysql-test/r/archive.result
--- a/mysql-test/r/archive.result	2007-09-22 15:17:09 +05:00
+++ b/mysql-test/r/archive.result	2007-11-27 21:29:58 +04:00
@@ -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 -Nrup a/mysql-test/t/archive.test b/mysql-test/t/archive.test
--- a/mysql-test/t/archive.test	2007-09-22 15:17:09 +05:00
+++ b/mysql-test/t/archive.test	2007-11-27 21:29:58 +04:00
@@ -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;