summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl000015.result
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-10-03 15:19:58 -0600
committersasha@mysql.sashanet.com <>2001-10-03 15:19:58 -0600
commit69b9d6f2f6e25504583f0c7991b89b7e823ec918 (patch)
tree8565f1027a2bc60cd641c7447414822be4d1ba6b /mysql-test/r/rpl000015.result
parentc0f87c836accdc284b526e52a589f20b8e1be87e (diff)
downloadmariadb-git-69b9d6f2f6e25504583f0c7991b89b7e823ec918.tar.gz
post-merge fixes
Diffstat (limited to 'mysql-test/r/rpl000015.result')
-rw-r--r--mysql-test/r/rpl000015.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result
index 777d855f2c9..d34c8d21327 100644
--- a/mysql-test/r/rpl000015.result
+++ b/mysql-test/r/rpl000015.result
@@ -11,7 +11,7 @@ show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
127.0.0.1 test 9998 60 4 No 0 0 0
change master to master_host='127.0.0.1',master_user='root',
-master_password='',master_port=9306;
+master_password='',master_port=$MASTER_MYPORT;
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
127.0.0.1 root 9999 60 4 No 0 0 0