From 3d750efcb1dc3566df708261b61e8f55b8a46b56 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Thu, 26 Feb 2004 01:05:04 +0100
Subject: do not look for string characters "'` inside comments - bug#539

---
 client/mysql.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client/mysql.cc')

diff --git a/client/mysql.cc b/client/mysql.cc
index 15770d2eb52..bcb2e1a6e1a 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1010,7 +1010,7 @@ static bool add_line(String &buffer,char *line,char *in_string)
     {						// Add found char to buffer
       if (inchar == *in_string)
 	*in_string=0;
-      else if (!*in_string && (inchar == '\'' || inchar == '"' || inchar == '`'))
+      else if (!in_comment && !*in_string && (inchar == '\'' || inchar == '"' || inchar == '`'))
 	*in_string=(char) inchar;
       *out++ = (char) inchar;
       if (inchar == '*' && !*in_string)
-- 
cgit v1.2.1


From ae18d8d64c37d9d176e76f0b5b7d7fcc75a7c7c7 Mon Sep 17 00:00:00 2001
From: "paul@ice.snake.net" <>
Date: Mon, 8 Mar 2004 15:52:06 -0600
Subject: Patch for #3068: [Prompt without seconds when set from INI file].
 (Fix hours/seconds always to display with two digits.)

---
 client/mysql.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'client/mysql.cc')

diff --git a/client/mysql.cc b/client/mysql.cc
index bcb2e1a6e1a..695cb1f28be 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2676,6 +2676,8 @@ static const char* construct_prompt()
 	processed_prompt.append(' ');
 	break;
       case 'R':
+	if (t->tm_hour < 10)
+	  processed_prompt.append('0');
 	add_int_to_prompt(t->tm_hour);
 	break;
       case 'r':
@@ -2683,6 +2685,8 @@ static const char* construct_prompt()
 	getHour = t->tm_hour % 12;
 	if (getHour == 0)
 	  getHour=12;
+	if (getHour < 10)
+	  processed_prompt.append('0');
 	add_int_to_prompt(getHour);
 	break;
       case 'm':
@@ -2708,6 +2712,8 @@ static const char* construct_prompt()
 	processed_prompt.append(strtok(dateTime,"\n"));
 	break;
       case 's':
+	if (t->tm_sec < 10)
+	  processed_prompt.append('0');
 	add_int_to_prompt(t->tm_sec);
 	break;
       case 'w':
-- 
cgit v1.2.1