bzr push into mysql-trunk branch (Dmitry.Shulga:3769 to 3770)

[Dmitry Shulga]

 3770 Dmitry Shulga	2011-03-16
      Fixed a bug in manual merge
      (dmitry.shulga@stripped)

    modified:
      sql/mysqld.cc
      sql/sys_vars.cc
 3769 Sven Sandberg	2011-03-15 [merge]
      Merged BUG#11872422 from 5.5 to trunk.

    removed:
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt
    modified:
      mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2011-03-15 13:03:22 +0000
+++ b/sql/mysqld.cc	2011-03-15 18:08:59 +0000
@@ -7425,7 +7425,7 @@ mysqld_get_one_option(int optid,
     break;
   case OPT_MAX_LONG_DATA_SIZE:
     max_long_data_size_used= true;
-    WARN_DEPRECATED(NULL, 5, 6, "--max_long_data_size", "'--max_allowed_packet'");
+    WARN_DEPRECATED(NULL, "--max_long_data_size", "'--max_allowed_packet'");
     break;
   }
   return 0;

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2011-03-15 13:03:22 +0000
+++ b/sql/sys_vars.cc	2011-03-15 18:08:59 +0000
@@ -1272,13 +1272,6 @@ static Sys_var_ulong Sys_max_length_for_
        SESSION_VAR(max_length_for_sort_data), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(4, 8192*1024L), DEFAULT(1024), BLOCK_SIZE(1));
 
-static Sys_var_harows Sys_sql_max_join_size(
-       "sql_max_join_size", "Alias for max_join_size",
-       SESSION_VAR(max_join_size), NO_CMD_LINE,
-       VALID_RANGE(1, HA_POS_ERROR), DEFAULT(HA_POS_ERROR), BLOCK_SIZE(1),
-       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-       ON_UPDATE(fix_max_join_size), DEPRECATED(70000, 0));
-
 static Sys_var_ulong Sys_max_long_data_size(
        "max_long_data_size",
        "The maximum BLOB length to send to server from "


Attachment: [text/bzr-bundle] bzr/[e-mail]