]> granicus.if.org Git - php/commit
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Fri, 17 Apr 2015 15:38:03 +0000 (18:38 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 17 Apr 2015 15:38:03 +0000 (18:38 +0300)
commit3e203ecea5fb4a79a947a497e785515cb8b3d54a
tree40a92b0a99c0a2a8b9dcaaa778a8a9e5206b4769
parent6718b56e4563b899ccc115f451f2d3623f528919
parent8192d645dbd0a8bf40b537196109a2fe94a2eee2
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance