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

[Bjorn Munch]

 3491 Bjorn Munch	2010-08-26
      Reduced #ifndef for 52301, caused compile warning

    modified:
      client/mysqltest.cc
 3490 Alexey Kopytov	2010-08-26 [merge]
      Automerge.

    modified:
      client/mysqltest.cc
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb_mysql.test
      sql/log.cc
      sql/mysqld.cc
      sql/sql_select.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-08-25 20:49:52 +0000
+++ b/client/mysqltest.cc	2010-08-26 13:14:50 +0000
@@ -5220,10 +5220,8 @@ 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)
@@ -7936,10 +7934,8 @@ 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]