diff options
author | unknown <monty@work.mysql.com> | 2001-09-18 04:17:52 +0200 |
---|---|---|
committer | unknown <monty@work.mysql.com> | 2001-09-18 04:17:52 +0200 |
commit | 53e09c98389e0b1e8d032e63f6c35dcd9cc06b38 (patch) | |
tree | 63012919b5be7bd7ba87583c4a399657e6ab81f1 /mysql-test/t/rpl000017-slave.sh | |
parent | 74bec0517bfb1141f3a6b2709aa9b52c963eb3c7 (diff) | |
parent | c91a3df5c38ee5f4ebc7e42f0c17da79d4930801 (diff) | |
download | mariadb-git-53e09c98389e0b1e8d032e63f6c35dcd9cc06b38.tar.gz |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
Docs/manual.texi:
Auto merged
extra/perror.c:
Auto merged
include/myisam.h:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/rpl000017-slave.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl000017-slave.sh')
-rwxr-xr-x | mysql-test/t/rpl000017-slave.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl000017-slave.sh b/mysql-test/t/rpl000017-slave.sh index 2ead2021416..23117597ca5 100755 --- a/mysql-test/t/rpl000017-slave.sh +++ b/mysql-test/t/rpl000017-slave.sh @@ -3,7 +3,7 @@ master-bin.001 4 127.0.0.1 replicate -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaab 9306 1 0 |