From 57b5966405fb6e237676acef55973c064ac65a2a Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 30 Mar 1998 17:28:21 +0000
Subject: The following uuencoded, gzip'd file will ...

1. Remove the char2, char4, char8 and char16 types from postgresql
2. Change references of char16 to name in the regression tests.
3. Rename the char16.sql regression test to name.sql.  4. Modify
the regression test scripts and outputs to match up.

Might require new regression.{SYSTEM} files...

Darren King
---
 src/backend/bootstrap/bootstrap.c | 110 ++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 64 deletions(-)

(limited to 'src/backend/bootstrap/bootstrap.c')

diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index b23eb3c4e98..f1d4ddd04d0 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.37 1998/02/26 04:30:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.38 1998/03/30 17:22:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,88 +16,70 @@
 #include <stdio.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <string.h>
 
 #define BOOTSTRAP_INCLUDE		/* mask out stuff in tcop/tcopprot.h */
 
 #include "postgres.h"
 
-#include "catalog/pg_attribute.h"
+#include "miscadmin.h"
+#include "fmgr.h"
+
 #include "access/attnum.h"
-#include "nodes/pg_list.h"
+#include "access/funcindex.h"
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "access/htup.h"
+#include "access/itup.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
+#include "access/skey.h"
+#include "access/strat.h"
 #include "access/tupdesc.h"
-#include "storage/fd.h"
+#include "access/xact.h"
+#include "bootstrap/bootstrap.h"
+#include "catalog/catname.h"
+#include "catalog/index.h"
 #include "catalog/pg_am.h"
+#include "catalog/pg_attribute.h"
 #include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
+#include "executor/execdesc.h"
+#include "executor/hashjoin.h"
+#include "executor/tuptable.h"
+#include "libpq/pqsignal.h"
+#include "nodes/execnodes.h"
+#include "nodes/memnodes.h"
 #include "nodes/nodes.h"
+#include "nodes/params.h"
+#include "nodes/parsenodes.h"
+#include "nodes/plannodes.h"
+#include "nodes/pg_list.h"
+#include "nodes/primnodes.h"
 #include "rewrite/prs2lock.h"
-#include "access/skey.h"
-#include "access/strat.h"
-#include "utils/rel.h"
-#include "libpq/pqsignal.h"
-
 #include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "utils/nabstime.h"
-#include "access/htup.h"
 #include "storage/buf.h"
-#include "access/relscan.h"
-#include "access/heapam.h"
-
-#include "fmgr.h"
-
-#include "access/funcindex.h"
-
-#include "nodes/memnodes.h"
-
-#include "miscadmin.h"
-
-#include "catalog/pg_type.h"
-
-#include "access/itup.h"
-#include "bootstrap/bootstrap.h"
-
-#include "tcop/tcopprot.h"
-
+#include "storage/fd.h"
 #include "storage/ipc.h"
+#include "storage/itemptr.h"
+#include "storage/lock.h"
+#include "storage/off.h"
+#include "storage/shmem.h"
 #include "storage/spin.h"
+#include "tcop/dest.h"
+#include "tcop/tcopprot.h"
+#include "utils/builtins.h"
+#include "utils/geo_decls.h"
 #include "utils/hsearch.h"
-#include "storage/shmem.h"
-#include "storage/lock.h"
-
-#include "access/xact.h"
+#include "utils/lsyscache.h"
+#include "utils/mcxt.h"
+#include "utils/nabstime.h"
+#include "utils/portal.h"
+#include "utils/rel.h"
 
 #ifndef HAVE_MEMMOVE
 #include "regex/utils.h"
 #endif
-#include <string.h>
-
-#include "nodes/primnodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/params.h"
-#include "access/sdir.h"
-#include "executor/hashjoin.h"
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "tcop/dest.h"
-#include "executor/execdesc.h"
-#include "utils/portal.h"
-
-#include "utils/mcxt.h"
-
-#include "catalog/catname.h"
-
-#include "utils/geo_decls.h"
-#include "utils/builtins.h"
-
-#include "catalog/index.h"
-
-#include "access/genam.h"
-
-#include "utils/lsyscache.h"
-
-#include "utils/palloc.h"
 
 #define ALLOC(t, c)		(t *)calloc((unsigned)(c), sizeof(t))
 #define FIRST_TYPE_OID 16		/* OID of the first type */
@@ -161,7 +143,7 @@ static struct typinfo Procid[] = {
 	{"bytea", 17, 0, -1, F_BYTEAIN, F_BYTEAOUT},
 	{"char", 18, 0, 1, F_CHARIN, F_CHAROUT},
 	{"name", 19, 0, NAMEDATALEN, F_NAMEIN, F_NAMEOUT},
-	{"char16", 20, 0, 16, F_CHAR16IN, F_CHAR16OUT},
+	{"dummy", 20, 0, 16, 0, 0},
 /*	  { "dt",		  20,	 0,  4, F_DTIN,			F_DTOUT}, */
 	{"int2", 21, 0, 2, F_INT2IN, F_INT2OUT},
 	{"int28", 22, 0, 16, F_INT28IN, F_INT28OUT},
-- 
cgit v1.2.3