Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Andrey Hristov
9d2dda9058
Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C
2013-05-14 11:26:35 +02:00
Xinchen Hui
e60638faca
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-27 23:50:23 +08:00
Xinchen Hui
7b9eabaf51
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-27 23:50:02 +08:00
Xinchen Hui
15b554cd9b
Also fixed bug #64726 in 5.3
2013-04-27 23:49:43 +08:00
Xinchen Hui
1c07590ed7
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-27 23:41:51 +08:00
Xinchen Hui
8f5a534b21
Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
2013-04-27 23:41:31 +08:00
Xinchen Hui
d54432ed98
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-27 23:38:10 +08:00
Xinchen Hui
c7b8368ed5
Fix memory realted to #64726
2013-04-27 23:38:00 +08:00
Andrey Hristov
a5b426eeff
update test case
2013-02-08 18:28:22 +01:00
Andrey Hristov
43ecd8fe1b
mysqli_savepoint()/mysqli_release_savepoint()
2013-02-08 18:09:50 +01:00
Andrey Hristov
0da369ae50
Add the constants needed for mysqli_commit(), _rollback() and
...
begin_transaction()
2013-02-08 17:05:25 +01:00
Andrey Hristov
afacdecd1f
Add support for begin_transaction in libmysql mode.
...
Add support for flags and name for commit/rollback in libmysql mode
2013-02-07 18:45:49 +01:00
ULF WENDEL
f787e21ef5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:53:46 +01:00
ULF WENDEL
36e88d78e6
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:51:14 +01:00
Andrey Hristov
cde53e7fcd
fix different values of mysqli_stmt_affected_rows between libmysql
...
and mysqlnd (in favor of libmysql) before execute and after prepare()
2013-01-07 16:36:21 +01:00
Xinchen Hui
ea649a5aba
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-17 14:30:20 +08:00
Xinchen Hui
05deaf1706
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-17 14:29:45 +08:00
Xinchen Hui
06739a1b72
dos2unix & skip on connect fail
2012-12-17 14:29:13 +08:00
Rasmus Lerdorf
5aabf243bf
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 16:54:44 -08:00
Rasmus Lerdorf
77c4b84ac8
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:54:31 -08:00
Rasmus Lerdorf
7a49e09fd8
Need connect.inc here
2012-12-13 16:54:16 -08:00
Rasmus Lerdorf
3925683d46
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 16:42:50 -08:00
Rasmus Lerdorf
d845549257
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:42:33 -08:00
Rasmus Lerdorf
9d1bc1b622
Fix broken test
...
Need to use the configured connection parameters here. We can't assume
the test user has access.
2012-12-13 16:41:56 -08:00
Xinchen Hui
093d119597
Merge branch 'PHP-5.4' into PHP-5.5
2012-11-30 14:30:37 +08:00
Xinchen Hui
b689819567
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-30 14:29:59 +08:00
Xinchen Hui
40fabf68ed
Fixed bug #63398 (Segfault when polling closed link)
2012-11-30 14:28:32 +08: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
ULF WENDEL
a2098ca9eb
SHA256 authentication tests
2012-09-29 09:47:23 +02: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
