Chris Browne cbbrowne at lists.slony.info
Thu Mar 15 11:52:04 PDT 2007
Update of /home/cvsd/slony1/slony1-engine/src/slonik
In directory main.slony.info:/tmp/cvs-serv17651/src/slonik

Modified Files:
      Tag: REL_1_2_STABLE
	slonik.c 
Log Message:
Fix to src/slonik/slonik.c - it wasn't pulling in the right version of slony1_funcs.?.sql in some cases


Index: slonik.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.67.2.5
retrieving revision 1.67.2.6
diff -C2 -d -r1.67.2.5 -r1.67.2.6
*** slonik.c	8 Feb 2007 22:55:58 -0000	1.67.2.5
--- slonik.c	15 Mar 2007 18:52:02 -0000	1.67.2.6
***************
*** 1983,1997 ****
                  use_minor = 4;
          }
!         else if ((adminfo->pg_version >= 70500) && adminfo->pg_version < 80200) /* 8.0 and 8.1 */
          {
                  use_major = 8;
                  use_minor = 0;
          }
!         else    /* 8.2 and above */
          {
                  use_major = 8;
!                 use_minor = 0;
                  printf("%s:%d: Possible unsupported PostgreSQL "
!                         "version %d.%d, defaulting to 8.0 support\n",
                          stmt->stmt_filename, stmt->stmt_lno,
                          (adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
--- 1983,2002 ----
                  use_minor = 4;
          }
!         else if ((adminfo->pg_version >= 70500) && adminfo->pg_version < 80100) /* 8.0 and 8.1 */
          {
                  use_major = 8;
                  use_minor = 0;
          }
!        else if ((adminfo->pg_version >= 80100) && adminfo->pg_version < 80300)	/* 8.1 and 8.2 */
!        {
! 	       use_major = 8;
! 	       use_minor = 1;
!        }
!         else    /* 8.3 and above */
          {
                  use_major = 8;
!                 use_minor = 1;
                  printf("%s:%d: Possible unsupported PostgreSQL "
!                         "version %d.%d, defaulting to 8.1 support\n",
                          stmt->stmt_filename, stmt->stmt_lno,
                          (adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));



More information about the Slony1-commit mailing list