From: Dmitry Shulga
Date: March 15 2011 6:09pm
Subject: bzr push into mysql-trunk branch (Dmitry.Shulga:3769 to 3770)
List-Archive: http://lists.mysql.com/commits/133089
Message-Id: <201103151809.p2FI9kcM029555@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8015303747792658645=="

--===============8015303747792658645==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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 "


--===============8015303747792658645==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   o66s2wrjrnobszn8
# target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/
# testament_sha1: a2a9f32f22424651d79a9674c33b6e50d9ffdc0d
# timestamp: 2011-03-16 00:09:42 +0600
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/
# base_revision_id: sven.sandberg@stripped\
#   e8t1rdsb8fri7atu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYGAOk8AAhRfgEAQUOf//38F
XoC////wUASNPbYDMNICgEkiEZTbU0m1PJoKek9J4FNPFPInpqabU8pocwAEyYAEwmCYQwBGABKC
Cp6nqPJD1P0iGhoAD1ADQaAHMABMmABMJgmEMARgASSJk0NTGk01PRGmE1J6mnkgaA0eoHqOnhZW
x7enfWU4H72T6++S6omAYsMD7InRXk6ompNxKKqqqZ/INEJKq13slkHd1O798WuM8Iemr64jQqBs
02qKSkovF51fjfdpUjJFcPPDJJFG26V2YgHuJYlUY1gm7jQfs9/IDLlJnlbRRdGOxYkp1GkVDnPJ
zLGlMyZuNjnkCBu2nKBIeJNJ7isYSitDcN7OoRAjEi0yYxNBkUdmJ1G6lLBK1bJUYKaYBQt34CUD
hFnkhHcXdbIYqp4alUSBdXSE4pEwDEGVdW54Hnv29xkUWA44GA81cc1jAxVgBcaSipjE8STu5h53
jiDtTApBGxQOGByAxI2DBnuyCthLVkWsP3q/E8CxwxQ1KDrbIpnrYNk4KG83TrWQ8isaXvIKonUf
2ZRFgMkbrf8L9uBEz8CTJ0IAWD3jQKXK6zMZSkZfIDEfNlsmDlqYO2APJmwm17iA4mVbGOCwgnKb
sdtVWDC71GEciJ0LLRyc4cWmhUBVzGxKgNWV8bKQhfIfqvc0vr0UVKAhSJjUewskxAeiki0ukWkT
SxjmRFvr2FSdzo66ixqZJRcFZYJNCUkm2F/Oma4roYmdgXN4HNcmCMg6+1q4zMMzc122e0fTrxj4
9veSbr0s4O69G+asd7IMKL0MnpzkMbA+WH40JrQtBrH7tWrG0NdwFDfvORfSXhfcjb66LCaORbLP
k7kmeUNUmOLqadrvycCknUkynLXIDLtSlF4lvgQ5DZHDzSLFZiuswBEkruMtHqvEop8qLoEwwqrD
yKoGJErROznWsZeK9aH5HFMO6KfY8PoUp9RnZAYYEZYPzlrJHzUpnMNjW2dcJUateai7ylJTTebm
nmTYX3s2a+f15GsKZMF5a5PDzVenN9HlERMigkiG4uyKGI7YONTiVHody69MltP1PiepkfYZvJeC
b4Hjqo+SF6j/iKhkdjiK7kvd6Q2QZBwuRf5+iGhyV4nG46ot9N+L8EfBHYS93D1rMoBgbj2Nto/a
jM19k4Jom4T1zK0kweCFXRnWSOKS7sViVj87T6HBIpmW8SySuG6zLivam8QGV5ZBDJ+I91dLgPkM
WiiwScuZhIDE1AlyO4AkjHSB7pKKLV2cqRu7wzz0cMFSj3lmlRC8euhkfUpitlarZMXARq2J6VzL
QrQUpu/aBMoHYDeVyXZ5ZQGGBNv/EDQq7Z/NdlZn8+3V6xK0johyuCysk0i4LS1BQhwAyhHd6qpx
9wQH0iVX8A68DQlrrQzJovDbohReDpLmblVLBZ/ghcbZ+S8zvVhUrVqiYw8y8QN5Qy8StDjgYAHI
t7BeryZdYshvvUgJ6nAvP/F3JFOFCQgYA6Tw


--===============8015303747792658645==--