bk commit into 5.0 tree (patg:1.2046) BUG#13052

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.0 repository of patg. When patg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2046 05/10/17 12:30:01 patg@stripped +1 -0
  BUG# 13052 Changed text in options to TIMESTAMP

  client/mysqldump.c
    1.208 05/10/17 12:29:46 patg@stripped +1 -1
    BUG# 13052 Changed text in option to TIMESTAMP

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	patg
# Host:	krsna.patg.net
# Root:	/home/patg/mysql-build/mysql-5.0.test1

--- 1.207/client/mysqldump.c	2005-10-13 13:42:43 -07:00
+++ 1.208/client/mysqldump.c	2005-10-17 12:29:46 -07:00
@@ -386,7 +386,7 @@
      (gptr*) &opt_dump_triggers, (gptr*) &opt_dump_triggers, 0, GET_BOOL,
      NO_ARG, 1, 0, 0, 0, 0, 0},
   {"tz-utc", OPT_TZ_UTC,
-    "SET TIME_ZONE='UTC' at top of dump to allow dumping of date types between servers
with different time zones.",
+    "SET TIME_ZONE='UTC' at top of dump to allow dumping of TIMESTAMP data between
servers with different time zones.",
     (gptr*) &opt_tz_utc, (gptr*) &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.",