[BACK]Return to pdo_mysql.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / pdo_mysql

Diff for /embedaddon/php/ext/pdo_mysql/pdo_mysql.c between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2013/10/14 08:02:28 version 1.1.1.5, 2014/06/15 20:03:53
Line 2 Line 2
   +----------------------------------------------------------------------+    +----------------------------------------------------------------------+
   | PHP Version 5                                                        |    | PHP Version 5                                                        |
   +----------------------------------------------------------------------+    +----------------------------------------------------------------------+
  | Copyright (c) 1997-2013 The PHP Group                                |  | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+    +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |    | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |    | that is bundled with this package in the file LICENSE, and is        |
Line 64  static MYSQLND * pdo_mysql_convert_zv_to_mysqlnd(zval  Line 64  static MYSQLND * pdo_mysql_convert_zv_to_mysqlnd(zval 
         if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), php_pdo_get_dbh_ce() TSRMLS_CC)) {          if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), php_pdo_get_dbh_ce() TSRMLS_CC)) {
                 pdo_dbh_t * dbh = zend_object_store_get_object(zv TSRMLS_CC);                  pdo_dbh_t * dbh = zend_object_store_get_object(zv TSRMLS_CC);
   
                if (!dbh || dbh->driver != &pdo_mysql_driver) {                if (!dbh) {
                         php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to retrieve handle from object store");
                         return NULL;
                 }
 
                 if (dbh->driver != &pdo_mysql_driver) {
                         php_error_docref(NULL TSRMLS_CC, E_WARNING, "Provided PDO instance is not using MySQL but %s", dbh->driver->driver_name);                          php_error_docref(NULL TSRMLS_CC, E_WARNING, "Provided PDO instance is not using MySQL but %s", dbh->driver->driver_name);
                         return NULL;                          return NULL;
                 }                  }
Removed from v.1.1.1.4  
changed lines
  Added in v.1.1.1.5

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>