From: Ard Biesheuvel <abies@php.net>
Date: Fri, 26 Sep 2003 10:06:22 +0000 (+0000)
Subject: Let client library pick its own transaction param defaults
X-Git-Tag: RELEASE_1_3b2~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c40234b47e9197dc098dd8df537a198f8d924734;p=php

Let client library pick its own transaction param defaults
---

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index f1300e3b15..167d102238 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -2068,7 +2068,7 @@ PHP_FUNCTION(ibase_trans)
 				convert_to_long_ex(args[i]);
 				trans_argl = Z_LVAL_PP(args[i]);
 
-				if (trans_argl) {
+				if (trans_argl != PHP_IBASE_DEFAULT) {
 					last_tpb[tpb_len++] = isc_tpb_version3;
 
 					/* access mode */
diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
index 176dacdbe6..275363c892 100644
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -186,17 +186,17 @@ enum php_interbase_option {
 	PHP_IBASE_DATE 				= 2,
 	PHP_IBASE_TIME 				= 4,
 	/* transaction access mode */	
-	PHP_IBASE_WRITE 			= 0, /* default */
-	PHP_IBASE_READ 				= 1,
+	PHP_IBASE_WRITE 			= 1,
+	PHP_IBASE_READ 				= 2,
 	/* transaction isolation level */
-	PHP_IBASE_CONCURRENCY 		= 0, /* default */
-	PHP_IBASE_COMMITTED 		= 2,
-	  PHP_IBASE_REC_NO_VERSION 	= 0, /* default */
-	  PHP_IBASE_REC_VERSION 	= 4,
-	PHP_IBASE_CONSISTENCY 		= 8,
+	PHP_IBASE_CONCURRENCY 		= 4,
+	PHP_IBASE_COMMITTED 		= 8,
+	  PHP_IBASE_REC_NO_VERSION 	= 32,
+	  PHP_IBASE_REC_VERSION 	= 64,
+	PHP_IBASE_CONSISTENCY 		= 16,
 	/* transaction lock resolution */
-	PHP_IBASE_WAIT 				= 0, /* default */
-	PHP_IBASE_NOWAIT 			= 16
+	PHP_IBASE_WAIT 				= 128,
+	PHP_IBASE_NOWAIT 			= 256
 };
 
 #ifdef ZTS