Anatol Belski
fd5cdf89a8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix TS build
2013-07-16 18:05:45 +02:00
Anatol Belski
bb6d74918e
fix TS build
2013-07-16 18:05:14 +02:00
Johannes Schlüter
e1a0c90b8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-16 13:55:32 +02:00
Johannes Schlüter
d3a4af4db8
Make zval2myslqnd implementations aware of inheritance
2013-07-16 13:52:57 +02:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Andrey Hristov
2c3f6dcdb6
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
...
Conflicts:
NEWS
2013-07-08 20:28:51 +02:00
Andrey Hristov
dd71f1f173
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-07-08 20:27:14 +02:00
Andrey Hristov
3dd5f4ae4c
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 20:23:32 +02:00
Johannes Schlüter
631bb27dca
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/acinclude.m4
2013-07-03 16:58:20 +02:00
Johannes Schlüter
0265c2d961
Make sure result is initilized
...
Practically this could only be an issue when overriding mysqlnd from
an extension, but makes static analysis happy
2013-07-03 16:53:09 +02:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -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
Nikita Popov
fcc6611de9
Add support for non-scalar Iterator keys in foreach
...
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Andrey Hristov
64a2a8a753
relax the check
2013-02-22 13:50:04 +01:00
Andrey Hristov
1643d4ed56
Add some parameter checks
2013-02-22 13:17:46 +01: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
846e506a3d
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-09 19:15:29 +01:00
Andrey Hristov
d430b5a4eb
Add mysqli support - constants and checking in mysqli_options() for the
...
new constant for password expriration
2013-01-09 19:14:48 +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
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08: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
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
Conflicts:
NEWS
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
.
This change didn't really make sense in hindsight. Looking for some other
fix.
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
Andrey Hristov
4dfd69e84b
fix for 5.5.19
2011-12-14 19:29:45 +00:00
Andrey Hristov
e385335db2
fix for 5.5.19
2011-12-14 19:29:45 +00:00
Andrey Hristov
2f0d084ab8
fix for 5.5.19
2011-12-14 19:29:45 +00:00
Andrey Hristov
9e14665237
another fix
2011-12-14 19:28:41 +00:00
Andrey Hristov
d671f26c46
another fix
2011-12-14 19:28:41 +00:00
Andrey Hristov
f16c10898b
another fix
2011-12-14 19:28:41 +00:00
Andrey Hristov
b8697d07f8
fix test
2011-12-14 18:37:49 +00:00
Andrey Hristov
7512b84a20
fix test
2011-12-14 18:37:49 +00:00
Andrey Hristov
536e675bfa
fix test
2011-12-14 18:37:49 +00:00
Andrey Hristov
3ef71f9726
fix test
2011-12-14 18:36:04 +00:00
Andrey Hristov
727731cf98
fix test
2011-12-14 18:36:04 +00:00
Andrey Hristov
63ded0f5e9
fix test
2011-12-14 18:36:04 +00:00
Andrey Hristov
9033d60caf
fix typo
2011-12-14 17:59:11 +00:00
Andrey Hristov
0d2af0c3ee
fix typo
2011-12-14 17:59:11 +00:00
Andrey Hristov
8a65304a01
fix typo
2011-12-14 17:59:11 +00:00
Andrey Hristov
e38daffe60
fix test
2011-12-14 16:27:52 +00:00
Andrey Hristov
141905ce54
fix test
2011-12-14 16:27:52 +00:00
Andrey Hristov
e82bbe91c5
fix test
2011-12-14 16:27:52 +00:00
Ulf Wendel
0f799cc410
Good to fix something, but don't forget to update tests
2011-11-23 17:30:59 +00:00
Ulf Wendel
1d1d88bec0
Good to fix something, but don't forget to update tests
2011-11-23 17:23:57 +00:00
Ulf Wendel
2bfd24071b
Always good to fix something, but don't forget to update tests
2011-11-23 17:01:09 +00:00
Ulf Wendel
87a1c1bf47
Fix test
2011-11-23 16:47:22 +00:00
Ulf Wendel
77025b71e1
Fix test
2011-11-23 16:47:22 +00:00
Ulf Wendel
b5054a7c7b
Fix test
2011-11-23 16:47:22 +00:00
Ulf Wendel
9475362f99
Message can vary depending on server version
2011-11-23 16:38:50 +00:00
Ulf Wendel
785b68a109
Message can vary depending on server version
2011-11-23 16:38:50 +00:00
Ulf Wendel
6c1f4e58ce
Message can vary depending on server version
2011-11-23 16:38:50 +00:00
Ulf Wendel
a6502de5d0
Skipping with libmysql. If a documentation points to more or less unmaintained wiki contents, I take it as a request to stop testing a feature. Can't tell if I get false positive, hit a bug or not. This is not libmysql testing. Its PHP MySQL API testing.
2011-11-22 16:52:42 +00:00
Ulf Wendel
09a9df8d59
Skipping with libmysql. If a documentation points to more or less unmaintained wiki contents, I take it as a request to stop testing a feature. Can't tell if I get false positive, hit a bug or not. This is not libmysql testing. Its PHP MySQL API testing.
2011-11-22 16:52:42 +00:00
Ulf Wendel
aeaa4b3da6
Skipping with libmysql. If a documentation points to more or less unmaintained wiki contents, I take it as a request to stop testing a feature. Can't tell if I get false positive, hit a bug or not. This is not libmysql testing. Its PHP MySQL API testing.
2011-11-22 16:52:42 +00:00
Johannes Schlüter
03a0f9deb4
- Add missing include.
2011-11-14 17:56:33 +00:00
Johannes Schlüter
2ec0a9c5c8
- Add missing include.
2011-11-14 17:56:33 +00:00
Johannes Schlüter
6442fc5b4a
- Add missing include.
2011-11-14 17:56:33 +00:00
Ulf Wendel
52e836611f
Improving test to reflect latest API changes
2011-11-03 17:39:39 +00:00
Ulf Wendel
25235313a0
Improving test to reflect latest API changes
2011-11-03 17:39:39 +00:00
Ulf Wendel
58f40c0345
Improving test to reflect latest API changes
2011-11-03 17:39:39 +00:00
Andrey Hristov
6a9feb730f
Split struct MYSQLND in struct MYSQLND and struct MYSQLD_CONN_DATA.
...
A step in the direction of keeping internal data private
2011-10-31 11:46:24 +00:00
Andrey Hristov
8fb6bdd5b8
Split struct MYSQLND in struct MYSQLND and struct MYSQLD_CONN_DATA.
...
A step in the direction of keeping internal data private
2011-10-31 11:46:24 +00:00
Andrey Hristov
f926a3c07d
Move from directly referencing an aggregated structure to using a
...
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
2011-10-25 23:01:49 +00:00
Andrey Hristov
845d8fa10c
Move from directly referencing an aggregated structure to using a
...
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
2011-10-25 23:01:49 +00:00
Andrey Hristov
10e4419231
api_ext to reverse_api
2011-10-19 15:04:12 +00:00
Andrey Hristov
efb68d9399
api_ext to reverse_api
2011-10-19 15:04:12 +00:00
Andrey Hristov
103d60fad0
last stat fix
2011-10-10 15:45:56 +00:00
Andrey Hristov
33eb2ab6f1
last stat fix
2011-10-10 15:45:56 +00:00
Andrey Hristov
063162be3a
fix test after stat change
2011-10-10 14:39:22 +00:00
Andrey Hristov
c75a4a408b
fix test after stat change
2011-10-10 14:39:22 +00:00
Andrey Hristov
e1e147aa4e
fix another test after stat change
2011-10-10 14:33:07 +00:00
Andrey Hristov
d4e0ef5dc9
fix another test after stat change
2011-10-10 14:33:07 +00:00
Andrey Hristov
4151194c5a
fix test
2011-10-10 14:19:01 +00:00
Andrey Hristov
90ef61d587
fix test
2011-10-10 14:19:01 +00:00
Andrey Hristov
3468180085
fix test
2011-10-10 13:25:45 +00:00