clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,613 Commits 491 Branches 1,363 Tags 846 MiB
a444900c8d
Commit Graph

203 Commits

Author SHA1 Message Date
Andrey Hristov
9a6b72a05a Merge branch 'PHP-5.4' into PHP-5.5 2013-11-26 19:15:43 +02:00
Andrey Hristov
0aadab0e2e add test 2013-11-26 19:15:12 +02:00
Stanislav Malyshev
a2d8ae9a1f fix mysql tests & mark nextRowset problematic tests 2013-08-24 23:56:48 -07:00
Rasmus Lerdorf
626d96ab6d This doesn't fail in 5.5 anymore 2013-08-03 12:14:47 -04:00
Rasmus Lerdorf
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
Rasmus Lerdorf
d60e168a7a pcre_quote? No such thing. How did this ever pass? 2013-08-02 16:12:21 -04:00
Rasmus Lerdorf
9ca7910661 Merge commit 'ea75b1b' into PHP-5.5 
* commit 'ea75b1b':
  This test needs local infile enabled
 2013-08-02 15:33:40 -04:00
Rasmus Lerdorf
ea75b1b5db This test needs local infile enabled 2013-08-02 15:33:18 -04:00
Anatol Belski
1968fac697 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed mysql tests parsing phpinfo()
  Update NEWS
  Fixed bug #35703: when session_name("123") consist only digits, should warning
  Fixed bug #49175: mod_files.sh does not support hash bits
 2013-07-02 08:24:37 +02:00
Anatol Belski
743c4864eb Fixed mysql tests parsing phpinfo() 2013-07-02 08:23:33 +02:00
Stanislav Malyshev
a080611e48 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Tests: PDO Mysql - update for fixed getColumnMeta()
  fix bug #48724
 2013-06-17 00:42:21 -07:00
Daniel Beardsley
5ac0ee30ce Tests: PDO Mysql - update for fixed getColumnMeta() 
The test has always been disabled... so it's never run anyway. Oh well.
 2013-06-17 00:41:21 -07:00
Xinchen Hui
aa2369f85a Merge branch 'PHP-5.4' into PHP-5.5 2013-06-17 13:23:24 +08:00
Xinchen Hui
cfb1ffb4fa Fix typo in test 2013-06-17 13:22:20 +08:00
Xinchen Hui
6cd6349ff8 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-16 22:56:22 +08:00
Xinchen Hui
49e57a3165 Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server) 2013-06-16 22:55:59 +08:00
Remi Collet
6e4cfa18f7 Really fix test pdo_mysql_class_constants.phpt 
- with mysqlnd, constant always present
- with mysqli, check client library version
- without mysqlnd and without mysqli
	skip the test if no connection
	use connection to check client library

Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
so, getClientVersion() return "11"
 2012-12-12 16:53:18 +01:00
Remi Collet
784850211e Reduce case where this test will fails: 
- no connection AND no mysqli extension

So, will succeed when no configured connection, but mysqli available.
 2012-12-03 15:32:52 +01:00
Anatoliy Belsky
f85ae48f4f Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt 
There is a constant now which only is there when mysqli with
mysqlnd and pdo_mysql was compiled at the same time, or when
libmysql version > 50605. So checking for that dynamically,
will fail only if there is no mysqli and no connection.
 2012-11-14 21:18:16 +01:00
Johannes Schlüter
4f4d77805c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/pdo_mysql/mysql_statement.c
 2012-10-26 14:22:31 +02:00
ULF WENDEL
056ecf3201 This won't make the test pass but now its at least one that shows no unnecessary error messages... 2012-10-26 12:32:10 +02:00
ULF WENDEL
848780606d Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests 2012-10-23 14:58:16 +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
ULF WENDEL
20e76f4487 Minor changes for MySQL 5.6 2012-09-29 12:10:24 +02:00
andrey
67419499b2 Merge branch 'PHP-5.3' into PHP-5.4 2012-05-02 15:57:08 +02:00
andrey
b42d000471 Fix for bug#61411 
Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the root cause of the problem and the crash at free.
 2012-05-02 15:55:22 +02:00
Johannes Schlüter
0589b19abf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
 2012-04-19 12:47:47 +02:00
Johannes Schlüter
1b78aef426 Fix bug #61755 parsing bug can lead to access violations 2012-04-19 12:46:02 +02:00
Johannes Schlüter
abd5670566 Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails 2012-03-06 01:43:49 +00:00
Johannes Schlüter
d796ebb0b5 Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails 2012-03-06 01:43:49 +00:00
Johannes Schlüter
dc0070e323 Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00:00
Johannes Schlüter
46608a073c Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00:00
Johannes Schlüter
b526e0e410 Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work 2012-03-05 23:38:15 +00:00
Johannes Schlüter
f666285805 Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work 2012-03-05 23:38:15 +00:00
Christopher Jones
e77138f7ae Fix skipifs 2011-09-08 17:52:45 +00:00
Christopher Jones
8e23ee53bf Fix skipifs 2011-09-08 17:52:45 +00:00
Ulf Wendel
e21ea5e7ce Fix SKIPIF 2011-09-06 13:57:03 +00:00
Ulf Wendel
f5e4b5f1c5 Fix SKIPIF 2011-09-06 13:57:03 +00:00
Stanislav Malyshev
6280a6bdf9 fix redirect when test run from different places 2011-09-06 05:21:56 +00:00
Ulf Wendel
6e3708cc59 Hopefully, this is an even better way to check for InnoDB support as of MySQL 5.6.1 2011-09-02 11:06:51 +00:00
Ulf Wendel
864f8106be Hopefully, this is an even better way to check for InnoDB support as of MySQL 5.6.1 2011-09-02 11:06:51 +00:00
Johannes Schlüter
262cc2f37a - Be less restrictive on the SQL state, some server versions might fool us 2011-08-31 15:25:18 +00:00
Johannes Schlüter
b3c3d35b9f - Be less restrictive on the SQL state, some server versions might fool us 2011-08-31 15:25:18 +00:00
Rasmus Lerdorf
595f2e71ec Since we are creating this csv file locally this should obviously 
be a a LOCAL infile here for this to work reliably. For robustness
this should probably have a check for the local-infile server 
setting as well.
 2011-08-31 07:43:58 +00:00
Rasmus Lerdorf
8b4ac6bb8f Fix test. I have no idea why the test author didn't expect to get back 
latin2 when the test is setting it to latin2 here. Both PHP and MySQL
are doing the right thing here.
 2011-08-31 07:19:20 +00:00
Ulf Wendel
61b2568310 Would be nice if tests get updated whenever a feature is added by the person adding the feature... 2011-07-26 09:33:01 +00:00
Ulf Wendel
48d47da8af Would be nice if tests get updated whenever a feature is added by the person adding the feature... 2011-07-26 09:33:01 +00:00
Ulf Wendel
ac9708ccf2 Fix mysqlnd detection 2011-07-26 09:30:49 +00:00