merge with 4.0 to get fix for range bug

libmysql/libmysql.c:
  Auto merged
sql/opt_range.cc:
  Auto merged

1 files changed, 0 insertions, 5 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index a8027742a0f..38da68791e6 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -827,8 +827,6 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host,
   else if (parent->options.db)
     child->options.db = my_strdup(parent->options.db, MYF(0));
 
-  child->options.rpl_parse = child->options.rpl_probe = child->rpl_pivot = 0;
-
   return child;
 }
 
@@ -842,9 +840,6 @@ STDCALL mysql_set_master(MYSQL* mysql, const char* host,
     mysql_close(mysql->master);
   if (!(mysql->master = spawn_init(mysql, host, port, user, passwd)))
     return 1;
-  mysql->master->rpl_pivot = 0;
-  mysql->master->options.rpl_parse = 0;
-  mysql->master->options.rpl_probe = 0;
   return 0;
 }