]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 17 Apr 2015 15:13:45 +0000 (17:13 +0200)
committerAnatol Belski <ab@php.net>
Fri, 17 Apr 2015 15:13:45 +0000 (17:13 +0200)
* PHP-5.5:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance


Trivial merge