[Pkg-php-commits] [php/debian-sid] Cherry pick patch to reset error status on beginTransaction()

[Raphael Geissert]

---
 debian/patches/series                              |    1 +
 .../pdo_reset_error_beginTransaction.patch         |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/upstream/pdo_reset_error_beginTransaction.patch

diff --git a/debian/patches/series b/debian/patches/series
index 37c0c6d..4680096 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,3 +54,4 @@ CVE-2010-0397.patch
 enchant_unaligned_memory_access.patch
 use_system_crypt_fixes.patch
 upstream/mysqli_ssl.patch
+upstream/pdo_reset_error_beginTransaction.patch
diff --git a/debian/patches/upstream/pdo_reset_error_beginTransaction.patch b/debian/patches/upstream/pdo_reset_error_beginTransaction.patch
new file mode 100644
index 0000000..db493d1
--- /dev/null
+++ b/debian/patches/upstream/pdo_reset_error_beginTransaction.patch
@@ -0,0 +1,16 @@
+Description: Reset error state on PDO's beginTransaction()
+Origin: http://svn.php.net/viewvc?view=revision&revision=297273
+Last-Update: 2010-05-01
+
+Index: php/ext/pdo/pdo_dbh.c
+===================================================================
+--- php.orig/ext/pdo/pdo_dbh.c
++++ php/ext/pdo/pdo_dbh.c
+@@ -851,6 +851,7 @@ static PHP_METHOD(PDO, setAttribute)
+ 		RETURN_FALSE;
+ 	}
+ 
++	PDO_DBH_CLEAR_ERR();
+ 	PDO_CONSTRUCT_CHECK;
+ 
+ 	if (pdo_dbh_attribute_set(dbh, attr, value TSRMLS_CC) != FAILURE) {
-- 
1.6.5