diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-11-13 10:17:53 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-11-13 10:17:53 +0000 |
| commit | 27b1c660e3f654d1d616fc4c03c9c74716acf9e0 (patch) | |
| tree | 5107afeb0f71e17a7fcdff3685ea606313d1aa3c /mysql-test/extra | |
| parent | 794ccfc378e7476b14c0648a7473fe2ff8b618c8 (diff) | |
| parent | 7d3708636a7296206ca2f49b62a16c0c5ad7f7ef (diff) | |
| download | mariadb-git-27b1c660e3f654d1d616fc4c03c9c74716acf9e0.tar.gz | |
manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)
CONFLICTS
=========
Text conflict in sql/sql_yacc.yy
1 conflicts encountered.
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_reset_slave.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_reset_slave.test b/mysql-test/extra/rpl_tests/rpl_reset_slave.test index 1f88c792fce..428554ac598 100644 --- a/mysql-test/extra/rpl_tests/rpl_reset_slave.test +++ b/mysql-test/extra/rpl_tests/rpl_reset_slave.test @@ -22,6 +22,7 @@ source include/show_slave_status2.inc; reset slave; source include/show_slave_status2.inc; +change master to master_user='root'; start slave; sync_with_master; source include/show_slave_status2.inc; |