Thread: Re: [HACKERS] build of 7.2.1 on SCO Openserver and Unixware 7.1.1
Nicolas Bazin wrote: > Sorry for the package, but the following patch need to be applied > to get the new verion compiled on SCO Openserver 5.0.5 and > Unixware 7.1.1 Reworked patch attached. I reordered configure.in (autoconf will need to be run). I fixed the ODBC pow() call as Tom suggested, and the regression script. I did not touch TCL because that should be reworked for 7.3 anyway. -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 853-3000 + If your life is a hard drive, | 830 Blythe Avenue + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 Index: configure.in =================================================================== RCS file: /cvsroot/pgsql/configure.in,v retrieving revision 1.178 diff -c -r1.178 configure.in *** configure.in 14 Apr 2002 17:23:20 -0000 1.178 --- configure.in 18 Apr 2002 01:14:14 -0000 *************** *** 696,703 **** AC_CHECK_LIB(util, setproctitle) AC_CHECK_LIB(m, main) AC_CHECK_LIB(dl, main) - AC_CHECK_LIB(socket, main) AC_CHECK_LIB(nsl, main) AC_CHECK_LIB(ipc, main) AC_CHECK_LIB(IPC, main) AC_CHECK_LIB(lc, main) --- 696,703 ---- AC_CHECK_LIB(util, setproctitle) AC_CHECK_LIB(m, main) AC_CHECK_LIB(dl, main) AC_CHECK_LIB(nsl, main) + AC_CHECK_LIB(socket, main) AC_CHECK_LIB(ipc, main) AC_CHECK_LIB(IPC, main) AC_CHECK_LIB(lc, main) Index: src/interfaces/odbc/convert.c =================================================================== RCS file: /cvsroot/pgsql/src/interfaces/odbc/convert.c,v retrieving revision 1.78 diff -c -r1.78 convert.c *** src/interfaces/odbc/convert.c 1 Apr 2002 03:01:14 -0000 1.78 --- src/interfaces/odbc/convert.c 18 Apr 2002 01:14:29 -0000 *************** *** 2717,2723 **** y = 0; for (i = 1; i <= 3; i++) ! y += (s[i] - 48) * (int) pow(8, 3 - i); return y; --- 2717,2723 ---- y = 0; for (i = 1; i <= 3; i++) ! y += (s[i] - '0') << (3 * (3 - i)); return y; *************** *** 2740,2746 **** else val = s[i] - '0'; ! y += val * (int) pow(16, 2 - i); } return y; --- 2740,2746 ---- else val = s[i] - '0'; ! y += val << (4 * (2 - i)); } return y; *************** *** 2795,2801 **** for (i = 4; i > 1; i--) { ! x[i] = (val & 7) + 48; val >>= 3; } --- 2795,2801 ---- for (i = 4; i > 1; i--) { ! x[i] = (val & 7) + '0'; val >>= 3; } Index: src/test/regress/pg_regress.sh =================================================================== RCS file: /cvsroot/pgsql/src/test/regress/pg_regress.sh,v retrieving revision 1.23 diff -c -r1.23 pg_regress.sh *** src/test/regress/pg_regress.sh 3 Jan 2002 21:52:05 -0000 1.23 --- src/test/regress/pg_regress.sh 18 Apr 2002 01:14:30 -0000 *************** *** 161,167 **** # ---------- case $host_platform in ! *-*-qnx* | *beos*) unix_sockets=no;; *) unix_sockets=yes;; --- 161,167 ---- # ---------- case $host_platform in ! *-*-qnx* | *beos* | *-*-sco3.2v5* | *-*-sysv5) unix_sockets=no;; *) unix_sockets=yes;;
The have_unix_sockets test in the regression test script should NOT include sysv5. They work fine in UnixWare 7.1.1 and OU8. On Wed, 2002-04-17 at 20:17, Bruce Momjian wrote: > Nicolas Bazin wrote: > > Sorry for the package, but the following patch need to be applied > > to get the new verion compiled on SCO Openserver 5.0.5 and > > Unixware 7.1.1 > > Reworked patch attached. I reordered configure.in (autoconf will need > to be run). I fixed the ODBC pow() call as Tom suggested, and the > regression script. I did not touch TCL because that should be reworked > for 7.3 anyway. > > -- > Bruce Momjian | http://candle.pha.pa.us > pgman@candle.pha.pa.us | (610) 853-3000 > + If your life is a hard drive, | 830 Blythe Avenue > + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 > ---- > > Index: configure.in > =================================================================== > RCS file: /cvsroot/pgsql/configure.in,v > retrieving revision 1.178 > diff -c -r1.178 configure.in > *** configure.in 14 Apr 2002 17:23:20 -0000 1.178 > --- configure.in 18 Apr 2002 01:14:14 -0000 > *************** > *** 696,703 **** > AC_CHECK_LIB(util, setproctitle) > AC_CHECK_LIB(m, main) > AC_CHECK_LIB(dl, main) > - AC_CHECK_LIB(socket, main) > AC_CHECK_LIB(nsl, main) > AC_CHECK_LIB(ipc, main) > AC_CHECK_LIB(IPC, main) > AC_CHECK_LIB(lc, main) > --- 696,703 ---- > AC_CHECK_LIB(util, setproctitle) > AC_CHECK_LIB(m, main) > AC_CHECK_LIB(dl, main) > AC_CHECK_LIB(nsl, main) > + AC_CHECK_LIB(socket, main) > AC_CHECK_LIB(ipc, main) > AC_CHECK_LIB(IPC, main) > AC_CHECK_LIB(lc, main) > Index: src/interfaces/odbc/convert.c > =================================================================== > RCS file: /cvsroot/pgsql/src/interfaces/odbc/convert.c,v > retrieving revision 1.78 > diff -c -r1.78 convert.c > *** src/interfaces/odbc/convert.c 1 Apr 2002 03:01:14 -0000 1.78 > --- src/interfaces/odbc/convert.c 18 Apr 2002 01:14:29 -0000 > *************** > *** 2717,2723 **** > y = 0; > > for (i = 1; i <= 3; i++) > ! y += (s[i] - 48) * (int) pow(8, 3 - i); > > return y; > > --- 2717,2723 ---- > y = 0; > > for (i = 1; i <= 3; i++) > ! y += (s[i] - '0') << (3 * (3 - i)); > > return y; > > *************** > *** 2740,2746 **** > else > val = s[i] - '0'; > > ! y += val * (int) pow(16, 2 - i); > } > > return y; > --- 2740,2746 ---- > else > val = s[i] - '0'; > > ! y += val << (4 * (2 - i)); > } > > return y; > *************** > *** 2795,2801 **** > > for (i = 4; i > 1; i--) > { > ! x[i] = (val & 7) + 48; > val >>= 3; > } > > --- 2795,2801 ---- > > for (i = 4; i > 1; i--) > { > ! x[i] = (val & 7) + '0'; > val >>= 3; > } > > Index: src/test/regress/pg_regress.sh > =================================================================== > RCS file: /cvsroot/pgsql/src/test/regress/pg_regress.sh,v > retrieving revision 1.23 > diff -c -r1.23 pg_regress.sh > *** src/test/regress/pg_regress.sh 3 Jan 2002 21:52:05 -0000 1.23 > --- src/test/regress/pg_regress.sh 18 Apr 2002 01:14:30 -0000 > *************** > *** 161,167 **** > # ---------- > > case $host_platform in > ! *-*-qnx* | *beos*) > unix_sockets=no;; > *) > unix_sockets=yes;; > --- 161,167 ---- > # ---------- > > case $host_platform in > ! *-*-qnx* | *beos* | *-*-sco3.2v5* | *-*-sysv5) > unix_sockets=no;; > *) > unix_sockets=yes;; > ---- > > > ---------------------------(end of broadcast)--------------------------- > TIP 4: Don't 'kill -9' the postmaster -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 972-414-9812 E-Mail: ler@lerctr.org US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749
OK, new code is: ! *-*-qnx* | *beos* | *-*-sco3.2v5*) --------------------------------------------------------------------------- Larry Rosenman wrote: > The have_unix_sockets test in the regression test script should NOT > include sysv5. They work fine in UnixWare 7.1.1 and OU8. > > > > On Wed, 2002-04-17 at 20:17, Bruce Momjian wrote: > > Nicolas Bazin wrote: > > > Sorry for the package, but the following patch need to be applied > > > to get the new verion compiled on SCO Openserver 5.0.5 and > > > Unixware 7.1.1 > > > > Reworked patch attached. I reordered configure.in (autoconf will need > > to be run). I fixed the ODBC pow() call as Tom suggested, and the > > regression script. I did not touch TCL because that should be reworked > > for 7.3 anyway. > > > > -- > > Bruce Momjian | http://candle.pha.pa.us > > pgman@candle.pha.pa.us | (610) 853-3000 > > + If your life is a hard drive, | 830 Blythe Avenue > > + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 > > ---- > > > > > Index: configure.in > > =================================================================== > > RCS file: /cvsroot/pgsql/configure.in,v > > retrieving revision 1.178 > > diff -c -r1.178 configure.in > > *** configure.in 14 Apr 2002 17:23:20 -0000 1.178 > > --- configure.in 18 Apr 2002 01:14:14 -0000 > > *************** > > *** 696,703 **** > > AC_CHECK_LIB(util, setproctitle) > > AC_CHECK_LIB(m, main) > > AC_CHECK_LIB(dl, main) > > - AC_CHECK_LIB(socket, main) > > AC_CHECK_LIB(nsl, main) > > AC_CHECK_LIB(ipc, main) > > AC_CHECK_LIB(IPC, main) > > AC_CHECK_LIB(lc, main) > > --- 696,703 ---- > > AC_CHECK_LIB(util, setproctitle) > > AC_CHECK_LIB(m, main) > > AC_CHECK_LIB(dl, main) > > AC_CHECK_LIB(nsl, main) > > + AC_CHECK_LIB(socket, main) > > AC_CHECK_LIB(ipc, main) > > AC_CHECK_LIB(IPC, main) > > AC_CHECK_LIB(lc, main) > > Index: src/interfaces/odbc/convert.c > > =================================================================== > > RCS file: /cvsroot/pgsql/src/interfaces/odbc/convert.c,v > > retrieving revision 1.78 > > diff -c -r1.78 convert.c > > *** src/interfaces/odbc/convert.c 1 Apr 2002 03:01:14 -0000 1.78 > > --- src/interfaces/odbc/convert.c 18 Apr 2002 01:14:29 -0000 > > *************** > > *** 2717,2723 **** > > y = 0; > > > > for (i = 1; i <= 3; i++) > > ! y += (s[i] - 48) * (int) pow(8, 3 - i); > > > > return y; > > > > --- 2717,2723 ---- > > y = 0; > > > > for (i = 1; i <= 3; i++) > > ! y += (s[i] - '0') << (3 * (3 - i)); > > > > return y; > > > > *************** > > *** 2740,2746 **** > > else > > val = s[i] - '0'; > > > > ! y += val * (int) pow(16, 2 - i); > > } > > > > return y; > > --- 2740,2746 ---- > > else > > val = s[i] - '0'; > > > > ! y += val << (4 * (2 - i)); > > } > > > > return y; > > *************** > > *** 2795,2801 **** > > > > for (i = 4; i > 1; i--) > > { > > ! x[i] = (val & 7) + 48; > > val >>= 3; > > } > > > > --- 2795,2801 ---- > > > > for (i = 4; i > 1; i--) > > { > > ! x[i] = (val & 7) + '0'; > > val >>= 3; > > } > > > > Index: src/test/regress/pg_regress.sh > > =================================================================== > > RCS file: /cvsroot/pgsql/src/test/regress/pg_regress.sh,v > > retrieving revision 1.23 > > diff -c -r1.23 pg_regress.sh > > *** src/test/regress/pg_regress.sh 3 Jan 2002 21:52:05 -0000 1.23 > > --- src/test/regress/pg_regress.sh 18 Apr 2002 01:14:30 -0000 > > *************** > > *** 161,167 **** > > # ---------- > > > > case $host_platform in > > ! *-*-qnx* | *beos*) > > unix_sockets=no;; > > *) > > unix_sockets=yes;; > > --- 161,167 ---- > > # ---------- > > > > case $host_platform in > > ! *-*-qnx* | *beos* | *-*-sco3.2v5* | *-*-sysv5) > > unix_sockets=no;; > > *) > > unix_sockets=yes;; > > ---- > > > > > > > ---------------------------(end of broadcast)--------------------------- > > TIP 4: Don't 'kill -9' the postmaster > -- > Larry Rosenman http://www.lerctr.org/~ler > Phone: +1 972-414-9812 E-Mail: ler@lerctr.org > US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749 > > -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 853-3000 + If your life is a hard drive, | 830 Blythe Avenue + Christ can be your backup. | Drexel Hill, Pennsylvania 19026
On Wed, 2002-04-17 at 20:23, Bruce Momjian wrote: > > OK, new code is: > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) Thank You. LER -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 972-414-9812 E-Mail: ler@lerctr.org US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749
Bruce Momjian writes: > OK, new code is: > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) ^^^^^^^^^^^^^ I would like to see an explanation for this. -- Peter Eisentraut peter_e@gmx.net
On Wed, 2002-04-17 at 22:16, Peter Eisentraut wrote: > Bruce Momjian writes: > > > OK, new code is: > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > ^^^^^^^^^^^^^ > > I would like to see an explanation for this. I personally can't comment on SCO OpenServer. I do know that the original patch for sysv5 was wrong. (from personal experience). LER -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 972-414-9812 E-Mail: ler@lerctr.org US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749
Peter Eisentraut wrote: > Bruce Momjian writes: > > > OK, new code is: > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > ^^^^^^^^^^^^^ > > I would like to see an explanation for this. The patch section is below. Not knowing the platform, I have no idea why. case $host_platform in ! *-*-qnx* | *beos* | *-*-sco3.2v5*) unix_sockets=no;; *) unix_sockets=yes;; -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 853-3000 + If your life is a hard drive, | 830 Blythe Avenue + Christ can be your backup. | Drexel Hill, Pennsylvania 19026
The patch from Bruce does not correct the proper thing. The original patch I submitted was : *** postgresql-7.2.1-rc/src/test/regress/pg_regress.sh Tue Mar 26 16:49:04 2002 --- postgresql-7.2.1/src/test/regress/pg_regress.sh Tue Mar 26 17:03:39 2002 *************** *** 173,179 **** # ---------- case $host_platform in ! *-*-qnx*) DIFFFLAGS=-b;; *) DIFFFLAGS=-w;; --- 173,179 ---- # ---------- case $host_platform in ! *-*-qnx* | *-*-sco3.2v5* | *-*-sysv5) DIFFFLAGS=-b;; *) DIFFFLAGS=-w;; Because the diff tool that comes with Openserver or Unixware does not suppor the -w option but the -b option to remove blank characters. There is nothing wrong with unix sockets on both platforms. Nicolas ----- Original Message ----- From: "Bruce Momjian" <pgman@candle.pha.pa.us> To: "Peter Eisentraut" <peter_e@gmx.net> Cc: "Larry Rosenman" <ler@lerctr.org>; "Nicolas Bazin" <nbazin@ingenico.com.au>; "PostgreSQL-patches" <pgsql-patches@postgresql.org> Sent: Thursday, April 18, 2002 1:15 PM Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver and Unixware > Peter Eisentraut wrote: > > Bruce Momjian writes: > > > > > OK, new code is: > > > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > ^^^^^^^^^^^^^ > > > > I would like to see an explanation for this. > > The patch section is below. Not knowing the platform, I have no idea > why. > > case $host_platform in > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > unix_sockets=no;; > *) > unix_sockets=yes;; > > -- > Bruce Momjian | http://candle.pha.pa.us > pgman@candle.pha.pa.us | (610) 853-3000 > + If your life is a hard drive, | 830 Blythe Avenue > + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 > > ---------------------------(end of broadcast)--------------------------- > TIP 5: Have you checked our extensive FAQ? > > http://www.postgresql.org/users-lounge/docs/faq.html > >
Per the man page on OpenUNIX 8, the UnixWare diff ***DOES*** support -w. see the man page at http://www.lerctr.org:457/ LER On Thu, 2002-04-18 at 02:13, Nicolas Bazin wrote: > The patch from Bruce does not correct the proper thing. The original patch I > submitted was : > *** postgresql-7.2.1-rc/src/test/regress/pg_regress.sh Tue Mar 26 16:49:04 > 2002 > --- postgresql-7.2.1/src/test/regress/pg_regress.sh Tue Mar 26 17:03:39 2002 > *************** > *** 173,179 **** > # ---------- > case $host_platform in > ! *-*-qnx*) > DIFFFLAGS=-b;; > *) > DIFFFLAGS=-w;; > --- 173,179 ---- > # ---------- > case $host_platform in > ! *-*-qnx* | *-*-sco3.2v5* | *-*-sysv5) > DIFFFLAGS=-b;; > *) > DIFFFLAGS=-w;; > > Because the diff tool that comes with Openserver or Unixware does not suppor > the -w option but the -b option to remove blank characters. > There is nothing wrong with unix sockets on both platforms. > > Nicolas > > ----- Original Message ----- > From: "Bruce Momjian" <pgman@candle.pha.pa.us> > To: "Peter Eisentraut" <peter_e@gmx.net> > Cc: "Larry Rosenman" <ler@lerctr.org>; "Nicolas Bazin" > <nbazin@ingenico.com.au>; "PostgreSQL-patches" > <pgsql-patches@postgresql.org> > Sent: Thursday, April 18, 2002 1:15 PM > Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver and > Unixware > > > > Peter Eisentraut wrote: > > > Bruce Momjian writes: > > > > > > > OK, new code is: > > > > > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > > ^^^^^^^^^^^^^ > > > > > > I would like to see an explanation for this. > > > > The patch section is below. Not knowing the platform, I have no idea > > why. > > > > case $host_platform in > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > unix_sockets=no;; > > *) > > unix_sockets=yes;; > > > > -- > > Bruce Momjian | http://candle.pha.pa.us > > pgman@candle.pha.pa.us | (610) 853-3000 > > + If your life is a hard drive, | 830 Blythe Avenue > > + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 > > > > ---------------------------(end of broadcast)--------------------------- > > TIP 5: Have you checked our extensive FAQ? > > > > http://www.postgresql.org/users-lounge/docs/faq.html > > > > > > > > ---------------------------(end of broadcast)--------------------------- > TIP 4: Don't 'kill -9' the postmaster > -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 972-414-9812 E-Mail: ler@lerctr.org US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749
Sorry, here is an updated patch. I didn't realize there were two QNX tests in the file. The patch has: case $host_platform in *-*-qnx* | *-*-sco3.2v5*) DIFFFLAGS=-b;; *) DIFFFLAGS=-w;; esac Is this correct. We don't need the sysv5? It is my understanding that sysv5 is much more than Open Server 8. --------------------------------------------------------------------------- Nicolas Bazin wrote: > The patch from Bruce does not correct the proper thing. The original patch I > submitted was : > *** postgresql-7.2.1-rc/src/test/regress/pg_regress.sh Tue Mar 26 16:49:04 > 2002 > --- postgresql-7.2.1/src/test/regress/pg_regress.sh Tue Mar 26 17:03:39 2002 > *************** > *** 173,179 **** > # ---------- > case $host_platform in > ! *-*-qnx*) > DIFFFLAGS=-b;; > *) > DIFFFLAGS=-w;; > --- 173,179 ---- > # ---------- > case $host_platform in > ! *-*-qnx* | *-*-sco3.2v5* | *-*-sysv5) > DIFFFLAGS=-b;; > *) > DIFFFLAGS=-w;; > > Because the diff tool that comes with Openserver or Unixware does not suppor > the -w option but the -b option to remove blank characters. > There is nothing wrong with unix sockets on both platforms. > > Nicolas > > ----- Original Message ----- > From: "Bruce Momjian" <pgman@candle.pha.pa.us> > To: "Peter Eisentraut" <peter_e@gmx.net> > Cc: "Larry Rosenman" <ler@lerctr.org>; "Nicolas Bazin" > <nbazin@ingenico.com.au>; "PostgreSQL-patches" > <pgsql-patches@postgresql.org> > Sent: Thursday, April 18, 2002 1:15 PM > Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver and > Unixware > > > > Peter Eisentraut wrote: > > > Bruce Momjian writes: > > > > > > > OK, new code is: > > > > > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > > ^^^^^^^^^^^^^ > > > > > > I would like to see an explanation for this. > > > > The patch section is below. Not knowing the platform, I have no idea > > why. > > > > case $host_platform in > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > unix_sockets=no;; > > *) > > unix_sockets=yes;; > > > > -- > > Bruce Momjian | http://candle.pha.pa.us > > pgman@candle.pha.pa.us | (610) 853-3000 > > + If your life is a hard drive, | 830 Blythe Avenue > > + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 > > > > ---------------------------(end of broadcast)--------------------------- > > TIP 5: Have you checked our extensive FAQ? > > > > http://www.postgresql.org/users-lounge/docs/faq.html > > > > > > > > ---------------------------(end of broadcast)--------------------------- > TIP 4: Don't 'kill -9' the postmaster > -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 853-3000 + If your life is a hard drive, | 830 Blythe Avenue + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 Index: configure.in =================================================================== RCS file: /cvsroot/pgsql/configure.in,v retrieving revision 1.178 diff -c -r1.178 configure.in *** configure.in 14 Apr 2002 17:23:20 -0000 1.178 --- configure.in 18 Apr 2002 15:26:08 -0000 *************** *** 696,703 **** AC_CHECK_LIB(util, setproctitle) AC_CHECK_LIB(m, main) AC_CHECK_LIB(dl, main) - AC_CHECK_LIB(socket, main) AC_CHECK_LIB(nsl, main) AC_CHECK_LIB(ipc, main) AC_CHECK_LIB(IPC, main) AC_CHECK_LIB(lc, main) --- 696,703 ---- AC_CHECK_LIB(util, setproctitle) AC_CHECK_LIB(m, main) AC_CHECK_LIB(dl, main) AC_CHECK_LIB(nsl, main) + AC_CHECK_LIB(socket, main) AC_CHECK_LIB(ipc, main) AC_CHECK_LIB(IPC, main) AC_CHECK_LIB(lc, main) Index: src/interfaces/odbc/convert.c =================================================================== RCS file: /cvsroot/pgsql/src/interfaces/odbc/convert.c,v retrieving revision 1.78 diff -c -r1.78 convert.c *** src/interfaces/odbc/convert.c 1 Apr 2002 03:01:14 -0000 1.78 --- src/interfaces/odbc/convert.c 18 Apr 2002 15:26:23 -0000 *************** *** 2717,2723 **** y = 0; for (i = 1; i <= 3; i++) ! y += (s[i] - 48) * (int) pow(8, 3 - i); return y; --- 2717,2723 ---- y = 0; for (i = 1; i <= 3; i++) ! y += (s[i] - '0') << (3 * (3 - i)); return y; *************** *** 2740,2746 **** else val = s[i] - '0'; ! y += val * (int) pow(16, 2 - i); } return y; --- 2740,2746 ---- else val = s[i] - '0'; ! y += val << (4 * (2 - i)); } return y; *************** *** 2795,2801 **** for (i = 4; i > 1; i--) { ! x[i] = (val & 7) + 48; val >>= 3; } --- 2795,2801 ---- for (i = 4; i > 1; i--) { ! x[i] = (val & 7) + '0'; val >>= 3; } Index: src/test/regress/pg_regress.sh =================================================================== RCS file: /cvsroot/pgsql/src/test/regress/pg_regress.sh,v retrieving revision 1.23 diff -c -r1.23 pg_regress.sh *** src/test/regress/pg_regress.sh 3 Jan 2002 21:52:05 -0000 1.23 --- src/test/regress/pg_regress.sh 18 Apr 2002 15:26:24 -0000 *************** *** 173,179 **** # ---------- case $host_platform in ! *-*-qnx*) DIFFFLAGS=-b;; *) DIFFFLAGS=-w;; --- 173,179 ---- # ---------- case $host_platform in ! *-*-qnx* | *-*-sco3.2v5*) DIFFFLAGS=-b;; *) DIFFFLAGS=-w;;
Bruce Momjian writes: > The patch has: > > case $host_platform in > *-*-qnx* | *-*-sco3.2v5*) > DIFFFLAGS=-b;; > *) > DIFFFLAGS=-w;; > esac > > Is this correct. We don't need the sysv5? It is my understanding that > sysv5 is much more than Open Server 8. Do we need this at all? Why not simply fix the expected files to remove the whitespace differences? -- Peter Eisentraut peter_e@gmx.net
Peter Eisentraut <peter_e@gmx.net> writes: > Do we need this at all? Why not simply fix the expected files to remove > the whitespace differences? There shouldn't *be* any whitespace differences in a successful test. The point of the -w switch is not to make any difference in a successful test, it is to reduce the amount of irrelevant stuff printed in a failed test. If you have one bogus output item that is wider than the correct value, that can cause psql to reformat the display wider in all rows. The point of using -w is to not show those other rows as changed. regards, tom lane
Well I use Unixware 7.1.1. I cannot check again right now whether 7.1.1 supports -w but if I made the effort to change the shell, I guess I had a good reason. Next time I put my hand on my Unixware PC I'll double check. Nicolas ----- Original Message ----- From: "Larry Rosenman" <ler@lerctr.org> To: "Nicolas Bazin" <nbazin@ingenico.com.au> Cc: "Bruce Momjian" <pgman@candle.pha.pa.us>; "Peter Eisentraut" <peter_e@gmx.net>; "PostgreSQL-patches" <pgsql-patches@postgresql.org> Sent: Friday, April 19, 2002 12:38 AM Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver andUnixware > Per the man page on OpenUNIX 8, the UnixWare diff ***DOES*** support -w. > > see the man page at http://www.lerctr.org:457/ > > LER > > > On Thu, 2002-04-18 at 02:13, Nicolas Bazin wrote: > > The patch from Bruce does not correct the proper thing. The original patch I > > submitted was : > > *** postgresql-7.2.1-rc/src/test/regress/pg_regress.sh Tue Mar 26 16:49:04 > > 2002 > > --- postgresql-7.2.1/src/test/regress/pg_regress.sh Tue Mar 26 17:03:39 2002 > > *************** > > *** 173,179 **** > > # ---------- > > case $host_platform in > > ! *-*-qnx*) > > DIFFFLAGS=-b;; > > *) > > DIFFFLAGS=-w;; > > --- 173,179 ---- > > # ---------- > > case $host_platform in > > ! *-*-qnx* | *-*-sco3.2v5* | *-*-sysv5) > > DIFFFLAGS=-b;; > > *) > > DIFFFLAGS=-w;; > > > > Because the diff tool that comes with Openserver or Unixware does not suppor > > the -w option but the -b option to remove blank characters. > > There is nothing wrong with unix sockets on both platforms. > > > > Nicolas > > > > ----- Original Message ----- > > From: "Bruce Momjian" <pgman@candle.pha.pa.us> > > To: "Peter Eisentraut" <peter_e@gmx.net> > > Cc: "Larry Rosenman" <ler@lerctr.org>; "Nicolas Bazin" > > <nbazin@ingenico.com.au>; "PostgreSQL-patches" > > <pgsql-patches@postgresql.org> > > Sent: Thursday, April 18, 2002 1:15 PM > > Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver and > > Unixware > > > > > > > Peter Eisentraut wrote: > > > > Bruce Momjian writes: > > > > > > > > > OK, new code is: > > > > > > > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > > > ^^^^^^^^^^^^^ > > > > > > > > I would like to see an explanation for this. > > > > > > The patch section is below. Not knowing the platform, I have no idea > > > why. > > > > > > case $host_platform in > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > > unix_sockets=no;; > > > *) > > > unix_sockets=yes;; > > > > > > -- > > > Bruce Momjian | http://candle.pha.pa.us > > > pgman@candle.pha.pa.us | (610) 853-3000 > > > + If your life is a hard drive, | 830 Blythe Avenue > > > + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 > > > > > > ---------------------------(end of broadcast)--------------------------- > > > TIP 5: Have you checked our extensive FAQ? > > > > > > http://www.postgresql.org/users-lounge/docs/faq.html > > > > > > > > > > > > > > ---------------------------(end of broadcast)--------------------------- > > TIP 4: Don't 'kill -9' the postmaster > > > -- > Larry Rosenman http://www.lerctr.org/~ler > Phone: +1 972-414-9812 E-Mail: ler@lerctr.org > US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749 > > > >
Well then it means that we will have to make a difference between Unixware 7.1.1 and OpenUnix 8.0. ----- Original Message ----- From: "Bruce Momjian" <pgman@candle.pha.pa.us> To: "Nicolas Bazin" <nbazin@ingenico.com.au> Cc: "Peter Eisentraut" <peter_e@gmx.net>; "Larry Rosenman" <ler@lerctr.org>; "PostgreSQL-patches" <pgsql-patches@postgresql.org> Sent: Friday, April 19, 2002 1:31 AM Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver and Unixware > > Sorry, here is an updated patch. I didn't realize there were two QNX > tests in the file. > > The patch has: > > case $host_platform in > *-*-qnx* | *-*-sco3.2v5*) > DIFFFLAGS=-b;; > *) > DIFFFLAGS=-w;; > esac > > Is this correct. We don't need the sysv5? It is my understanding that > sysv5 is much more than Open Server 8. > > -------------------------------------------------------------------------- - > > Nicolas Bazin wrote: > > The patch from Bruce does not correct the proper thing. The original patch I > > submitted was : > > *** postgresql-7.2.1-rc/src/test/regress/pg_regress.sh Tue Mar 26 16:49:04 > > 2002 > > --- postgresql-7.2.1/src/test/regress/pg_regress.sh Tue Mar 26 17:03:39 2002 > > *************** > > *** 173,179 **** > > # ---------- > > case $host_platform in > > ! *-*-qnx*) > > DIFFFLAGS=-b;; > > *) > > DIFFFLAGS=-w;; > > --- 173,179 ---- > > # ---------- > > case $host_platform in > > ! *-*-qnx* | *-*-sco3.2v5* | *-*-sysv5) > > DIFFFLAGS=-b;; > > *) > > DIFFFLAGS=-w;; > > > > Because the diff tool that comes with Openserver or Unixware does not suppor > > the -w option but the -b option to remove blank characters. > > There is nothing wrong with unix sockets on both platforms. > > > > Nicolas > > > > ----- Original Message ----- > > From: "Bruce Momjian" <pgman@candle.pha.pa.us> > > To: "Peter Eisentraut" <peter_e@gmx.net> > > Cc: "Larry Rosenman" <ler@lerctr.org>; "Nicolas Bazin" > > <nbazin@ingenico.com.au>; "PostgreSQL-patches" > > <pgsql-patches@postgresql.org> > > Sent: Thursday, April 18, 2002 1:15 PM > > Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver and > > Unixware > > > > > > > Peter Eisentraut wrote: > > > > Bruce Momjian writes: > > > > > > > > > OK, new code is: > > > > > > > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > > > ^^^^^^^^^^^^^ > > > > > > > > I would like to see an explanation for this. > > > > > > The patch section is below. Not knowing the platform, I have no idea > > > why. > > > > > > case $host_platform in > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > > unix_sockets=no;; > > > *) > > > unix_sockets=yes;; > > > > > > -- > > > Bruce Momjian | http://candle.pha.pa.us > > > pgman@candle.pha.pa.us | (610) 853-3000 > > > + If your life is a hard drive, | 830 Blythe Avenue > > > + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 > > > > > > ---------------------------(end of broadcast)--------------------------- > > > TIP 5: Have you checked our extensive FAQ? > > > > > > http://www.postgresql.org/users-lounge/docs/faq.html > > > > > > > > > > > > > > ---------------------------(end of broadcast)--------------------------- > > TIP 4: Don't 'kill -9' the postmaster > > > > -- > Bruce Momjian | http://candle.pha.pa.us > pgman@candle.pha.pa.us | (610) 853-3000 > + If your life is a hard drive, | 830 Blythe Avenue > + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 > ---------------------------------------------------------------------------- ---- > Index: configure.in > =================================================================== > RCS file: /cvsroot/pgsql/configure.in,v > retrieving revision 1.178 > diff -c -r1.178 configure.in > *** configure.in 14 Apr 2002 17:23:20 -0000 1.178 > --- configure.in 18 Apr 2002 15:26:08 -0000 > *************** > *** 696,703 **** > AC_CHECK_LIB(util, setproctitle) > AC_CHECK_LIB(m, main) > AC_CHECK_LIB(dl, main) > - AC_CHECK_LIB(socket, main) > AC_CHECK_LIB(nsl, main) > AC_CHECK_LIB(ipc, main) > AC_CHECK_LIB(IPC, main) > AC_CHECK_LIB(lc, main) > --- 696,703 ---- > AC_CHECK_LIB(util, setproctitle) > AC_CHECK_LIB(m, main) > AC_CHECK_LIB(dl, main) > AC_CHECK_LIB(nsl, main) > + AC_CHECK_LIB(socket, main) > AC_CHECK_LIB(ipc, main) > AC_CHECK_LIB(IPC, main) > AC_CHECK_LIB(lc, main) > Index: src/interfaces/odbc/convert.c > =================================================================== > RCS file: /cvsroot/pgsql/src/interfaces/odbc/convert.c,v > retrieving revision 1.78 > diff -c -r1.78 convert.c > *** src/interfaces/odbc/convert.c 1 Apr 2002 03:01:14 -0000 1.78 > --- src/interfaces/odbc/convert.c 18 Apr 2002 15:26:23 -0000 > *************** > *** 2717,2723 **** > y = 0; > > for (i = 1; i <= 3; i++) > ! y += (s[i] - 48) * (int) pow(8, 3 - i); > > return y; > > --- 2717,2723 ---- > y = 0; > > for (i = 1; i <= 3; i++) > ! y += (s[i] - '0') << (3 * (3 - i)); > > return y; > > *************** > *** 2740,2746 **** > else > val = s[i] - '0'; > > ! y += val * (int) pow(16, 2 - i); > } > > return y; > --- 2740,2746 ---- > else > val = s[i] - '0'; > > ! y += val << (4 * (2 - i)); > } > > return y; > *************** > *** 2795,2801 **** > > for (i = 4; i > 1; i--) > { > ! x[i] = (val & 7) + 48; > val >>= 3; > } > > --- 2795,2801 ---- > > for (i = 4; i > 1; i--) > { > ! x[i] = (val & 7) + '0'; > val >>= 3; > } > > Index: src/test/regress/pg_regress.sh > =================================================================== > RCS file: /cvsroot/pgsql/src/test/regress/pg_regress.sh,v > retrieving revision 1.23 > diff -c -r1.23 pg_regress.sh > *** src/test/regress/pg_regress.sh 3 Jan 2002 21:52:05 -0000 1.23 > --- src/test/regress/pg_regress.sh 18 Apr 2002 15:26:24 -0000 > *************** > *** 173,179 **** > # ---------- > > case $host_platform in > ! *-*-qnx*) > DIFFFLAGS=-b;; > *) > DIFFFLAGS=-w;; > --- 173,179 ---- > # ---------- > > case $host_platform in > ! *-*-qnx* | *-*-sco3.2v5*) > DIFFFLAGS=-b;; > *) > DIFFFLAGS=-w;; > ---------------------------------------------------------------------------- ---- > > ---------------------------(end of broadcast)--------------------------- > TIP 6: Have you searched our list archives? > > http://archives.postgresql.org >
Unixware 711 manual says diff supports -w as said in : -w Ignores all blanks (<Space> and TAB characters) and treats all other strings of blanks as equivalent; for example, if ( a == b ) will compare eaqual to if(a==b). Hope it helps, On Fri, 19 Apr 2002, Nicolas Bazin wrote: > Well I use Unixware 7.1.1. I cannot check again right now whether 7.1.1 > supports -w but if I made the effort to change the shell, I guess I had a > good reason. Next time I put my hand on my Unixware PC I'll double check. > > Nicolas > > ----- Original Message ----- > From: "Larry Rosenman" <ler@lerctr.org> > To: "Nicolas Bazin" <nbazin@ingenico.com.au> > Cc: "Bruce Momjian" <pgman@candle.pha.pa.us>; "Peter Eisentraut" > <peter_e@gmx.net>; "PostgreSQL-patches" <pgsql-patches@postgresql.org> > Sent: Friday, April 19, 2002 12:38 AM > Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver > andUnixware > > > > Per the man page on OpenUNIX 8, the UnixWare diff ***DOES*** support -w. > > > > see the man page at http://www.lerctr.org:457/ > > > > LER > > > > > > On Thu, 2002-04-18 at 02:13, Nicolas Bazin wrote: > > > The patch from Bruce does not correct the proper thing. The original > patch I > > > submitted was : > > > *** postgresql-7.2.1-rc/src/test/regress/pg_regress.sh Tue Mar 26 > 16:49:04 > > > 2002 > > > --- postgresql-7.2.1/src/test/regress/pg_regress.sh Tue Mar 26 17:03:39 > 2002 > > > *************** > > > *** 173,179 **** > > > # ---------- > > > case $host_platform in > > > ! *-*-qnx*) > > > DIFFFLAGS=-b;; > > > *) > > > DIFFFLAGS=-w;; > > > --- 173,179 ---- > > > # ---------- > > > case $host_platform in > > > ! *-*-qnx* | *-*-sco3.2v5* | *-*-sysv5) > > > DIFFFLAGS=-b;; > > > *) > > > DIFFFLAGS=-w;; > > > > > > Because the diff tool that comes with Openserver or Unixware does not > suppor > > > the -w option but the -b option to remove blank characters. > > > There is nothing wrong with unix sockets on both platforms. > > > > > > Nicolas > > > > > > ----- Original Message ----- > > > From: "Bruce Momjian" <pgman@candle.pha.pa.us> > > > To: "Peter Eisentraut" <peter_e@gmx.net> > > > Cc: "Larry Rosenman" <ler@lerctr.org>; "Nicolas Bazin" > > > <nbazin@ingenico.com.au>; "PostgreSQL-patches" > > > <pgsql-patches@postgresql.org> > > > Sent: Thursday, April 18, 2002 1:15 PM > > > Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver and > > > Unixware > > > > > > > > > > Peter Eisentraut wrote: > > > > > Bruce Momjian writes: > > > > > > > > > > > OK, new code is: > > > > > > > > > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > > > > ^^^^^^^^^^^^^ > > > > > > > > > > I would like to see an explanation for this. > > > > > > > > The patch section is below. Not knowing the platform, I have no idea > > > > why. > > > > > > > > case $host_platform in > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > > > unix_sockets=no;; > > > > *) > > > > unix_sockets=yes;; > > > > > > > > -- > > > > Bruce Momjian | http://candle.pha.pa.us > > > > pgman@candle.pha.pa.us | (610) 853-3000 > > > > + If your life is a hard drive, | 830 Blythe Avenue > > > > + Christ can be your backup. | Drexel Hill, Pennsylvania > 19026 > > > > > > > > ---------------------------(end of > broadcast)--------------------------- > > > > TIP 5: Have you checked our extensive FAQ? > > > > > > > > http://www.postgresql.org/users-lounge/docs/faq.html > > > > > > > > > > > > > > > > > > > > ---------------------------(end of broadcast)--------------------------- > > > TIP 4: Don't 'kill -9' the postmaster > > > > > -- > > Larry Rosenman http://www.lerctr.org/~ler > > Phone: +1 972-414-9812 E-Mail: ler@lerctr.org > > US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749 > > > > > > > > > > > > > ---------------------------(end of broadcast)--------------------------- > TIP 2: you can get off all lists at once with the unregister command > (send "unregister YourEmailAddressHere" to majordomo@postgresql.org) > -- Olivier PRENANT Tel: +33-5-61-50-97-00 (Work) Quartier d'Harraud Turrou +33-5-61-50-97-01 (Fax) 31190 AUTERIVE +33-6-07-63-80-64 (GSM) FRANCE Email: ohp@pyrenet.fr ------------------------------------------------------------------------------ Make your life a dream, make your dream a reality. (St Exupery)
OK, I will apply the patch as it current stands and wait for additional patches. --------------------------------------------------------------------------- Nicolas Bazin wrote: > Well then it means that we will have to make a difference between Unixware > 7.1.1 and OpenUnix 8.0. > > ----- Original Message ----- > From: "Bruce Momjian" <pgman@candle.pha.pa.us> > To: "Nicolas Bazin" <nbazin@ingenico.com.au> > Cc: "Peter Eisentraut" <peter_e@gmx.net>; "Larry Rosenman" <ler@lerctr.org>; > "PostgreSQL-patches" <pgsql-patches@postgresql.org> > Sent: Friday, April 19, 2002 1:31 AM > Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver and > Unixware > > > > > > Sorry, here is an updated patch. I didn't realize there were two QNX > > tests in the file. > > > > The patch has: > > > > case $host_platform in > > *-*-qnx* | *-*-sco3.2v5*) > > DIFFFLAGS=-b;; > > *) > > DIFFFLAGS=-w;; > > esac > > > > Is this correct. We don't need the sysv5? It is my understanding that > > sysv5 is much more than Open Server 8. > > > > -------------------------------------------------------------------------- > - > > > > Nicolas Bazin wrote: > > > The patch from Bruce does not correct the proper thing. The original > patch I > > > submitted was : > > > *** postgresql-7.2.1-rc/src/test/regress/pg_regress.sh Tue Mar 26 > 16:49:04 > > > 2002 > > > --- postgresql-7.2.1/src/test/regress/pg_regress.sh Tue Mar 26 17:03:39 > 2002 > > > *************** > > > *** 173,179 **** > > > # ---------- > > > case $host_platform in > > > ! *-*-qnx*) > > > DIFFFLAGS=-b;; > > > *) > > > DIFFFLAGS=-w;; > > > --- 173,179 ---- > > > # ---------- > > > case $host_platform in > > > ! *-*-qnx* | *-*-sco3.2v5* | *-*-sysv5) > > > DIFFFLAGS=-b;; > > > *) > > > DIFFFLAGS=-w;; > > > > > > Because the diff tool that comes with Openserver or Unixware does not > suppor > > > the -w option but the -b option to remove blank characters. > > > There is nothing wrong with unix sockets on both platforms. > > > > > > Nicolas > > > > > > ----- Original Message ----- > > > From: "Bruce Momjian" <pgman@candle.pha.pa.us> > > > To: "Peter Eisentraut" <peter_e@gmx.net> > > > Cc: "Larry Rosenman" <ler@lerctr.org>; "Nicolas Bazin" > > > <nbazin@ingenico.com.au>; "PostgreSQL-patches" > > > <pgsql-patches@postgresql.org> > > > Sent: Thursday, April 18, 2002 1:15 PM > > > Subject: Re: [PATCHES] [HACKERS] build of 7.2.1 on SCO Openserver and > > > Unixware > > > > > > > > > > Peter Eisentraut wrote: > > > > > Bruce Momjian writes: > > > > > > > > > > > OK, new code is: > > > > > > > > > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > > > > ^^^^^^^^^^^^^ > > > > > > > > > > I would like to see an explanation for this. > > > > > > > > The patch section is below. Not knowing the platform, I have no idea > > > > why. > > > > > > > > case $host_platform in > > > > ! *-*-qnx* | *beos* | *-*-sco3.2v5*) > > > > unix_sockets=no;; > > > > *) > > > > unix_sockets=yes;; > > > > > > > > -- > > > > Bruce Momjian | http://candle.pha.pa.us > > > > pgman@candle.pha.pa.us | (610) 853-3000 > > > > + If your life is a hard drive, | 830 Blythe Avenue > > > > + Christ can be your backup. | Drexel Hill, Pennsylvania > 19026 > > > > > > > > ---------------------------(end of > broadcast)--------------------------- > > > > TIP 5: Have you checked our extensive FAQ? > > > > > > > > http://www.postgresql.org/users-lounge/docs/faq.html > > > > > > > > > > > > > > > > > > > > ---------------------------(end of broadcast)--------------------------- > > > TIP 4: Don't 'kill -9' the postmaster > > > > > > > -- > > Bruce Momjian | http://candle.pha.pa.us > > pgman@candle.pha.pa.us | (610) 853-3000 > > + If your life is a hard drive, | 830 Blythe Avenue > > + Christ can be your backup. | Drexel Hill, Pennsylvania 19026 > > > > > ---------------------------------------------------------------------------- > ---- > > > > Index: configure.in > > =================================================================== > > RCS file: /cvsroot/pgsql/configure.in,v > > retrieving revision 1.178 > > diff -c -r1.178 configure.in > > *** configure.in 14 Apr 2002 17:23:20 -0000 1.178 > > --- configure.in 18 Apr 2002 15:26:08 -0000 > > *************** > > *** 696,703 **** > > AC_CHECK_LIB(util, setproctitle) > > AC_CHECK_LIB(m, main) > > AC_CHECK_LIB(dl, main) > > - AC_CHECK_LIB(socket, main) > > AC_CHECK_LIB(nsl, main) > > AC_CHECK_LIB(ipc, main) > > AC_CHECK_LIB(IPC, main) > > AC_CHECK_LIB(lc, main) > > --- 696,703 ---- > > AC_CHECK_LIB(util, setproctitle) > > AC_CHECK_LIB(m, main) > > AC_CHECK_LIB(dl, main) > > AC_CHECK_LIB(nsl, main) > > + AC_CHECK_LIB(socket, main) > > AC_CHECK_LIB(ipc, main) > > AC_CHECK_LIB(IPC, main) > > AC_CHECK_LIB(lc, main) > > Index: src/interfaces/odbc/convert.c > > =================================================================== > > RCS file: /cvsroot/pgsql/src/interfaces/odbc/convert.c,v > > retrieving revision 1.78 > > diff -c -r1.78 convert.c > > *** src/interfaces/odbc/convert.c 1 Apr 2002 03:01:14 -0000 1.78 > > --- src/interfaces/odbc/convert.c 18 Apr 2002 15:26:23 -0000 > > *************** > > *** 2717,2723 **** > > y = 0; > > > > for (i = 1; i <= 3; i++) > > ! y += (s[i] - 48) * (int) pow(8, 3 - i); > > > > return y; > > > > --- 2717,2723 ---- > > y = 0; > > > > for (i = 1; i <= 3; i++) > > ! y += (s[i] - '0') << (3 * (3 - i)); > > > > return y; > > > > *************** > > *** 2740,2746 **** > > else > > val = s[i] - '0'; > > > > ! y += val * (int) pow(16, 2 - i); > > } > > > > return y; > > --- 2740,2746 ---- > > else > > val = s[i] - '0'; > > > > ! y += val << (4 * (2 - i)); > > } > > > > return y; > > *************** > > *** 2795,2801 **** > > > > for (i = 4; i > 1; i--) > > { > > ! x[i] = (val & 7) + 48; > > val >>= 3; > > } > > > > --- 2795,2801 ---- > > > > for (i = 4; i > 1; i--) > > { > > ! x[i] = (val & 7) + '0'; > > val >>= 3; > > } > > > > Index: src/test/regress/pg_regress.sh > > =================================================================== > > RCS file: /cvsroot/pgsql/src/test/regress/pg_regress.sh,v > > retrieving revision 1.23 > > diff -c -r1.23 pg_regress.sh > > *** src/test/regress/pg_regress.sh 3 Jan 2002 21:52:05 -0000 1.23 > > --- src/test/regress/pg_regress.sh 18 Apr 2002 15:26:24 -0000 > > *************** > > *** 173,179 **** > > # ---------- > > > > case $host_platform in > > ! *-*-qnx*) > > DIFFFLAGS=-b;; > > *) > > DIFFFLAGS=-w;; > > --- 173,179 ---- > > # ---------- > > > > case $host_platform in > > ! *-*-qnx* | *-*-sco3.2v5*) > > DIFFFLAGS=-b;; > > *) > > DIFFFLAGS=-w;; > > > > > ---------------------------------------------------------------------------- > ---- > > > > > > ---------------------------(end of broadcast)--------------------------- > > TIP 6: Have you searched our list archives? > > > > http://archives.postgresql.org > > > > > -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 853-3000 + If your life is a hard drive, | 830 Blythe Avenue + Christ can be your backup. | Drexel Hill, Pennsylvania 19026