bzr push into mysql-5.1-bugteam branch (Dmitry.Shulga:3515 to 3516) Bug#42503

[Dmitry Shulga]

 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
 3515 Dmitry Shulga	2010-09-22
      Fixed bug#56821 - failure to start the MySQL Service.
     @ sql/log.cc
        reopen_fstreams modified: fixed error in processing of
        stdout/stderr when run mysqld as Windows service.

    modified:
      sql/log.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
 
 
 /*


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