summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-12-16 21:53:18 +0100
committerunknown <guilhem@mysql.com>2003-12-16 21:53:18 +0100
commita8e8a24990c4b4500eb34417f7b5e4115d288af2 (patch)
tree69fabaf36572e755ca4c2219322d8a1616ba4099 /mysql-test
parentda7418005bc9af467d365a1f1223ed6128e561fd (diff)
parent4790088f46493e0414a14f066c241fdd9c2836c0 (diff)
downloadmariadb-git-a8e8a24990c4b4500eb34417f7b5e4115d288af2.tar.gz
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0 mysql-test/r/rpl_rotate_logs.result: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_rotate_logs.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result
index 3ab6af6b631..89d7f4a795a 100644
--- a/mysql-test/r/rpl_rotate_logs.result
+++ b/mysql-test/r/rpl_rotate_logs.result
@@ -1,11 +1,11 @@
drop table if exists t1, t2, t3, t4;
drop table if exists t1, t2, t3, t4;
slave start;
-Could not initialize master info structure, check permisions on master.info
+Could not initialize master info structure, more error messages can be found in the MySQL error log
slave start;
-Could not initialize master info structure, check permisions on master.info
+Could not initialize master info structure, more error messages can be found in the MySQL error log
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
-Could not initialize master info structure, check permisions on master.info
+Could not initialize master info structure, more error messages can be found in the MySQL error log
reset slave;
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
reset master;