bzr push into mysql-pe branch (Dao-Gang.Qu:3648 to 3649) Bug#34777

[Dao-Gang.Qu]

 3649 Dao-Gang.Qu@stripped	2009-10-28 [merge]
      Bug #34777  	mysqlbinlog: --help output for --base64-output is hard to understand
      
      Append the description of the 'decode-rows' value for --base64-output argument.

    modified:
      client/mysqlbinlog.cc
 3648 Sergey Vojtovich	2009-10-27 [merge]
      Merge mysql-5.1-bugteam -> mysql-pe.

    modified:
      include/myisamchk.h
      mysql-test/r/myisam.result
      mysql-test/t/myisam.test
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_check.c
      storage/myisam/sort.c
=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc	2009-10-23 14:45:54 +0000
+++ b/client/mysqlbinlog.cc	2009-10-28 07:09:51 +0000
@@ -1005,11 +1005,13 @@ static struct my_option my_long_options[
     /* 'unspec' is not mentioned because it is just a placeholder. */
    "Determine when the output statements should be base64-encoded BINLOG "
    "statements: 'never' disables it and works only for binlogs without "
-   "row-based events; 'auto' prints base64 only when necessary (i.e., "
-   "for row-based events and format description events); 'always' prints "
-   "base64 whenever possible. 'always' is for debugging only and should "
-   "not be used in a production system. If this argument is not given, "
-   "the default is 'auto'; if it is given with no argument, 'always' is used."
+   "row-based events; 'decode-rows' decodes row events into commented SQL "
+   "statements if the --verbose option is also given; 'auto' prints base64 "
+   "only when necessary (i.e., for row-based events and format description "
+   "events); 'always' prints base64 whenever possible. 'always' is for "
+   "debugging only and should not be used in a production system. If this "
+   "argument is not given, the default is 'auto'; if it is given with no "
+   "argument, 'always' is used."
    ,(uchar**) &opt_base64_output_mode_str,
    (uchar**) &opt_base64_output_mode_str,
    0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},


Attachment: [text/bzr-bundle] bzr/[e-mail]