From: Stanislav Malyshev <stas@php.net>
Date: Mon, 17 Jun 2013 07:41:46 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a080611e484aa56e3be6ab038221ab3304c125b1;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Tests: PDO Mysql - update for fixed getColumnMeta()
  fix bug #48724
---

a080611e484aa56e3be6ab038221ab3304c125b1
diff --cc NEWS
index e56e6f6926,6fd2bf2284..47c3e34fa7
--- a/NEWS
+++ b/NEWS
@@@ -18,8 -24,23 +18,12 @@@ PH
    . Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to 
      the same db server). (Laruence)
  
 -- PDO_DBlib:
 -  . Fixed bug #63638 (Cannot connect to SQL Server 2008 with PDO dblib). 
 -    (Stanley Sufficool)
 -  . Fixed bug #64338 (pdo_dblib can't connect to Azure SQL). (Stanley 
 -    Sufficool)
 -  . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed 
 -    statement crashes). (Stanley Sufficool)
 -
+ - PDO_mysql:
 -  . Fixed bug #48724 (getColumnMeta() doesn't return native_type for BIT, 
++  . Fixed bug #48724 (getColumnMeta() doesn't return native_type for BIT,
+     TINYINT and YEAR). (Antony, Daniel Beardsley)
+ 
 -- PDO_pgsql:
 -  . Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi)
 -
  - Readline:
 -  . Implement FR #55694 (Expose additional readline variable to prevent 
 +  . Implement FR #55694 (Expose additional readline variable to prevent
      default filename completion). (Hartmel)
  
  - SPL: