diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-03 15:19:58 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-03 15:19:58 -0600 |
| commit | 6dcd03d76c5eb67a4d6ef8d01393789e45ab1864 (patch) | |
| tree | 8565f1027a2bc60cd641c7447414822be4d1ba6b /mysql-test/r/rpl000015.result | |
| parent | 7968bc7f66bf7a641fdda4493252bc8e7c571374 (diff) | |
| download | mariadb-git-6dcd03d76c5eb67a4d6ef8d01393789e45ab1864.tar.gz | |
post-merge fixes
mysql-test/fix-result:
version update
mysql-test/r/bigint.result:
post-merge fix
mysql-test/r/join.result:
post-merge fix
mysql-test/r/merge.result:
post-merge fix
mysql-test/r/null_key.result:
post-merge fix
mysql-test/r/rpl000002.result:
post-merge fix
mysql-test/r/rpl000015.result:
post-merge fix
mysql-test/r/rpl000016.result:
post-merge fix
mysql-test/r/rpl_log.result:
post-merge fix
mysql-test/r/show_check.result:
post-merge fix
mysql-test/t/rpl000002.test:
post-merge fix
mysql-test/t/rpl000015.test:
post-merge fix
mysql-test/t/rpl000016.test:
post-merge fix
Diffstat (limited to 'mysql-test/r/rpl000015.result')
| -rw-r--r-- | mysql-test/r/rpl000015.result | 2 |
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 |