diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-24 10:50:38 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-24 10:50:38 -0400 |
| commit | 34efb0fdab3256567b09b8c3449556d2827e5975 (patch) | |
| tree | a50691e4c9ad88096189e706ba7ae285c764b986 | |
| parent | 7875d9241ce4e89c9eb3be40533680b1bd7cea66 (diff) | |
| parent | 77c7d6972dc6a36e26f8d24bc595b3d2277459e1 (diff) | |
| download | mariadb-git-34efb0fdab3256567b09b8c3449556d2827e5975.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug35157/my51-bug35157
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
| -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 cbde58215c7..58959f56a89 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -4347,7 +4347,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 ffacd1cdee6..3e0b4f80f84 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) |