diff options
| author | unknown <monty@mysql.com> | 2005-02-25 17:12:06 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-25 17:12:06 +0200 |
| commit | 08b3e79e409c79e09751ac8fd684898e390737d3 (patch) | |
| tree | 6fc367f3ae7c8968bf852d78cccec9f8c03ab417 /mysql-test/t/rpl_rotate_logs.test | |
| parent | c5d4d50ab703d9b3cb087ea5e721baed6fbdab8c (diff) | |
| parent | 248e44945161ec6a84072c8684447aeb702e5bd7 (diff) | |
| download | mariadb-git-08b3e79e409c79e09751ac8fd684898e390737d3.tar.gz | |
Merge with global tree
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/examples/ha_archive.cc:
Merge with global tree
(Use my changes)
sql/sql_parse.cc:
Remove 'tmp' fix to be able to run tests
Diffstat (limited to 'mysql-test/t/rpl_rotate_logs.test')
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test index 7622a93e2a3..2355e92e58b 100644 --- a/mysql-test/t/rpl_rotate_logs.test +++ b/mysql-test/t/rpl_rotate_logs.test @@ -24,7 +24,7 @@ drop table if exists t1, t2, t3, t4; # START SLAVE will fail because it can't read the file (mode 000) # (system error 13) --replace_result $MYSQL_TEST_DIR TESTDIR ---error 1105,1105 +--error 1105,1105,29 start slave; system chmod 600 var/slave-data/master.info; # It will fail again because the file is empty so the slave cannot get valuable |