Commite3f2eb1

committed

Fix for varchar functions, and indextyple j-1 fix.

1 parent8203410 commite3f2eb1Copy full SHA for e3f2eb1

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.24 1998/02/04 21:32:09 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.25 1998/02/05 17:22:23 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -293,7 +293,7 @@ nocache_index_getattr(IndexTuple tup,`
`293`	`293`	`while (att[j]->attcacheoff>0)`
`294`	`294`	`j++;`
`295`	`295`
`296`		`-if (!VARLENA_FIXED_SIZE(att[j]))`
	`296`	`+if (!VARLENA_FIXED_SIZE(att[j-1]))`
`297`	`297`	`off=att[j-1]->attcacheoff+att[j-1]->attlen;`
`298`	`298`	`else`
`299`	`299`	`off=att[j-1]->attcacheoff+att[j-1]->atttypmod;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.15 1998/02/03 01:53:16 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.16 1998/02/05 17:22:29 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -101,7 +101,7 @@ transformExpr(ParseState pstate, Node expr, int precedence)`
`101`	`101`	`Value*val=&con->val;`
`102`	`102`
`103`	`103`	`if (con->typename!=NULL)`
`104`		`-result=parser_typecast(val,con->typename,-1);`
	`104`	`+result=parser_typecast(val,con->typename,0);`
`105`	`105`	`else`
`106`	`106`	`result= (Node*)make_const(val);`
`107`	`107`	`break;`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.24 1998/01/16 23:20:34 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.25 1998/02/05 17:22:41 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -60,7 +60,7 @@ bpcharin(char *s, int dummy, int atttypmod)`
`60`	`60`	`if (s==NULL)`
`61`	`61`	`return ((char*)NULL);`
`62`	`62`
`63`		`-if (atttypmod==-1)`
	`63`	`+if (atttypmod<1)`
`64`	`64`	`{`
`65`	`65`
`66`	`66`	`/*`
`@@ -133,7 +133,7 @@ varcharin(char *s, int dummy, int atttypmod)`
`133`	`133`	`return ((char*)NULL);`
`134`	`134`
`135`	`135`	`len=strlen(s)+VARHDRSZ;`
`136`		`-if (atttypmod!=-1&&len>atttypmod)`
	`136`	`+if (atttypmod>0&&len>atttypmod)`
`137`	`137`	`len=atttypmod;/* clip the string at max length */`
`138`	`138`
`139`	`139`	`if (len>4096)`

Comments

(0)