Remi Collet
c5d4ee9bed
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #63361 Header not installed
2012-11-25 07:48:44 +01:00
Remi Collet
8d2c44b59d
Fixed Bug #63361 Header not installed
...
ext/mysqli/php_mysqli_structs.h is installed and includes
mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also
be installed.
2012-11-25 07:46:02 +01:00
Andrey Hristov
967a1ebe51
add protection against core dumps if the underlying library returns
...
0x0 for some reason
2012-10-18 15:09:17 +02:00
ULF WENDEL
1fafc9b373
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Cover have_ssl=NO and have_ssl=DISABLED
2012-09-29 18:56:30 +02:00
ULF WENDEL
7aa3d0ae65
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Cover have_ssl=NO and have_ssl=DISABLED
2012-09-29 18:55:51 +02:00
ULF WENDEL
da541ff561
Cover have_ssl=NO and have_ssl=DISABLED
2012-09-29 18:54:54 +02:00
ULF WENDEL
917639d463
Updating expected output in anticipation of mysqlnd_auth.c path
2012-09-29 17:42:00 +02:00
ULF WENDEL
ccf749e38d
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- BFN
Minor changes for MySQL 5.6
NEWS for 76601c4
2012-09-29 12:21:55 +02:00
ULF WENDEL
13d4d8e2d0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Minor changes for MySQL 5.6
NEWS for 76601c4
2012-09-29 12:17:13 +02:00
Xinchen Hui
69a4301f6c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
ULF WENDEL
20e76f4487
Minor changes for MySQL 5.6
2012-09-29 12:10:24 +02:00
ULF WENDEL
4969c7d50a
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
- Fixed bug #63214 (Large PDO Firebird Queries)
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
sapi/litespeed/lsapi_main.c: Fix bug #63228
fix test
constify
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
2012-09-29 09:56:55 +02:00
Andrey Hristov
6fbcf69375
fix test
2012-10-12 10:35:45 +02:00
Xinchen Hui
4e5e8c9da0
Merge branch 'PHP-5.4'
2012-10-10 10:45:34 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Andrey Hristov
06dfb96bf5
add a check for libmysql
2012-10-03 14:14:59 +02:00
ULF WENDEL
a2098ca9eb
SHA256 authentication tests
2012-09-29 09:47:23 +02:00
andrey
263b37bee1
change public key setting to PERDIR and finish code that allows
...
to set the key file programatically per mysqli_options()
2012-09-25 18:26:02 +02:00
andrey
571b46bff6
Add SHA256 authentication support - password hashing to mysqlnd
...
Automatic switchover to SSL with plain-text password is not part of this
2012-09-25 14:04:36 +02:00
Xinchen Hui
5f9023ca38
Correct PHP version
2012-09-05 23:41:42 +08:00
Xinchen Hui
2af7a76822
Merge branch 'PHP-5.4'
2012-08-22 13:52:04 +08:00
Xinchen Hui
4e561055a4
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-22 13:49:04 +08:00
Xinchen Hui
e5bdd2c0ee
Fixed bug #62885 (mysqli_poll - Segmentation fault)
2012-08-22 13:41:47 +08:00
Nikita Popov
294e7c295f
Annother attempt at fixing the mysqli_fetch_field tests
...
Instead of character set detection (which doesn't always work correctly)
fetch the character set info using mysqli_get_charset(). To make sure that
the returned info applies to all of client, connection and result
explicitely set utf8 as charset using mysqli_set_charset() before. I'm not
sure whether that last part is really necessary, but included it to be
safe.
2012-08-17 19:47:59 +02:00
Nikita Popov
8cccc5c37d
Revert "Try to fix mysqli_field tests"
...
This reverts commit 018395efaf
2012-08-16 21:56:48 +02:00
Nikita Popov
018395efaf
Try to fix mysqli_field tests
...
Those tests seem to fail when people have a different default collation, so
try to fix by specifying utf8_general_ci explicitely.
2012-08-15 14:50:24 +02:00
Stanislav Malyshev
a3322f8927
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
andrey
dec56ca1e3
Merge branch 'PHP-5.4'
2012-05-16 16:00:17 +02:00
andrey
4d2d8e8717
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/mysqlnd/mysqlnd_ps.c
merge fix for bug#62046
2012-05-16 15:59:39 +02:00
andrey
d4afbd487a
Fix for bug#62046
...
Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to
mysqli_stmt_reset().
Stmt's state was changed to STMT_PREPARED and leads the driver to think
that the stmt was just prepared. Because result set exist also for only
prepared but not executed sets, the check for stmt->result isn't any good.
There is a result set, because as response for COM_PREPARE the server sends
metadata and metadata is part of a result set. After COM_EXECUTE the server
sends metadata again, which could be different and in this case more correct.
2012-05-16 14:28:55 +02:00
zoe slattery
129c830562
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Changes to remaining two tests, #62022
2012-05-15 14:40:49 +01:00
zoe slattery
63401268db
Changes to remaining two tests, #62022
2012-05-15 14:39:51 +01:00
andrey
b850fa14e0
phoenix from the ashes
2012-05-03 13:34:26 +02:00
andrey
522595086b
Remove support for local infile handler in mysqli from 5.5
...
This removes the following functions from the API:
mysqli_set_local_infile_default()
mysqli_set_local_infile_handler()
Using these functions is known to be lead to stability problems in
mysqli. It was only enabled when compiling against libmysql. mysqlnd
doesn't have this support for local infile. However, with mysqlnd it can
be emulated by using stream handlers like in:
$c->query("LOAD DATA LOCAL INFILE "http://example.com/import.csv " INTO ...")
All available protocols, as well as user implemented ones can be added.
2012-05-03 12:55:03 +02:00
andrey
57f7bd0d85
remove dead and unused for more than 8 years code
2012-05-03 12:22:25 +02:00
Ulf Wendel
8665e02ccd
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
Ulf Wendel
18a4e93877
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
Ulf Wendel
0fde9acd12
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
Johannes Schlüter
ecf87a96b9
Use correct property ctor, should fix threading issue in bug #55334
...
# The code was refactored in 5_4/trunk, no need to merge
2012-03-08 12:52:12 +00:00
Johannes Schlüter
512fdb4cc2
Fix bug #61003 mysql_stat() require a valid connection
2012-03-06 00:15:40 +00:00
Johannes Schlüter
0aa45f4a2a
Fix bug #61003 mysql_stat() require a valid connection
2012-03-06 00:15:40 +00:00
Johannes Schlüter
a845e7bc08
Fix bug #61003 mysql_stat() require a valid connection
2012-03-06 00:15:40 +00:00
Xinchen Hui
19a663d02d
unnecessay slash
2012-01-17 14:32:01 +00:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
