From 04f3ecf632816a940e2838949e0216d638436fd8 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 8 Nov 2011 23:07:19 +0100 Subject: typos fixed (thanks viva64.com) --- sql-common/my_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql-common') diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 03a124a341a..436e6b2761e 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -337,7 +337,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, { if (str[0] == 'p' || str[0] == 'P') add_hours= 12; - else if (str[0] != 'a' || str[0] != 'A') + else if (str[0] != 'a' && str[0] != 'A') continue; /* Not AM/PM */ str+= 2; /* Skip AM/PM */ /* Skip space after AM/PM */ -- cgit v1.2.1