diff options
author | unknown <msvensson@neptunus.(none)> | 2006-08-03 16:47:24 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-08-03 16:47:24 +0200 |
commit | 65866b7bbaf571964ad328265f3ff7b0b0a47d4b (patch) | |
tree | 654e10e73db35600e4534f6fd8078f403960e5f8 | |
parent | 98157e78b1cc678c3a6140a38da7420255b206b9 (diff) | |
download | mariadb-git-65866b7bbaf571964ad328265f3ff7b0b0a47d4b.tar.gz |
Make test case for bug#21215repeateble by calling "reset master"
-rw-r--r-- | mysql-test/r/mysqldump.result | 3 | ||||
-rw-r--r-- | mysql-test/t/mysqldump.test | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 090387d08e9..4c684be0a3c 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -2878,13 +2878,14 @@ drop database mysqldump_dbb; use test; create user mysqltest_1; create table t1(a int, b varchar(34)); +reset master; mysqldump: Couldn't execute 'FLUSH TABLES': Access denied; you need the RELOAD privilege for this operation (1227) mysqldump: Couldn't execute 'FLUSH TABLES': Access denied; you need the RELOAD privilege for this operation (1227) grant RELOAD on *.* to mysqltest_1@localhost; mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227) mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227) grant REPLICATION CLIENT on *.* to mysqltest_1@localhost; -CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000003', MASTER_LOG_POS=9227; +CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=537; CREATE TABLE `t1` ( `a` int(11) default NULL, `b` varchar(34) default NULL diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 674a1680b67..4cdfabd4484 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1276,6 +1276,9 @@ use test; create user mysqltest_1; create table t1(a int, b varchar(34)); +# To get consistent output, reset the master, starts over from first log +reset master; + # Execute mysqldump, will fail on FLUSH TABLES --error 2 --exec $MYSQL_DUMP --compact --master-data -u mysqltest_1 test 2>&1 |