aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2006-09-03 01:22:56 +0000
committerBruce Momjian <bruce@momjian.us>2006-09-03 01:22:56 +0000
commit1d4abf21751496d35d096cfdbcc2ba986e9b5e7c (patch)
tree39a325d7f32a071e051756ba727bbf68ab4a89d6
parent754c7d53a458e7c86d475995bf5830da82518f7b (diff)
downloadpostgresql-1d4abf21751496d35d096cfdbcc2ba986e9b5e7c.tar.gz
postgresql-1d4abf21751496d35d096cfdbcc2ba986e9b5e7c.zip
Fix case where "PM" to_timestamp() mask was eating too many characters.
Report from Josh Tolley.
-rw-r--r--src/backend/utils/adt/formatting.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 3431a063cc8..1a711090bd0 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------
* formatting.c
*
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.110 2006/04/19 18:49:09 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.111 2006/09/03 01:22:56 momjian Exp $
*
*
* Portions Copyright (c) 1999-2006, PostgreSQL Global Development Group
@@ -1762,7 +1762,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
tmfc->am = TRUE;
else
AMPM_ERROR;
- return strlen(p_inout);
+ return strlen(P_M_STR);
}
break;
case DCH_AM:
@@ -1781,7 +1781,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
tmfc->am = TRUE;
else
AMPM_ERROR;
- return strlen(p_inout);
+ return strlen(PM_STR);
}
break;
case DCH_a_m:
@@ -1800,7 +1800,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
tmfc->am = TRUE;
else
AMPM_ERROR;
- return strlen(p_inout);
+ return strlen(p_m_STR);
}
break;
case DCH_am:
@@ -1819,7 +1819,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
tmfc->am = TRUE;
else
AMPM_ERROR;
- return strlen(p_inout);
+ return strlen(pm_STR);
}
break;
case DCH_HH: