summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2006-09-04 19:29:18 +0000
committerBruce Momjian <bruce@momjian.us>2006-09-04 19:29:18 +0000
commite73687f2ecd2bbec22812db1c19fd6ee8dc3c08e (patch)
treec78e22273152d3311abaed0e06db388edfbfd2bf
parent1e64862ab39b27745e31876043dc72c607a1169e (diff)
downloadpostgresql-e73687f2ecd2bbec22812db1c19fd6ee8dc3c08e.tar.gz
Backpatch to 8.1.X fix for to_timestamp() where "PM/AM" specification
was eating too much user input, producing incorrect results.
-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 96b99730dd..6f616eafb9 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.101.2.2 2005/12/03 16:45:23 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.101.2.3 2006/09/04 19:29:18 momjian Exp $
*
*
* Portions Copyright (c) 1999-2005, PostgreSQL Global Development Group
@@ -1740,7 +1740,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:
@@ -1759,7 +1759,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:
@@ -1778,7 +1778,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:
@@ -1797,7 +1797,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: