Обсуждение: oopsy in dynloader.c
*** dynloader.c.old Thu Jul 22 16:29:46 1999 --- dynloader.c Thu Jul 22 16:30:23 1999 *************** *** 1,6 **** /* Dummy file used for nothing at this point * - <<<<<<< linux.c * see sunos4.h ======= * dynloader.c --- 1,5 ---- *************** *** 16,25 **** * $Header: /usr/local/cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.15 1999/07/17 20:17:31 momjianExp $ * *------------------------------------------------------------------------- - >>>>>>> 1.15 */ - <<<<<<< linux.c - ======= #include "postgres.h" #ifdef HAVE_DLD_H --- 15,21 ---- *************** *** 114,117 **** } #endif - >>>>>>> 1.15 --- 110,112 ---- === END OF PATCH -- Mark Hollomon mhh@mindspring.com
I can not find this problem in the current source tree. I believe you are seeing a merge problem with cvs. Remove the file and reupdate cvs. > > *** dynloader.c.old Thu Jul 22 16:29:46 1999 > --- dynloader.c Thu Jul 22 16:30:23 1999 > *************** > *** 1,6 **** > /* Dummy file used for nothing at this point > * > - <<<<<<< linux.c > * see sunos4.h > ======= > * dynloader.c > --- 1,5 ---- > *************** > *** 16,25 **** > * $Header: /usr/local/cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.15 1999/07/17 20:17:31 momjian Exp $ > * > *------------------------------------------------------------------------- > - >>>>>>> 1.15 > */ > - <<<<<<< linux.c > - ======= > > #include "postgres.h" > #ifdef HAVE_DLD_H > --- 15,21 ---- > *************** > *** 114,117 **** > } > > #endif > - >>>>>>> 1.15 > --- 110,112 ---- > > > === END OF PATCH > -- > Mark Hollomon > mhh@mindspring.com > > -- Bruce Momjian | http://www.op.net/~candle maillist@candle.pha.pa.us | (610) 853-3000+ If your life is a hard drive, | 830 Blythe Avenue + Christ can be your backup. | Drexel Hill, Pennsylvania19026
Bruce Momjian wrote: > > I can not find this problem in the current source tree. I believe you > are seeing a merge problem with cvs. Remove the file and reupdate cvs. (Slaps forehead) Of course. I changed that file to fix a problem with dynamic loading and the new plperl. Sorry for the noise. -- Mark Hollomon mhh@nortelnetworks.com ESN 451-9008 (302)454-9008
Bruce Momjian <maillist@candle.pha.pa.us> writes: > I can not find this problem in the current source tree. I believe you > are seeing a merge problem with cvs. Remove the file and reupdate cvs. In fact, that sort of breakage is exactly what cvs will do when it finds a merge conflict (which it simple-mindedly defines as a local change that falls in the same line range as a diff it's trying to apply from the cvs master file). It will warn you that the merge failed --- so you should always review the output from a cvs update run, looking for conflict messages. regards, tom lane