From: Bjorn Munch
Date: August 25 2010 8:51pm
Subject: bzr push into mysql-5.1-bugteam branch (bjorn.munch:3489 to 3490)
List-Archive: http://lists.mysql.com/commits/116805
Message-Id: <201008252051.o7PKpA6g006727@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1376093030=="

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

 3490 Bjorn Munch	2010-08-25 [merge]
      merge followup fix for 52301

    modified:
      client/mysqltest.cc
 3489 Dmitry Shulga	2010-08-25
      Fixed bug #29751 - do not rename the error log at FLUSH LOGS.
      Added open log file with FILE_SHARE_DELETE flag on Windows.
     @ sql/log.cc
        added reopen_fstreams();
        modified redirect_std_streams(): call to sequence of freopen()
        replaced to reopen_fstreams();
        modified flush_error_log(): removed file rename for flushed
        error log file.
     @ sql/mysqld.cc
        modified main() and init_server_components(): do open log error file
        over call to reopen_fstreams().

    modified:
      sql/log.cc
      sql/mysqld.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-08-06 09:13:52 +0000
+++ b/client/mysqltest.cc	2010-08-25 20:49:52 +0000
@@ -5220,8 +5220,10 @@ void do_connect(struct st_command *comma
   }
 #endif
 
+#ifndef EMBEDDED_LIBRARY
   if (opt_protocol)
     mysql_options(&con_slot->mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);
+#endif
 
 #ifdef HAVE_SMEM
   if (con_shm)
@@ -6179,8 +6181,10 @@ get_one_option(int optid, const struct m
     print_version();
     exit(0);
   case OPT_MYSQL_PROTOCOL:
+#ifndef EMBEDDED_LIBRARY
     opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
                                     opt->name);
+#endif
     break;
   case '?':
     usage();
@@ -7932,8 +7936,10 @@ int main(int argc, char **argv)
     mysql_options(&con->mysql, MYSQL_SET_CHARSET_DIR,
                   opt_charsets_dir);
 
+#ifndef EMBEDDED_LIBRARY
   if (opt_protocol)
     mysql_options(&con->mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
+#endif
 
 #ifdef HAVE_OPENSSL
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/mysql-5.1-bugteam/
# testament_sha1: fc3b130a28b0de714dd7c14298081993124c58d5
# timestamp: 2010-08-25 22:51:10 +0200
# source_branch: file:///home/bm136801/my/merge-51/
# base_revision_id: dmitry.shulga@stripped\
#   2ffbgn7u36mn8i3d
# 
# Begin bundle
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
/Yu5IpwoSDSNAUKA


--===============1376093030==--