diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index c0086fe559efb31b832bee61447fc71f72b85c8b..56a34908ac5860c524395f962a22e50841df8376 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.17 1999/02/10 03:52:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.18 1999/02/10 17:14:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -606,11 +606,11 @@ hash_inner_and_outer(RelOptInfo * joinrel,
innerrel->size,
outerrel->width,
innerrel->width,
- (Path *) outerrel->cheapestpath,
- (Path *) innerrel->cheapestpath,
+ (Path *) outerrel->cheapestpath,
+ (Path *) innerrel->cheapestpath,
hash_pathkeys,
xhashinfo->hashop,
- ((JoinMethod *) xhashinfo)->clauses,
+ ((JoinMethod *) xhashinfo)->clauses,
outerkeys,
innerkeys);
hjoin_list = lappend(hjoin_list, temp_node);
diff --git a/src/backend/optimizer/path/joinutils.c b/src/backend/optimizer/path/joinutils.c
index bdfa430814259245696c1c0a3d49135b10a813f8..e09543876b0161b57e8ebd4d9a9ef2f9bd3fca81 100644
--- a/src/backend/optimizer/path/joinutils.c
+++ b/src/backend/optimizer/path/joinutils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.14 1999/02/10 03:52:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.15 1999/02/10 17:14:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,14 +27,13 @@
static int match_pathkey_joinkeys(List *pathkey, List *joinkeys,
- int which_subkey);
+ int which_subkey);
static bool every_func(List *joinkeys, List *pathkey,
- int which_subkey);
-static List *new_join_pathkey(List *subkeys,
- List *considered_subkeys, List *join_rel_tlist,
- List *joinclauses);
+ int which_subkey);
+static List *new_join_pathkey(List *subkeys, List *considered_subkeys,
+ List *join_rel_tlist, List *joinclauses);
static List *new_matching_subkeys(Var *subkey, List *considered_subkeys,
- List *join_rel_tlist, List *joinclauses);
+ List *join_rel_tlist, List *joinclauses);
/****************************************************************************
* KEY COMPARISONS
@@ -219,8 +218,7 @@ match_paths_joinkeys(List *joinkeys,
key_match = every_func(joinkeys, path->pathkeys, which_subkey);
if (equal_path_ordering(ordering, path->path_order) &&
- length(joinkeys) == length(path->pathkeys) &&
- key_match)
+ length(joinkeys) == length(path->pathkeys) && key_match)
{
if (matched_path)
@@ -273,7 +271,7 @@ extract_path_keys(List *joinkeys,
key = (Var *) matching_tlvar(var, tlist);
/*
- * include it in the pathkeys list if we haven't already done so
+ * Include it in the pathkeys list if we haven't already done so
*/
foreach(p, pathkeys)
{
@@ -381,7 +379,7 @@ new_join_pathkey(List *subkeys,
else
newly_considered_subkeys = matched_subkeys;
- considered_subkeys = append(considered_subkeys, newly_considered_subkeys);
+ considered_subkeys = append(considered_subkeys, newly_considered_subkeys);
t_list = nconc(t_list, newly_considered_subkeys);
}
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index fbad2306db79dbe19d644df5de50cfe59d99aab6..21f91454c8409af6a6399674ed66fb013f2bda4a 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.41 1999/02/10 03:52:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.42 1999/02/10 17:14:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -870,8 +870,8 @@ make_noname(List *tlist,
/* Create a new target list for the noname, with keys set. */
noname_tlist = set_noname_tlist_operators(new_unsorted_tlist(tlist),
- pathkeys,
- operators);
+ pathkeys,
+ operators);
switch (nonametype)
{
case NONAME_SORT:
@@ -879,9 +879,9 @@ make_noname(List *tlist,
NIL,
_NONAME_RELATION_ID_,
(Plan *) make_sort(noname_tlist,
- _NONAME_RELATION_ID_,
- plan_node,
- length(pathkeys)));
+ _NONAME_RELATION_ID_,
+ plan_node,
+ length(pathkeys)));
break;
case NONAME_MATERIAL:
@@ -889,9 +889,9 @@ make_noname(List *tlist,
NIL,
_NONAME_RELATION_ID_,
(Plan *) make_material(noname_tlist,
- _NONAME_RELATION_ID_,
- plan_node,
- length(pathkeys)));
+ _NONAME_RELATION_ID_,
+ plan_node,
+ length(pathkeys)));
break;
default:
diff --git a/src/tools/find_typedef b/src/tools/find_typedef
index 3017da5b70870f5d21b653416e7dcd0ab5534237..6f4a91ea5db419003f56205e8f381d42920394f0 100755
--- a/src/tools/find_typedef
+++ b/src/tools/find_typedef
@@ -5,8 +5,7 @@
# For this program to work, you must have compiled all binaries with
# debugging symbols.
#
-# This is run on BSD/OS 3.0, so you may need to make changes for your
-# version of nm.
+# This is run on BSD/OS 4.0, so you may need to make changes.
#
# Ignore the nm errors about a file not being a binary file.
#
@@ -18,10 +17,12 @@ then echo "Usage: $0 postgres_binary_directory" 1>&2
exit 1
fi
-nm -a "$1"/* |
-grep LSYM |
+objdump --stabs "$1"/* |
+grep "LSYM" |
+awk '{print $7}' |
grep ':t' |
-sed 's/^.*LSYM \([^:]*\):.*$/\1/' |
-grep -v ' ' | # some typedefs have spaces, revove them
-sort |
+sed 's/^\([^:]*\).*$/\1/' |
+grep -v ' ' | # some typedefs have spaces, remove them
+sort |
uniq
+