about summary refs log tree commit diff
path: root/db2/lock/lock_conflict.c
diff options
context:
space:
mode:
Diffstat (limited to 'db2/lock/lock_conflict.c')
-rw-r--r--db2/lock/lock_conflict.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/db2/lock/lock_conflict.c b/db2/lock/lock_conflict.c
index 870aa0dc17..4be858af7a 100644
--- a/db2/lock/lock_conflict.c
+++ b/db2/lock/lock_conflict.c
@@ -8,7 +8,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)lock_conflict.c	10.3 (Sleepycat) 4/10/98";
+static const char sccsid[] = "@(#)lock_conflict.c	10.4 (Sleepycat) 11/20/98";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -29,11 +29,11 @@ const u_int8_t db_rw_conflicts[] = {
 };
 
 const u_int8_t db_riw_conflicts[] = {
-	/*		N   	S   	X  	IS  	IX	SIX */
+	/*		N   	S   	X  	IX  	IS	SIX */
 	/*   N */	0,	0,	0,	0,	0,	0,
-	/*   S */	0,	0,	1,	0,	1,	1,
+	/*   S */	0,	0,	1,	1,	0,	1,
 	/*   X */	1,	1,	1,	1,	1,	1,
-	/*  IS */	0,	0,	1,	0,	0,	0,
 	/*  IX */	0,	1,	1,	0,	0,	0,
+	/*  IS */	0,	0,	1,	0,	0,	0,
 	/* SIX */	0,	1,	1,	0,	0,	0
 };