~maria-captains/maria/mariadb-5.1-knielsen

« back to all changes in this revision

Viewing changes to sql-common/my_time.c

  • Committer: Sergei Golubchik
  • Date: 2011-11-08 22:07:19 UTC
  • Revision ID: sergii@pisem.net-20111108220719-49z3pgh12fj76mf0
typos fixed
(thanks viva64.com)

Show diffs side-by-side

added added

removed removed

Lines of Context:
337
337
        {
338
338
          if (str[0] == 'p' || str[0] == 'P')
339
339
            add_hours= 12;
340
 
          else if (str[0] != 'a' || str[0] != 'A')
 
340
          else if (str[0] != 'a' && str[0] != 'A')
341
341
            continue;                           /* Not AM/PM */
342
342
          str+= 2;                              /* Skip AM/PM */
343
343
          /* Skip space after AM/PM */