diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-27 10:43:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-27 10:43:00 +0300 |
| commit | 133c2129cdbb77d8fd55fb303d6f73e1cd3c025c (patch) | |
| tree | 3a4fe134a4db2511d6081cdfc6fdff550c25c620 /client/mysqldump.c | |
| parent | 6948abb94c6739101320d12ddec1d2daae929cc2 (diff) | |
| parent | 638afc4acf86b32b74b3b37314f2dbd048062814 (diff) | |
| download | mariadb-git-133c2129cdbb77d8fd55fb303d6f73e1cd3c025c.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index a73f06d592a..c8c8076b3ac 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -279,7 +279,9 @@ static struct my_option my_long_options[] = &opt_slave_apply, &opt_slave_apply, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"as-of", OPT_ASOF_TIMESTAMP, - "Dump system versioned table as of specified timestamp.", + "Dump system versioned table(s) as of specified timestamp. " + "Argument is interpreted according to the --tz-utc setting. " + "Table structures are always dumped as of current timestamp.", &opt_asof_timestamp, &opt_asof_timestamp, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"character-sets-dir", OPT_CHARSETS_DIR, "Directory for character set files.", (char **)&charsets_dir, @@ -577,7 +579,8 @@ static struct my_option my_long_options[] = &opt_dump_triggers, &opt_dump_triggers, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"tz-utc", OPT_TZ_UTC, - "SET TIME_ZONE='+00:00' at top of dump to allow dumping of TIMESTAMP data when a server has data in different time zones or data is being moved between servers with different time zones.", + "Set connection time zone to UTC before commencing the dump and add " + "SET TIME_ZONE=´+00:00´ to the top of the dump file.", &opt_tz_utc, &opt_tz_utc, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, #ifndef DONT_ALLOW_USER_CHANGE {"user", 'u', "User for login if not current user.", |