Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

client/mysqltest.c:
  Auto merged

4 files changed, 6 insertions, 8 deletions

diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index a213f328cb5..04162faab8f 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -125,7 +125,7 @@ static void die(const char* fmt, ...)
 
 static void print_version()
 {
-  printf("%s Ver 2.0 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
+  printf("%s Ver 2.1 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
 }
 
 
@@ -141,7 +141,6 @@ Dumps a MySQL binary log in a format usable for viewing or for pipeing to\n\
 the mysql command line client\n\n");
   printf("Usage: %s [options] log-files\n", my_progname);
   my_print_help(my_long_options);
-  putchar('\n');
   my_print_variables(my_long_options);
 }
 
diff --git a/client/mysqlmanager-pwgen.c b/client/mysqlmanager-pwgen.c
index db8436c876c..fef5cdf6661 100644
--- a/client/mysqlmanager-pwgen.c
+++ b/client/mysqlmanager-pwgen.c
@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define MANAGER_PWGEN_VERSION "1.1"
+#define MANAGER_PWGEN_VERSION "1.2"
 
 #include <my_global.h>
 #include <m_ctype.h>
@@ -72,7 +72,6 @@ void usage()
   printf("Generates a password file to be used by mysqltest.\n\n");
   printf("Usage: %s [OPTIONS]\n", my_progname);
   my_print_help(my_long_options);
-  putchar('\n');
   my_print_variables(my_long_options);
 }
 
diff --git a/client/mysqlmanagerc.c b/client/mysqlmanagerc.c
index 4acd33cf18a..82b70ed1b44 100644
--- a/client/mysqlmanagerc.c
+++ b/client/mysqlmanagerc.c
@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define MANAGER_CLIENT_VERSION "1.2"
+#define MANAGER_CLIENT_VERSION "1.3"
 
 #include <my_global.h>
 #include <mysql.h>
@@ -93,7 +93,7 @@ void usage()
   printf("Command-line client for MySQL manager daemon.\n\n");
   printf("Usage: %s [OPTIONS] < command_file\n", my_progname);
   my_print_help(my_long_options);
-  printf("  --no-defaults         Don't read default options from any options file.\n\n");
+  printf("  --no-defaults         Don't read default options from any options file.\n");
   my_print_variables(my_long_options);
 }
 
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 1fea4f2d302..f2dd19424d1 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -42,7 +42,7 @@
 
 **********************************************************************/
 
-#define MTEST_VERSION "1.20"
+#define MTEST_VERSION "1.21"
 
 #include <my_global.h>
 #include <mysql_embed.h>
@@ -1873,7 +1873,7 @@ void usage()
   printf("Runs a test against the mysql server and compares output with a results file.\n\n");
   printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname);
   my_print_help(my_long_options);
-  printf("  --no-defaults       Don't read default options from any options file.\n\n");
+  printf("  --no-defaults       Don't read default options from any options file.\n");
   my_print_variables(my_long_options);
 }