diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 4410aa1c9aa53d9dbe5a8ec8137c268fc587bf2e..0de5ec07b9e7b85d744bde8176737dac06a669ec 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.42 1998/09/01 04:32:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.43 1998/09/02 23:37:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -610,9 +610,11 @@ byteaGetByte(text *v, int32 n)
 		elog(ERROR, "byteaGetByte: index (=%d) out of range [0..%d]",
 			 n, len - 1);
 	}
-
+#ifdef USE_LOCALE
 	byte = (unsigned char) (v->vl_dat[n]);
-
+#else
+	byte = v->vl_dat[n];
+#endif
 	return (int32) byte;
 }
 
diff --git a/src/test/regress/expected/select_having.out b/src/test/regress/expected/select_having.out
index f9188a08fb94956aac2f8627c1d89ce69a805b77..37a5a442f7d7be5fcd84647a42e1122a83ccf427 100644
--- a/src/test/regress/expected/select_having.out
+++ b/src/test/regress/expected/select_having.out
@@ -9,12 +9,12 @@ QUERY: INSERT INTO test_having VALUES (6, 4, 'cccc', 'g');
 QUERY: INSERT INTO test_having VALUES (7, 4, 'cccc', 'h');
 QUERY: INSERT INTO test_having VALUES (8, 4, 'CCCC', 'I');
 QUERY: INSERT INTO test_having VALUES (9, 4, 'CCCC', 'j');
-QUERY: SELECT max(a) FROM test_having
-	GROUP BY lower(c) HAVING count(*) > 2 OR min(b) = 3;
-max
----
-  5
-  9
+QUERY: SELECT b, c FROM test_having
+	GROUP BY b, c HAVING count(*) = 1;
+b|c       
+-+--------
+1|XXXX    
+3|bbbb    
 (2 rows)
 
 QUERY: SELECT lower(c), count(c) FROM test_having
diff --git a/src/test/regress/sql/select_having.sql b/src/test/regress/sql/select_having.sql
index cbb256e1da322c2a843ac1889cda6d7020fe4a19..95cff8501b77e95375bba4cf36f099d75d3dea87 100644
--- a/src/test/regress/sql/select_having.sql
+++ b/src/test/regress/sql/select_having.sql
@@ -15,8 +15,8 @@ INSERT INTO test_having VALUES (7, 4, 'cccc', 'h');
 INSERT INTO test_having VALUES (8, 4, 'CCCC', 'I');
 INSERT INTO test_having VALUES (9, 4, 'CCCC', 'j');
 
-SELECT max(a) FROM test_having
-	GROUP BY lower(c) HAVING count(*) > 2 OR min(b) = 3;
+SELECT b, c FROM test_having
+	GROUP BY b, c HAVING count(*) = 1;
 
 SELECT lower(c), count(c) FROM test_having
 	GROUP BY lower(c) HAVING count(*) > 2 OR min(a) = max(a);