diff options
| author | unknown <monty@mysql.com> | 2004-02-03 09:46:48 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-03 09:46:48 +0100 |
| commit | 619eaee654d213c68f86981bf33dcccf15b52f02 (patch) | |
| tree | 4e99682a8907f92bf23d26f574c2c1d6a1152c1d /client | |
| parent | 8ab97bb111b75a66cfee409123a34da2647bcf99 (diff) | |
| download | mariadb-git-619eaee654d213c68f86981bf33dcccf15b52f02.tar.gz | |
Give error if locked table is used twice in query. This fixes strange error message when doing LOCK TABLES t1 WRITE; INSERT TABLE t1 SELECT * from t1 (Bug #2296)
client/mysqldump.c:
Better help for flush-logs
mysql-test/r/lock.result:
Test for LOCK TABLES ; INSERT ... SELECT
mysql-test/t/lock.test:
Test for LOCK TABLES ; INSERT ... SELECT
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 38202a5c253..6078a1e9dc0 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -154,7 +154,7 @@ static struct my_option my_long_options[] = {"first-slave", 'x', "Locks all tables across all databases.", (gptr*) &opt_first_slave, (gptr*) &opt_first_slave, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"flush-logs", 'F', "Flush logs file in server before starting dump.", + {"flush-logs", 'F', "Flush logs file in server before starting dump. Note that if you use this option in combination with the --all-databases (or -A) option, the logs will be flushed for each database dumped.", (gptr*) &flush_logs, (gptr*) &flush_logs, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"force", 'f', "Continue even if we get an sql-error.", |