opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

This is the first (of hopefully few) AIX port patches. This patch 

was tested with Linux/GCC.  I still have some issues with with the
snprintf() function.

David Hartwig
This commit is contained in:
Bruce Momjian 1998-08-29 04:09:29 +00:00
parent 9a88848027
commit 9728ce7499
5 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/commands/copy.c
View File

@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.54 1998/08/24 01:13:39 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.55 1998/08/29 04:09:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -65,7 +65,7 @@ static char *CopyReadAttribute(FILE *fp, bool *isnull, char *delim, int *newline
static char *CopyReadAttribute(FILE *fp, bool *isnull, char *delim);
#endif
static void CopyAttributeOut(FILE *fp, unsigned char *string, char *delim, int is_array);
static void CopyAttributeOut(FILE *fp, char *string, char *delim, int is_array);
static int CountTuples(Relation relation);
extern FILE *Pfout,
@ -1146,9 +1146,9 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim)
}
static void
CopyAttributeOut(FILE *fp, unsigned char *server_string, char *delim, int is_array)
CopyAttributeOut(FILE *fp, char *server_string, char *delim, int is_array)
{
unsigned char *string;
char *string;
char c;
#ifdef MULTIBYTE

10
src/backend/commands/dbcommands.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.21 1998/08/24 01:13:40 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.22 1998/08/29 04:09:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -45,8 +45,8 @@ static void stop_vacuum(char *dbpath, char *dbname);
void
createdb(char *dbname, char *dbpath, int encoding)
{
Oid db_id,
user_id;
Oid db_id;
int4 user_id;
char buf[512];
char *lp,
loc[512];
@ -100,8 +100,8 @@ createdb(char *dbname, char *dbpath, int encoding)
void
destroydb(char *dbname)
{
Oid user_id,
db_id;
int4 user_id;
Oid db_id;
char *path;
char dbpath[MAXPGPATH + 1];
char buf[512];

9
src/backend/optimizer/plan/planner.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.29 1998/07/20 21:18:32 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.30 1998/08/29 04:09:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -244,16 +244,15 @@ union_planner(Query *parse)
* using the same function as for a subselect in 'where' */
if (parse->hasSubLinks)
{
(List *) parse->havingQual =
(List *) SS_process_sublinks((Node *) parse->havingQual);
parse->havingQual = SS_process_sublinks((Node *) parse->havingQual);
}
/* convert the havingQual to conjunctive normal form (cnf) */
(List *) parse->havingQual=cnfify((Expr *)(Node *) parse->havingQual,true);
parse->havingQual = (Node * ) cnfify((Expr *)(Node *) parse->havingQual,true);
/* Calculate the opfids from the opnos (=select the correct functions for
* the used VAR datatypes) */
(List *) parse->havingQual=fix_opids((List *) parse->havingQual);
parse->havingQual = (Node * ) fix_opids((List *) parse->havingQual);
((Agg *) result_plan)->plan.qual=(List *) parse->havingQual;

14
src/backend/utils/adt/varlena.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.39 1998/07/24 03:31:43 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.40 1998/08/29 04:09:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -475,10 +475,10 @@ textne(text *arg1, text *arg2)
* Returns -1, 0 or 1
*/
int
varstr_cmp(unsigned char *arg1, int len1, unsigned char *arg2, int len2)
varstr_cmp(char *arg1, int len1, char *arg2, int len2)
{
int result;
unsigned char *a1p, *a2p;
char *a1p, *a2p;
#ifdef USE_LOCALE
a1p = (unsigned char *) palloc(len1 + 1);
@ -518,14 +518,14 @@ varstr_cmp(unsigned char *arg1, int len1, unsigned char *arg2, int len2)
int
text_cmp(text *arg1, text *arg2)
{
unsigned char *a1p, *a2p;
int len1, len2;
char *a1p, *a2p;
int len1, len2;
if (arg1 == NULL || arg2 == NULL)
return ((bool) FALSE);
a1p = (unsigned char *) VARDATA(arg1);
a2p = (unsigned char *) VARDATA(arg2);
a1p = VARDATA(arg1);
a2p = VARDATA(arg2);
len1 = VARSIZE(arg1) - VARHDRSZ;
len2 = VARSIZE(arg2) - VARHDRSZ;

4
src/include/utils/builtins.h
View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: builtins.h,v 1.47 1998/08/19 02:04:03 momjian Exp $
* $Id: builtins.h,v 1.48 1998/08/29 04:09:29 momjian Exp $
*
* NOTES
* This should normally only be included by fmgr.h.
@ -438,7 +438,7 @@ extern char *textout(text *vlena);
extern text *textcat(text *arg1, text *arg2);
extern bool texteq(text *arg1, text *arg2);
extern bool textne(text *arg1, text *arg2);
extern int varstr_cmp(unsigned char *arg1, int len1, unsigned char *arg2, int len2);
extern int varstr_cmp(char *arg1, int len1, char *arg2, int len2);
extern int text_cmp(text *arg1, text *arg2);
extern bool text_lt(text *arg1, text *arg2);
extern bool text_le(text *arg1, text *arg2);