bzr push into mysql-5.5 branch (vasil.dimov:3723 to 3724)

[vasil.dimov]

 3724 Vasil Dimov	2012-02-17
      Print a deprecation warning when ignore-builtin-innodb is used
      
      This is part of
      Bug#13586262 INNODB - HIBISCUS: ISSUE DEPRECATION WARNINGS FOR VARIABLES
      
      Reviewed by:	Mark Alff

    modified:
      sql/mysqld.cc
      sql/sys_vars.cc
 3723 Marko Mäkelä	2012-02-17 [merge]
      Merge mysql-5.1 to mysql-5.5.

    added:
      mysql-test/suite/innodb/r/innodb-blob.result
      mysql-test/suite/innodb/t/innodb-blob.test
    modified:
      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/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/trx/trx0rec.c
      storage/innobase/trx/trx0sys.c
      storage/innobase/trx/trx0undo.c
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	revid:marko.makela@strippedo8ggefau2hcj
+++ b/sql/mysqld.cc	revid:[e-mail]-20120217130947-03319op732dsf4m2
@@ -3804,6 +3804,10 @@ a file name for --log-bin-index option",
   if (ha_init_errors())
     DBUG_RETURN(1);
 
+  if (opt_ignore_builtin_innodb)
+    sql_print_warning("ignore-builtin-innodb is deprecated "
+                      "and will be removed in future releases.");
+    
   if (plugin_init(&remaining_argc, remaining_argv,
                   (opt_noacl ? PLUGIN_INIT_SKIP_PLUGIN_TABLE : 0) |
                   (opt_help ? PLUGIN_INIT_SKIP_INITIALIZATION : 0)))

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	revid:marko.makela@strippedcj
+++ b/sql/sys_vars.cc	revid:vasil.dimov@stripped20217130947-03319op732dsf4m2
@@ -854,6 +854,7 @@ static Sys_var_charptr Sys_ft_stopword_f
 
 static Sys_var_mybool Sys_ignore_builtin_innodb(
        "ignore_builtin_innodb",
+       "DEPRECATED. This option will be removed in future releases. "
        "Disable initialization of builtin InnoDB plugin",
        READ_ONLY GLOBAL_VAR(opt_ignore_builtin_innodb),
        CMD_LINE(OPT_ARG), DEFAULT(FALSE));

No bundle (reason: useless for push emails).