bzr push into mysql-5.1-bugteam branch (bjorn.munch:3489 to 3490)

[Bjorn Munch]

 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
 


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