From: Dmitry Shulga
Date: September 24 2010 12:03pm
Subject: bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3516) Bug#42503
List-Archive: http://lists.mysql.com/commits/119026
X-Bug: 42503
Message-Id: <0L99003AL2U4VP90@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_kDHKZo0acleYCtHp5U3Vng)"

--Boundary_(ID_kDHKZo0acleYCtHp5U3Vng)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///Users/shulga/projects/mysql/5.1-bugteam-bug42503/ based on revid:dmitry.shulga@stripped

 3516 Dmitry Shulga	2010-09-24
      Follow-up for Bug#42503: fix a compilation warning.
     @ sql/sql_cache.cc
        Added include of send_data_in_chunks() definiton when macros EMBEDDED_LIBRARY is on.

    modified:
      sql/sql_cache.cc
=== modified file 'sql/sql_cache.cc'
--- a/sql/sql_cache.cc	2010-09-16 10:24:27 +0000
+++ b/sql/sql_cache.cc	2010-09-24 12:03:28 +0000
@@ -1330,6 +1330,7 @@ end:
 }
 
 
+#ifndef EMBEDDED_LIBRARY
 /**
   Send a single memory block from the query cache.
 
@@ -1377,6 +1378,7 @@ send_data_in_chunks(NET *net, const ucha
 
   return FALSE;
 }
+#endif
 
 
 /*


--Boundary_(ID_kDHKZo0acleYCtHp5U3Vng)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/dmitry.shulga@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/dmitry.shulga@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped
# target_branch: file:///Users/shulga/projects/mysql/5.1-bugteam-\
#   bug42503/
# testament_sha1: 3fe55178a5050502417413a5ef878beb14c5d377
# timestamp: 2010-09-24 19:03:38 +0700
# base_revision_id: dmitry.shulga@stripped\
#   5xa16axg0zax73xh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQz1dfQAAatfgEAQWGP/938m
mCC////wUAPHjRQ0dsABoRAjJNontBT2kRmRB6g9NJjQmQZVHo1GTanp6kxDQANAAAAAqntUemnp
TCAYaJoekDENNDE0GDmATACYAATAAEwABJImTJoJiGpowjQk2mQ00E2mppo94ZrPhN4vEbpBnhnh
IBcqpluuJKkduIzMt9wGC3TGM2mqk0H1ykw7dnJKNXPB7gKvFj8ORRZDDgnbNNna3aEMFxqF/Pr7
qKQh4va9clbDjj2bf109PQv546arCuaHCNrxGt7qr8u2Iu8bFslsHiO9IvQ4RlIcqmUnC1HsYxTn
cpiKlZXJTVcq35LTowCQxJvHrmhd14nEmWZFfmapxgKF+m9JXaQk53BJ2OxXaRSOzqMIKrToW4lA
QaMnEaDTEd8xf1tWC3HQOFY4trTqC2PkPYxrqCOkXOL1BXiaAwnuipuKx8ul1ZWhmtI3cxUtUJkx
XC4nDyft6rzi/o12FG3cDXFtczFN+zlgSo4G4gL+RiQv0WIZTMpcJoxQVVYGShdaQo6XAGhoqAqe
Qzwy1J3GJ5LNVwya/CTlnVdaJ++7XFlZExgKc6TK4WXbNy2uqEWj3KqxVMKjUvaohdSUYantSb2i
4ih1WGtq5VDytyqdJnFkIhXJtvgcMqe7FP7vn65pHscY0ZmGgep+b+bj8jEvvPeQKyH6P2f5M9pH
sSt9sS05o00ypOjDA/blj5iUXqRvQQF7DZXARDEne0huvbHYMwuA3Lwt9FDKiPxaZvdpqXkuOZj5
eOlRER0G5MLSpeZ8EdIfEs+hQ83ngjvRVf9Z9i49e9E2c/erBGXbHsL8cudfIjaWrhWnaqk6eHnZ
788Lpanu7CsPMmM63V9Wxo3FDMe53OkFlRjrXKCCHIRBkCcx30gsplBRN6DS1iOXd8AYqWMHIdyM
vOJkj9M+UnwHCRUU7CQweZo2CgcHxDfVWfpjOh7yHqBp21fFO5gs1iK/VDw36NuCicihc3v/hERD
WElr6izx+ANDkuzas80QNJN3BdZSv9eq4ba6ZhS8LOaFSG/gtpDEK/M0CQScv9qRPBkcAXHHk/kK
xzYZhARW7PenvoUPQ4CNeyy+ch9k8nhgkMPaKuZ6ITaD1eumb5+VaqZFTJhS6xr3Qt2r+WgpZtBl
76/cmpEGXY5PqFjoJk2OF4W62YHkd2T7ZOj1eDKxKLKeltieF1SJ9V5HhWqV+mULtspQYZIY29r9
RC2/qYp8hEwdJcf+X0+jSmznJ+xWqAfgQ2vZkJzvEdlc/nhmbq/s1nK0e8Wy0LgcCi5O4uV9n3yP
QFzPlQQ/R2di+eC0Btfcm2LLWvimXgpLakn/ZRKv/F3JFOFCQDPV19A=


--Boundary_(ID_kDHKZo0acleYCtHp5U3Vng)--