diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-14 17:43:08 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-14 17:43:08 -0400 |
| commit | 77c7d6972dc6a36e26f8d24bc595b3d2277459e1 (patch) | |
| tree | 4be01e21769678d8047834bd25d849f94a9f39ef | |
| parent | 269ebe54211cf96c4e64fa7268a1414588ca1de8 (diff) | |
| download | mariadb-git-77c7d6972dc6a36e26f8d24bc595b3d2277459e1.tar.gz | |
Bug#35157: mysqldump should use FLUSH TABLES NO_WRITE_TO_BINLOG \
when --master-data is used
When using the --master-data option with mysqldump, mysqldump uses
a FLUSH TABLES command. However, this statement got replicated to
the slave(s), which caused the slave(s) to block unnecessarily while
the FLUSH tables command completed.
Now, if the master-data option is set to one of the two "on" modes,
then use the "LOCAL" qualifier to ensure that it's not replicated.
client/mysqldump.c:
If master_data is set to one of the two modes, then insert "LOCAL"
to the command to FLUSH TABLES so that the slaves aren't told to
flush also.
mysql-test/r/mysqldump.result:
Output of mysqldump changed.
| -rw-r--r-- | client/mysqldump.c | 5 | ||||
| -rw-r--r-- | mysql-test/r/mysqldump.result | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 49f3d3ad71b..0cc8916fac4 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -4326,7 +4326,10 @@ static int do_flush_tables_read_lock(MYSQL *mysql_con) update starts between the two FLUSHes, we have that bad stall. */ return - ( mysql_query_with_error_report(mysql_con, 0, "FLUSH TABLES") || + ( mysql_query_with_error_report(mysql_con, 0, + ((opt_master_data != 0) ? + "FLUSH /*!40101 LOCAL */ TABLES" : + "FLUSH TABLES")) || mysql_query_with_error_report(mysql_con, 0, "FLUSH TABLES WITH READ LOCK") ); } diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index a1b8eaa52f8..032bc844824 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -3565,8 +3565,8 @@ use test; create user mysqltest_1@localhost; 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) +mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need the RELOAD privilege for this operation (1227) +mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ 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) |