From: vasil.dimov
Date: February 20 2012 12:05pm
Subject: bzr push into mysql-5.5 branch (vasil.dimov:3723 to 3724)
List-Archive: http://lists.mysql.com/commits/142968
Message-Id: <20120220120547.2AEBB2E0BC@mail.v5d.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3724 Vasil Dimov	2012-02-20
      Adjust .result files of mysqld--help-notwin and mysqld--help-win
      mtr tests.
      
      This is a followup to vasil.dimov@stripped
      which added a deprecation notice to ignore-builtin-innodb

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
 3723 kevin.lewis@stripped	2012-02-17 [merge]
      Merge with mysql-5.5

    added:
      mysql-test/suite/innodb/r/innodb-blob.result
      mysql-test/suite/innodb/t/innodb-blob.test
    modified:
      sql/mysqld.cc
      sql/sys_vars.cc
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0cur.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/fsp0fsp.h
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/mtr0mtr.ic
      storage/innobase/include/page0page.h
      storage/innobase/include/page0page.ic
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0rec.ic
      storage/innobase/include/trx0undo.h
      storage/innobase/mtr/mtr0mtr.c
      storage/innobase/page/page0cur.c
      storage/innobase/page/page0page.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0row.c
      storage/innobase/row/row0upd.c
      storage/innobase/sync/sync0rw.c
      storage/innobase/sync/sync0sync.c
      storage/innobase/trx/trx0rec.c
      storage/innobase/trx/trx0sys.c
      storage/innobase/trx/trx0undo.c
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	revid:kevin.lewis@stripped
+++ b/mysql-test/r/mysqld--help-notwin.result	revid:vasil.dimov@stripped
@@ -175,7 +175,8 @@ The following options may be given as th
  GROUP_CONCAT()
  -?, --help          Display this help and exit.
  --ignore-builtin-innodb 
- Disable initialization of builtin InnoDB plugin
+ DEPRECATED. This option will be removed in future
+ releases. Disable initialization of builtin InnoDB plugin
  --init-connect=name Command(s) that are executed for each new connection
  --init-file=name    Read SQL commands from this file at startup
  --init-rpl-role=name 

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	revid:kevin.lewis@stripped
+++ b/mysql-test/r/mysqld--help-win.result	revid:vasil.dimov@stripped
@@ -175,7 +175,8 @@ The following options may be given as th
  GROUP_CONCAT()
  -?, --help          Display this help and exit.
  --ignore-builtin-innodb 
- Disable initialization of builtin InnoDB plugin
+ DEPRECATED. This option will be removed in future
+ releases. Disable initialization of builtin InnoDB plugin
  --init-connect=name Command(s) that are executed for each new connection
  --init-file=name    Read SQL commands from this file at startup
  --init-rpl-role=name 

No bundle (reason: useless for push emails).