From 162e0e0db1a5780aa8348e42be48d06a8b153cb0 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Sun, 23 Jul 2006 22:13:12 +0200
Subject: [PATCH 1/3] Remove strange comment

---
 client/mysql.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/mysql.cc b/client/mysql.cc
index 22534324aca..9de27572300 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -423,10 +423,6 @@ int main(int argc,char *argv[])
     signal(SIGINT, mysql_end);			// Catch SIGINT to clean up
   signal(SIGQUIT, mysql_end);			// Catch SIGQUIT to clean up
 
-  /*
-    Run in interactive mode like the ingres/postgres monitor
-  */
-
   put_info("Welcome to the MySQL monitor.  Commands end with ; or \\g.",
 	   INFO_INFO);
   sprintf((char*) glob_buffer.ptr(),

From 1c5c12ac5e4147326ef516c50fb0320b4c9e85ef Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.blaudden" <>
Date: Fri, 2 Mar 2007 15:21:01 +0100
Subject: [PATCH 2/3] Add hint about using --help to see what options are
 available

---
 BUILD/SETUP.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index febaac66e14..10324c22e56 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -34,6 +34,7 @@ Note:  this script is intended for internal use by MySQL developers.
 EOF
   * )
     echo "Unknown option '$1'"
+    echo "Use -h or --help for usage"
     exit 1
     break ;;
   esac

From ccde4a52d952f316fe30ade36e307aecac607e8e Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.blaudden" <>
Date: Mon, 5 Mar 2007 17:16:16 +0100
Subject: [PATCH 3/3] Fix VC++ warning, "conversion from ha_checksum to char"

---
 extra/comp_err.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/comp_err.c b/extra/comp_err.c
index e5f7ed8d0ea..a30492e7aed 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -639,7 +639,7 @@ static struct message *find_message(struct errors *err, const char *lang,
 
 static char checksum_format_specifier(const char* msg)
 {
-  char chksum= 0;
+  ha_checksum chksum= 0;
   const char* p= msg;
   const char* start= 0;
   int num_format_specifiers= 0;