database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt

Browse Source 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/item_timefunc.h:
  Auto merged
mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
  Auto merged
sql/set_var.cc:
  manual merge.
mysql-test/r/view.result:
  manual merge
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
  manual merge
mysql-test/t/view.test:
  manual merge
This commit is contained in:
unknown
2007-10-10 12:37:06 +05:00
parent 09ddd95132 62f72d3610
commit 9c46621dca
4 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/rpl/r/rpl_flushlog_loop.result
View File

@ -4,6 +4,13 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
show variables like 'relay_log%';
Variable_name Value
relay_log MYSQLTEST_VARDIR/master-data/relay-log
relay_log_index
relay_log_info_file relay-log.info
relay_log_purge ON
relay_log_space_limit 0
stop slave;
change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=MASTER_PORT;