diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-12 16:47:14 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-12 16:47:14 +0100 |
| commit | 27095a24f6cb0e8c859c1a3f76050e6b5a6434c6 (patch) | |
| tree | 793f6a4bbb8edbc49c12ffb28526ce7f885ca3bb /sql-common | |
| parent | 755cd443f95f8e6d064b18af3fb0c496b82abfe7 (diff) | |
| parent | 5c7aa5f2ae533d395b4c7460d8a388b6326a5add (diff) | |
| download | mariadb-git-27095a24f6cb0e8c859c1a3f76050e6b5a6434c6.tar.gz | |
5.1 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 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 */ |