From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 17 Mar 2006 00:15:09 +0000 (+0000)
Subject: Allow PDO_MYSQL_ATTR_DIRECT_QUERY to be set via constructor
X-Git-Tag: php-5.1.3RC2~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fd71dbbe922b46d49ee7b2843c273ab02a6fcac;p=php

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.
---

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 318fb15473..bdbc5fe944 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -362,6 +362,14 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, long attr, zval *return_value
 			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 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 		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 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 		goto cleanup;
 	}
 
-	mysql_handle_autocommit(dbh TSRMLS_CC);
+	if (!dbh->auto_commit) {
+		mysql_handle_autocommit(dbh TSRMLS_CC);
+	}
 
 	H->attached = 1;