mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-09 12:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
69,692 Commits 505 Branches 1,389 Tags 848 MiB
0777a18703
Commit Graph

184 Commits

Author SHA1 Message Date
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
Ulf Wendel
41c94d26a4 Fix mysqlnd detection 2011-07-26 09:30:49 +00:00
Felipe Pena
087a134b50 - Fixed bug #54929 (Parse error with single quote in sql comment) 2011-06-04 22:54:40 +00:00
Felipe Pena
e1a5443f97 - Fixed bug #54929 (Parse error with single quote in sql comment) 2011-06-04 22:54:40 +00:00
Johannes Schlüter
3e17b49008 - Fix Bug #53782 (foreach throws irrelevant exception) 2011-05-16 15:37:39 +00:00
Johannes Schlüter
a90b7da435 - Fix Bug #53782 (foreach throws irrelevant exception) 2011-05-16 15:37:39 +00:00
Kalle Sommer Nielsen
ba4fbb05ae Remove this void comment (c/p mistake) 2011-01-17 09:59:07 +00:00
Kalle Sommer Nielsen
dc8da85778 Remove this void comment (c/p mistake) 2011-01-17 09:59:07 +00:00
Kalle Sommer Nielsen
504b6f695e MFT: Implemented FR #47802 (Support for setting character sets in DSN strings) 2011-01-17 09:54:22 +00:00
Johannes Schlüter
fc49f76caa - Fix #53551 (PDOStatement execute segfaults for pdo_mysql driver) 2011-01-14 14:57:57 +00:00
Johannes Schlüter
22b42afaee - Fix #53551 (PDOStatement execute segfaults for pdo_mysql driver) 2011-01-14 14:57:57 +00:00
Kalle Sommer Nielsen
ee62a1a747 Added test case for #47802 and fixed macro name after the move to mysql_options() 2011-01-07 17:18:30 +00:00
Ulf Wendel
bd73903efb Fix test: third parameter can be false. 2010-10-05 14:41:08 +00:00
Ulf Wendel
8c319bf942 Fix test: third parameter can be false. 2010-10-05 14:41:08 +00:00
Ulf Wendel
8236f62ce2 Test update for sql_mode = ANSI 2010-09-22 15:16:07 +00:00
Ulf Wendel
841c151b64 Test update for sql_mode = ANSI 2010-09-22 15:16:07 +00:00
Ulf Wendel
c30edd027f Dont be strict on error messages, they can vary by server version 2010-09-20 09:04:48 +00:00
Ulf Wendel
70d231bf13 Dont be strict on error messages, they can vary by server version 2010-09-20 09:04:48 +00:00
Ulf Wendel
d27642fece PHP has changed (undefined) behaviour from 5.3.2 to 5.3.3: ->{} = , which seems to have been never an officially supported syntax and have never been a valid property name, is no longer allowed and PHP bails. 2010-08-31 14:43:02 +00:00
Ulf Wendel
d3670280f0 PHP has changed (undefined) behaviour from 5.3.2 to 5.3.3: ->{} = , which seems to have been never an officially supported syntax and have never been a valid property name, is no longer allowed and PHP bails. 2010-08-31 14:43:02 +00:00