• unknown's avatar
    Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943 · a067100e
    unknown authored
    into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943
    
    
    sql-common/client.c:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/net_serv.cc:
      Auto merged
    sql/repl_failsafe.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_repl.cc:
      Auto merged
    vio/vio.c:
      Auto merged
    vio/viossl.c:
      Auto merged
    a067100e
repl_failsafe.cc 26.9 KB