[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql mysql_driver.c

[Ilia Alshanetsky]

iliaa           Fri Mar 17 00:15:09 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/pdo_mysql      mysql_driver.c 
  Log:
  Allow PDO_MYSQL_ATTR_DIRECT_QUERY to be set via constructor
  Allow getAttribute() to fetch MySQL specific attributes.
  Eliminate unnecessary auto-commit call on connect.
  
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.10&r2=1.59.2.11&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.10 
php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.11
--- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.10      Sun Mar  5 17:18:01 2006
+++ php-src/ext/pdo_mysql/mysql_driver.c        Fri Mar 17 00:15:09 2006
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysql_driver.c,v 1.59.2.10 2006/03/05 17:18:01 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.59.2.11 2006/03/17 00:15:09 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -362,6 +362,14 @@
                        ZVAL_LONG(return_value, H->buffered);
                        return 1;
 
+               case PDO_MYSQL_ATTR_DIRECT_QUERY:
+                       ZVAL_LONG(return_value, H->emulate_prepare);
+                       return 1;
+
+               case PDO_MYSQL_ATTR_MAX_BUFFER_SIZE:
+                       ZVAL_LONG(return_value, H->max_buffer_size);
+                       return 1;
+
                default:
                        return 0;       
        }
@@ -440,7 +448,7 @@
                char *init_cmd = NULL, *default_file = NULL, *default_group = 
NULL;
 
                H->buffered = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 0 TSRMLS_CC);
-
+               H->emulate_prepare = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_DIRECT_QUERY, 0 TSRMLS_CC);
                H->max_buffer_size = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, 1024 * 1024 TSRMLS_CC);
 
                if (mysql_options(H->server, MYSQL_OPT_CONNECT_TIMEOUT, (const 
char *)&connect_timeout)) {
@@ -497,7 +505,9 @@
                goto cleanup;
        }
 
-       mysql_handle_autocommit(dbh TSRMLS_CC);
+       if (!dbh->auto_commit) {
+               mysql_handle_autocommit(dbh TSRMLS_CC);
+       }
 
        H->attached = 1;
 

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