Update of /home/cvsd/slony1/slony1-engine/src/slonik
In directory main.slony.info:/tmp/cvs-serv30497/src/slonik

Modified Files:
	slonik.c 
Log Message:
Fix up handling of PG version numbers in slonik.c as done in 1.1 and 1.2 branches


Index: slonik.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** slonik.c	8 Feb 2007 18:01:15 -0000	1.73
--- slonik.c	16 Mar 2007 22:38:01 -0000	1.74
***************
*** 1874,1878 ****
  	{
  		printf("%s:%d: unsupported PostgreSQL "
! 			"version %d.%d (try Slony-I 1.1.5)\n",
  			stmt->stmt_filename, stmt->stmt_lno,
  			(adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
--- 1874,1878 ----
  	{
  		printf("%s:%d: unsupported PostgreSQL "
! 			"version %d.%d (try Slony-I 1.1.8)\n",
  			stmt->stmt_filename, stmt->stmt_lno,
  			(adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
***************
*** 1983,1997 ****
                  use_minor = 4;
          }
!         else if ((adminfo->pg_version >= 70500) && adminfo->pg_version < 80300) /* 8.0, 8.1 and 8.2 */
          {
                  use_major = 8;
                  use_minor = 0;
          }
          else    /* 8.3 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 */
          {
                  use_major = 8;
                  use_minor = 0;
          }
+         else if ((adminfo->pg_version >= 80100) && adminfo->pg_version < 80300) /* 8.1, 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));