Commit 9c0097fa authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 

into  mysql.com:/home/my/mysql-5.1
parents 10b96122 763f105d

client/mysqltest.c

+4 −3
Original line number Diff line number Diff line
@@ -2552,6 +2552,7 @@ int do_save_master_pos() 
  MYSQL *mysql = &cur_con->mysql;

  const char *query;

  int rpl_parse;

  DBUG_ENTER("do_save_master_pos");



  rpl_parse = mysql_rpl_parse_enabled(mysql);

  mysql_disable_rpl_parse(mysql);
@@ -2709,7 +2710,7 @@ int do_save_master_pos() 
  if (rpl_parse)

    mysql_enable_rpl_parse(mysql);



  return 0;

  DBUG_RETURN(0);

}
@@ -3164,7 +3165,7 @@ struct st_connection * find_connection_by_name(const char *name) 


int select_connection_name(const char *name)

{

  DBUG_ENTER("select_connection2");

  DBUG_ENTER("select_connection_name");

  DBUG_PRINT("enter",("name: '%s'", name));



  if (!(cur_con= find_connection_by_name(name)))
@@ -3187,7 +3188,7 @@ int select_connection(struct st_command *command) 
  if (*p)

    *p++= 0;

  command->last_argument= p;

  return select_connection_name(name);

  DBUG_RETURN(select_connection_name(name));

}

mysql-test/extra/rpl_tests/rpl_max_relay_size.test

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
# Requires statement logging

-- source include/master-slave.inc



# We have to sync with master, to ensure slave had time to start properly

# before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log.

sync_slave_with_master;

connection slave;

stop slave;

connection master;

mysql-test/extra/rpl_tests/rpl_relayrotate.test

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 


-- source include/master-slave.inc



# We have to sync with master, to ensure slave had time to start properly

# before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log.

connection master;

sync_slave_with_master;

connection slave;

stop slave;

connection master;

mysql-test/include/federated.inc

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,11 @@ source ./include/master-slave.inc; 


# remote table creation



# We have to sync with master, to ensure slave had time to start properly

# before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log.

connection master;

sync_slave_with_master;



connection slave;

#--replicate-ignore-db=federated

stop slave;

mysql-test/include/federated_cleanup.inc

+0 −2
Original line number Diff line number Diff line
@@ -2,10 +2,8 @@ connection master; 
--disable_warnings

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

--enable_warnings



connection slave;

--disable_warnings

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

--enable_warnings