diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-11-27 11:38:18 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-11-27 11:38:18 -0700 |
| commit | 0ec0095de1e826c549976806ff8b9fa6c6047cc0 (patch) | |
| tree | 85cead020ab985e64b3768b6f5270c4d5ead3a84 /client | |
| parent | 7b134c34206da741fae220585bc137d69fe4b612 (diff) | |
| parent | f97e4d319d9d219f3cc849220b8589a1698bf502 (diff) | |
| download | mariadb-git-0ec0095de1e826c549976806ff8b9fa6c6047cc0.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqldump.c:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 9a83b609d0e..17baed7bc04 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -420,8 +420,12 @@ static struct my_option my_long_options[] = "Creates a consistent snapshot by dumping all tables in a single " "transaction. Works ONLY for tables stored in storage engines which " "support multiversioning (currently only InnoDB does); the dump is NOT " - "guaranteed to be consistent for other storage engines. Option " - "automatically turns off --lock-tables.", + "guaranteed to be consistent for other storage engines. " + "While a --single-transaction dump is in process, to ensure a valid " + "dump file (correct table contents and binary log position), no other " + "connection should use the following statements: ALTER TABLE, DROP " + "TABLE, RENAME TABLE, TRUNCATE TABLE, as consistent snapshot is not " + "isolated from them. Option automatically turns off --lock-tables.", (uchar**) &opt_single_transaction, (uchar**) &opt_single_transaction, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"skip-opt", OPT_SKIP_OPTIMIZATION, |