adcdb4f7ba
Fix test description
2016-02-13 17:46:24 +01:00
bc419fee5c
FIx bug #71569
...
convert_to_string() may result in an interned string.
2016-02-13 15:17:51 +01:00
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
d73d9fecf6
Fixed and improved tests
2015-12-24 14:08:44 +01:00
4f528e5c95
test to function PDO_getAvaliableDrivers;
...
was add new function to PDO::getAvailableDrivers
2015-12-24 10:45:39 +01:00
be6fd4ba89
Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
...
Actually, this only be fixed if php uses mysqlnd
2015-11-16 16:59:55 +08:00
73384728ca
Fix bug #64172
...
Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.
2015-10-18 17:06:54 -07:00
ef1bd8f0e6
Fixed bug #70389 (PDO constructor changes unrelated variables)
2015-08-30 05:02:38 -07:00
9806a37a79
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
sigh, can't even copypaste without screwing up
2015-04-02 00:07:13 +02:00
9991b8ecee
sigh, can't even copypaste without screwing up
2015-04-02 00:07:00 +02:00
e70e2d8310
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
2015-04-01 23:06:22 +02:00
7c1a1189be
oop, put both the error number and message for both db object to the error message
2015-04-01 23:06:04 +02:00
faab430141
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
test fixes
2015-04-01 22:08:11 +02:00
0a41af216e
test fixes
2015-04-01 22:07:52 +02:00
3d6a83a7d0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
2015-01-15 17:48:11 +01:00
7c9633412e
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
...
Unix uses "127.0.0.1" as default host for named pipes,
while when using Windows a "." is required as host by mysqlnd.
(This can be seen at mysqlnd.c (line 945 or searching #ifndef PHP_WIN32)
2015-01-15 16:42:51 +01:00
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
38f1b569c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update test after fixing bug #68371
2015-01-05 12:11:46 +01:00
ea1c0c5627
Update test after fixing bug #68371
2015-01-05 12:11:16 +01:00
488d3dac2e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 10:48:18 +01:00
7d2f8525d8
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 09:25:48 +01:00
08241ee3f3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
C89 compat
add include for missing localeconv_r proto
2014-12-06 12:18:05 +01:00
9016018ccc
C89 compat
2014-12-06 12:14:17 +01:00
b120f9beb2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix compilation error (ref #68424 )
2014-12-06 10:24:27 +01:00
625b929c6e
Fix compilation error (ref #68424 )
2014-12-06 10:23:56 +01:00
5104c2bbc3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Start adding new attribute to control multi statements
2014-12-05 17:05:37 +01:00
4c0bd5e77a
Start adding new attribute to control multi statements
2014-12-05 17:03:31 +01:00
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
3e4b91ec7f
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2014-11-10 08:16:35 +01:00
f08a5bfadc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed MarinaDB support
2014-06-20 13:58:26 +04:00
f0639611cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed MarinaDB support
2014-06-20 13:57:38 +04:00
680ddabac1
Fixed MarinaDB support
2014-06-20 13:56:32 +04:00
cfccdc6362
Bug 64744
...
Show the type of the non-object for more descriptive errors
2014-06-08 19:14:58 -07:00
63791d055a
New result fetching mode for mysqlnd, which should use less memory but
...
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
2014-04-10 16:44:54 +03:00
2198bbce86
Merge branch 'PHP-5.4' into PHP-5.5
2014-02-23 14:56:32 +01:00
756ee95605
We can't dereference dbh if it is NULL
2014-02-23 14:18:24 +01:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
9a6b72a05a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-26 19:15:43 +02:00
0aadab0e2e
add test
2013-11-26 19:15:12 +02:00
a2d8ae9a1f
fix mysql tests & mark nextRowset problematic tests
2013-08-24 23:56:48 -07:00
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
626d96ab6d
This doesn't fail in 5.5 anymore
2013-08-03 12:14:47 -04:00
d24f31c65e
Merge commit 'd60e168' into PHP-5.5
...
* commit 'd60e168':
pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:13:03 -04:00
d60e168a7a
pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:12:21 -04:00
9ca7910661
Merge commit 'ea75b1b' into PHP-5.5
...
* commit 'ea75b1b':
This test needs local infile enabled
2013-08-02 15:33:40 -04:00
ea75b1b5db
This test needs local infile enabled
2013-08-02 15:33:18 -04:00
7b92a22772
Fix bug 65299
2013-07-23 14:13:22 +02:00
5a8b0ca8fa
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-23 12:57:08 +02:00
Nikita Popov