Index: openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql	27 Feb 2005 01:21:07 -0000	1.9
+++ openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql	24 May 2005 02:21:02 -0000	1.9.2.1
@@ -30,7 +30,7 @@
                         primary key,
         member_state    varchar2(20) not null
                         constraint membership_rel_mem_ck
-                        check (member_state in ('approved', 'needs approval',
+                        check (member_state in ('merged','approved', 'needs approval',
                                               'banned', 'rejected', 'deleted'))
 );
 
@@ -452,6 +452,10 @@
     rel_id      in membership_rels.rel_id%TYPE
   );
 
+  procedure merge (
+    rel_id      in membership_rels.rel_id%TYPE
+  );
+
   procedure reject (
     rel_id      in membership_rels.rel_id%TYPE
   );