diff options
| author | Keyur Govande <keyur@php.net> | 2014-07-30 02:28:31 +0000 |
|---|---|---|
| committer | Keyur Govande <keyur@php.net> | 2014-07-30 02:28:31 +0000 |
| commit | 65364fe7d00319f6bfb4814980988d34183f9f78 (patch) | |
| tree | c43cafca04c14938b5e0b6dc38d311ea1f0defcf /main | |
| parent | 00546bc9b7cb8208c27de9c6ebd12156401a5607 (diff) | |
| download | php-git-65364fe7d00319f6bfb4814980988d34183f9f78.tar.gz | |
Corrected patch for bug #60616
For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_version.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/main/php_version.h b/main/php_version.h index c6aa024436..a1d9d8ec80 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,7 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 32 - #define PHP_EXTRA_VERSION "-dev" #define PHP_VERSION "5.4.32-dev" #define PHP_VERSION_ID 50432 |