diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-12 18:08:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-12 18:08:12 +0100 |
| commit | 557f0d3ad04111e274d709de5fd9879961772210 (patch) | |
| tree | d7d1767519b4631349ca244a988478f808163919 /sql-common | |
| parent | db0aed93482759844af7b39c9bf6e7fe141f28f6 (diff) | |
| parent | 27095a24f6cb0e8c859c1a3f76050e6b5a6434c6 (diff) | |
| download | mariadb-git-557f0d3ad04111e274d709de5fd9879961772210.tar.gz | |
5.2->5.3 merge
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 1d7960101a7..d2f7a8641ba 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -345,7 +345,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 */ |