From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 17 Apr 2015 15:38:03 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e203ecea5fb4a79a947a497e785515cb8b3d54a;p=php

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

3e203ecea5fb4a79a947a497e785515cb8b3d54a