diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-12-07 03:56:03 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-12-07 03:56:03 -0700 |
| commit | 284cb0e560293187b9d2d7a38aa71de9d9637567 (patch) | |
| tree | b719b75e443bf2787a2c520cc6e9955e4eb6a4a8 /client/mysqldump.c | |
| parent | b5f919ddfa3bfe6202302bb3e88e252c68550ed7 (diff) | |
| parent | 6e776686d4cbaac919eee8300b2c85e2cf5825ec (diff) | |
| download | mariadb-git-284cb0e560293187b9d2d7a38aa71de9d9637567.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/grant.result:
Manual merge
mysql-test/t/grant.test:
Manual merge
Diffstat (limited to 'client/mysqldump.c')
| -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 f5362b272cd..01b484e924e 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}, {"dump-date", OPT_DUMP_DATE, "Put a dump date to the end of the output.", |