abies           Fri Sep 26 06:06:23 2003 EDT

  Modified files:              
    /php-src/ext/interbase      interbase.c php_interbase.h 
  Log:
  Let client library pick its own transaction param defaults
  
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.188 php-src/ext/interbase/interbase.c:1.189
--- php-src/ext/interbase/interbase.c:1.188     Tue Sep 23 19:08:59 2003
+++ php-src/ext/interbase/interbase.c   Fri Sep 26 06:06:22 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: interbase.c,v 1.188 2003/09/23 23:08:59 abies Exp $ */
+/* $Id: interbase.c,v 1.189 2003/09/26 10:06:22 abies Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -26,7 +26,7 @@
 
 #include "php.h"
 
-#define FILE_REVISION "$Revision: 1.188 $"
+#define FILE_REVISION "$Revision: 1.189 $"
 
 #if HAVE_IBASE
 
@@ -2068,7 +2068,7 @@
                                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 */
Index: php-src/ext/interbase/php_interbase.h
diff -u php-src/ext/interbase/php_interbase.h:1.62 
php-src/ext/interbase/php_interbase.h:1.63
--- php-src/ext/interbase/php_interbase.h:1.62  Tue Sep 23 16:58:14 2003
+++ php-src/ext/interbase/php_interbase.h       Fri Sep 26 06:06:22 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_interbase.h,v 1.62 2003/09/23 20:58:14 abies Exp $ */
+/* $Id: php_interbase.h,v 1.63 2003/09/26 10:06:22 abies Exp $ */
 
 #ifndef PHP_INTERBASE_H
 #define PHP_INTERBASE_H
@@ -186,17 +186,17 @@
        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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to