From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 1 Apr 2015 21:06:22 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~79^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e70e2d8310b58a59dc14fa3336624cb022a5daaa;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  oop, put both the error number and message for both db object to the error message
---

e70e2d8310b58a59dc14fa3336624cb022a5daaa