summaryrefslogtreecommitdiff
path: root/sql-common/my_time.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-08 23:07:19 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-08 23:07:19 +0100
commit04f3ecf632816a940e2838949e0216d638436fd8 (patch)
tree133bba7d41b052dae9b6947cd41545016f507fdf /sql-common/my_time.c
parent28e2777991b238d770529d0438e4f18fbfc3e271 (diff)
downloadmariadb-git-04f3ecf632816a940e2838949e0216d638436fd8.tar.gz
typos fixed
(thanks viva64.com)
Diffstat (limited to 'sql-common/my_time.c')
-rw-r--r--sql-common/my_time.c2
1 files changed, 1 insertions, 1 deletions
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 */