bzr push into mysql-5.5 branch (norvald.ryeng:3843 to 3844) WL#6311

[Norvald H. Ryeng]

 3844 Norvald H. Ryeng	2012-05-23
      WL#6311 Remove --safe-mode
      
      Print deprecation warning if the --safe-mode command line option is
      used.

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      sql/mysqld.cc
 3843 Marc Alff	2012-05-23
      Improved the test performance_schema.func_file_io,
      so that investigating test failures is easier.
      
      Detect cases when @before_count / @after_count is NULL.

    modified:
      mysql-test/suite/perfschema/r/func_file_io.result
      mysql-test/suite/perfschema/t/func_file_io.test
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2012-05-07 20:20:42 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2012-05-23 10:27:32 +0000
@@ -595,7 +595,7 @@ The following options may be given as th
  master during slave registration
  --rpl-recovery-rank=# 
  Unused, will be removed
- --safe-mode         Skip some optimize stages (for testing).
+ --safe-mode         Skip some optimize stages (for testing). Deprecated.
  --safe-user-create  Don't allow new user creation by the user who has no
  write privileges to the mysql.user table.
  --secure-auth       Disallow authentication for accounts that have old

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2012-05-07 20:20:42 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2012-05-23 10:27:32 +0000
@@ -595,7 +595,7 @@ The following options may be given as th
  master during slave registration
  --rpl-recovery-rank=# 
  Unused, will be removed
- --safe-mode         Skip some optimize stages (for testing).
+ --safe-mode         Skip some optimize stages (for testing). Deprecated.
  --safe-user-create  Don't allow new user creation by the user who has no
  write privileges to the mysql.user table.
  --secure-auth       Disallow authentication for accounts that have old

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-05-07 20:20:42 +0000
+++ b/sql/mysqld.cc	2012-05-23 10:27:32 +0000
@@ -5948,7 +5948,7 @@ struct my_option my_long_options[]=
    "will not do updates to tables in databases that start with foo and whose "
    "table names start with bar.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"safe-mode", OPT_SAFE, "Skip some optimize stages (for testing).",
+  {"safe-mode", OPT_SAFE, "Skip some optimize stages (for testing). Deprecated.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"safe-user-create", 0,
    "Don't allow new user creation by the user who has no write privileges to the mysql.user table.",
@@ -7081,6 +7081,8 @@ mysqld_get_one_option(int optid,
     delay_key_write_options= DELAY_KEY_WRITE_NONE;
     myisam_recover_options= HA_RECOVER_DEFAULT;
     ha_open_options&= ~(HA_OPEN_DELAY_KEY_WRITE);
+    sql_print_warning("The syntax '--safe-mode' is deprecated and will be "
+                      "removed in a future release.");
     break;
   case (int) OPT_SKIP_PRIOR:
     opt_specialflag|= SPECIAL_NO_PRIOR;

No bundle (reason: useless for push emails).