clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-04 00:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,311 Commits 494 Branches 1,367 Tags 814 MiB
6c4b30eb07
Commit Graph

508 Commits

Author SHA1 Message Date
Johannes Schlüter
026445a0aa - Fix bug #60155 (pdo_mysql.default_socket ignored). 2011-11-02 15:45:53 +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
Pierre Joye
e1ad60d3d5 - fix bug #55870, PDO ignores all SSL parameters when used with mysql native driver 2011-10-08 06:17:08 +00:00
Andrey Hristov
3cddf1d7b5 Fix bad cast which leads to crashes! 2011-10-05 18:51:15 +00:00
Andrey Hristov
303f8acd24 Fix bad cast which leads to crashes! 2011-10-05 18:51:15 +00:00
Johannes Schlüter
bb10815f7e - Fix folding 2011-09-19 12:31:06 +00:00
Johannes Schlüter
2817c5f3e7 - Fix folding 2011-09-19 12:31:06 +00:00
Johannes Schlüter
2122879a7a - Fix folding 2011-09-19 12:31:06 +00:00
Christopher Jones
e77138f7ae Fix skipifs 2011-09-08 17:52:45 +00:00
Christopher Jones
d4f1085c18 Fix skipifs 2011-09-08 17:52:45 +00:00
Christopher Jones
8e23ee53bf Fix skipifs 2011-09-08 17:52:45 +00:00
Johannes Schlüter
70561e9a6d - Use myslqnd by default when MySQL extensions are activated but no path given 2011-09-07 13:33:56 +00:00
Johannes Schlüter
bea25b5e55 - Use myslqnd by default when MySQL extensions are activated but no path given 2011-09-07 13:33:56 +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
Ulf Wendel
fe89680010 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
Stanislav Malyshev
d465ee0565 fix redirect when test run from different places 2011-09-06 05:21:56 +00:00
Andrey Hristov
ab99790eca Fix for Bug #54158 MYSQLND + PDO MySQL requires #define MYSQL_OPT_LOCAL_INFILE 
and a bunch of other small preprocessor fixes
 2011-09-02 13:53:41 +00:00
Andrey Hristov
cc697fa5bf Fix for Bug #54158 MYSQLND + PDO MySQL requires #define MYSQL_OPT_LOCAL_INFILE 
and a bunch of other small preprocessor fixes
 2011-09-02 13:53:41 +00:00
Andrey Hristov
27a48f0b44 Fix for Bug #54158 MYSQLND + PDO MySQL requires #define MYSQL_OPT_LOCAL_INFILE 
and a bunch of other small preprocessor fixes
 2011-09-02 13:53:41 +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
56a2ff3b00 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
f90bead78a - Fix TSRM build 2011-09-01 12:04:54 +00:00
Johannes Schlüter
4eff96b99b - Fix TSRM build 2011-09-01 12:04:54 +00:00
Johannes Schlüter
7d25510b1b - Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd 2011-08-31 20:30:08 +00:00
Johannes Schlüter
39b0be5126 - Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd 2011-08-31 20:30:08 +00:00
Johannes Schlüter
c25f0424c8 - Update PDO_mysql error mapping 2011-08-31 15:46:07 +00:00
Johannes Schlüter
878708994d - Update PDO_mysql error mapping 2011-08-31 15:46:07 +00:00
Johannes Schlüter
35597286d6 - Update PDO_mysql error mapping 2011-08-31 15:46:07 +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
Johannes Schlüter
dd8f68ecb0 - 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
dd4e07b9b4 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
Rasmus Lerdorf
76976d0702 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
Felipe Pena
997f323e3a - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
9480eace41 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +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
63ebb30730 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
ff58394fd6 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
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +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
Felipe Pena
b86161982b - 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
Johannes Schlüter
0179c5a0e6 - Fix Bug #53782 (foreach throws irrelevant exception) 2011-05-16 15:37:39 +00:00
Rasmus Lerdorf
d257aa42ff Oops, can't cache it here because it won't work 
in autoconf2.13 and we still support that version
in this branch
 2011-05-15 05:49:34 +00:00
Rasmus Lerdorf
8e256774b0 Cache the PDO include path 2011-05-15 05:24:34 +00:00
Rasmus Lerdorf
08792f6f9b Cache the pdo include path 2011-05-15 05:03:29 +00:00
Rasmus Lerdorf
78a15091f9 Cache the pdo include path 2011-05-15 05:03:29 +00:00
Johannes Schlüter
410a781063 - Fix bug #54644 (wrong pathes in php_pdo_mysql_int.h) 2011-05-09 11:34:17 +00:00
Johannes Schlüter
4a8eeb7afb - Fix bug #54644 (wrong pathes in php_pdo_mysql_int.h) 2011-05-09 11:34:17 +00:00
Rob Richards
1b6dd18082 Implement FR #48587 (MySQL PDO driver doesn't support SSL connections) 2011-04-15 14:24:40 +00:00
Rob Richards
944a2b0c80 Implement FR #48587 (MySQL PDO driver doesn't support SSL connections) 2011-04-15 14:24:40 +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
Kalle Sommer Nielsen
1351c2e2c6 Update to use mysql_options() instead of mysql_set_character_set() (As suggested by Andrey) 2011-01-07 14:58:23 +00:00
Kalle Sommer Nielsen
e4c36b054c Implemented FR #47802, support for character sets in DSN strings for PDO_MYSQL 2011-01-07 14:39:56 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Andrey Hristov
fe719c5e42 profiling in trace mode 2010-10-22 15:46:26 +00:00
Andrey Hristov
924bb78167 profiling in trace mode 2010-10-22 15:46:26 +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
Kalle Sommer Nielsen
33c99f9a44 Fixed constness compiler warning in pdo_mysql 2010-10-05 09:58:15 +00:00
Kalle Sommer Nielsen
d6efd2fef4 Fixed constness compiler warning in pdo_mysql 2010-10-05 09:58:15 +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
Ulf Wendel
d0e7e5aa2a If you add functions to the PDO core, take care not to break other PDO drivers tests, document the function and provide a function test for the PDO core to check your default/fallback implementation. 2010-08-30 09:20:48 +00:00
Ulf Wendel
b12d435b14 If you add functions to the PDO core, take care not to break other PDO drivers tests, document the function and provide a function test for the PDO core to check your default/fallback implementation. 2010-08-30 09:20:48 +00:00
Johannes Schlüter
eaad585a2e - Drop (broken) support for libmysql 3.23 and 4.0 from pdo_mysql, see bug #51259 2010-08-05 13:29:44 +00:00
Ulf Wendel
0ab82cecc2 Fixing test - see also gcov results 2010-05-31 13:28:15 +00:00
Ulf Wendel
aa9915ce5d Fixing test - see also gcov results 2010-05-31 13:28:15 +00:00
Ulf Wendel
2613069cd4 Improve EXPECTF to work with other than default schemata 2010-05-31 10:52:14 +00:00
Ulf Wendel
51044eb919 Improve EXPECTF to work with other than default schemata 2010-05-31 10:52:14 +00:00
Andrey Hristov
9c90bf42c1 Fix for Bug #51870 
PDO::fetchAll after a PDO::execute with bindings lead to a segv.

It is only in unreleased code and thus doesn't deserve a NEWS entry
 2010-05-21 11:09:28 +00:00
Andrey Hristov
7f44538a11 Fix for Bug #51870 
PDO::fetchAll after a PDO::execute with bindings lead to a segv.

It is only in unreleased code and thus doesn't deserve a NEWS entry
 2010-05-21 11:09:28 +00:00
Pierrick Charron
8f128b2b13 Fixed bug #51670 getColumnMeta causes segfault when re-executing query after calling nextRowset 2010-04-27 05:56:56 +00:00
Pierrick Charron
1892d92d68 Fixed bug #51670 getColumnMeta causes segfault when re-executing query after calling nextRowset 2010-04-27 05:56:56 +00:00
Kalle Sommer Nielsen
cb30330800 Merge safe_mode changes into extensions that are in sync in both branches 2010-04-26 23:55:03 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Antony Dovgal
adaf07849d fix typo 2010-04-06 13:42:21 +00:00
Antony Dovgal
d7e716b8f0 fix typo 2010-04-06 13:42:21 +00:00
Andrey Hristov
7496cc761e decouple the methods in MYSQLND_STMT from the data, 
needed to move to a new structure MYSQLND_STMT. Makes
the code cleaner and less error-prone.
Also fix PDO/MySQL which directly touch mysqlnd internals
instead of using API calls.
 2010-03-16 12:36:57 +00:00
Johannes Schlüter
ed03634a8c Revert 290786: Fixed bug #49521 (PDO fetchObject sets values before calling 
constructor)
 2010-02-11 22:14:06 +00:00
Andrey Hristov
e50de7d982 Pass tsrmls to all functions, which might need it in the future. 
We are anyway breaking the internal ABI in 5.3.2 so this won't hurt
and make us prepared for the future.
 2010-02-03 17:31:29 +00:00
Gwynne Raskind
775659b921 ZEND_EXTERN_MODULE_GLOBALS() is necessary with ZTS, at least on OS X. How confusing. 2010-01-31 20:00:36 +00:00
Ilia Alshanetsky
6616ceaefa Fixed crash in ZTS mode due to ini values not being initialized 2010-01-31 19:18:56 +00:00
Rasmus Lerdorf
693eff5dc2 Blah, PDO_DBG_ENABLED is a 0/1 toggle 2010-01-31 17:07:31 +00:00
Rasmus Lerdorf
cc4e15ce53 RINIT/RSHUTDOWN do nothing unless PDO_DBG_ENABLED is defined, 
so don't waste time calling them on every request.
 2010-01-31 16:56:52 +00:00
Ilia Alshanetsky
daa380c0cb Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored) 2010-01-26 13:15:52 +00:00
Johannes Schlüter
6dda7add54 Overlong hostnames breakthistest on NIS enabled FreeBSD 2010-01-21 13:30:46 +00:00
Andrey Hristov
176e6dd2f2 make mysqlnd's tracing API more reusable 2010-01-13 14:06:02 +00:00
Ilia Alshanetsky
d2e14e3f20 Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0) 2010-01-12 12:46:54 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Pierre Joye
af206a90ae - fix build, come on, it is not that hard to test before commit, is it? 2009-12-11 16:35:42 +00:00
Andrey Hristov
c8c250df80 Fix pdo build, forgot to remove the zval caching from pdo-mysql 2009-12-10 09:35:10 +00:00
Pierrick Charron
99ba48dc60 Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN even in the middle of a string). 2009-12-06 21:32:58 +00:00
Pierrick Charron
e2efe4bc7b Fixed bug #45120 (PDOStatement->execute() returns true then false for same statement). 2009-12-03 15:24:43 +00:00
Jani Taskinen
c1aa547b18 - Fixed bug #50231 (Socket path passed using --with-mysql-sock is ignored when mysqlnd is enabled) 2009-11-30 15:11:29 +00:00
Rasmus Lerdorf
937358ebc7 Revert attempt at supporting both autoconf 2.13 and 
modern versions in the same build chain.  There are
simply too many broken things in 2.13 to make it work.
Cache handling is broken as well which is why I need
to revert the pdo_inc_path cache fix as well.

trunk is now 2.60+ only and I'll work on cleaning out
all the legacy cruft from there.
 2009-11-29 06:13:22 +00:00
Rasmus Lerdorf
b442bc3b79 The constructor generates that next line of output, so the expected 
output had these 2 lines in the wrong order.  Test your tests!
 2009-11-25 05:44:27 +00:00
Rasmus Lerdorf
4507292dfc And there is no 23,24,25 in this test at all. Perhaps these lines were 
added to the wrong file by mistake?  Those were the same ones missing from
pdo_mysql___construct_options.phpt
 2009-11-25 05:38:33 +00:00
Rasmus Lerdorf
04927191c7 Unless I am completely misreading this test case, these 3 lines at the 
end should be in the expected output.
 2009-11-25 05:29:57 +00:00
Rasmus Lerdorf
5a2b41a627 Someone strap down Jani and give him a sedative please. 
This makes our toolchain work with the latest versions
of autoconf and avoids a lot of end-user grief.
 2009-11-25 01:30:06 +00:00
Ilia Alshanetsky
755318926e Fixed bug #50240 (pdo_mysql.default_socket in php.ini shouldn't used if it is empty). 2009-11-23 15:45:04 +00:00
Felipe Pena
4bafbf58f8 - Fixed bug #49521 (PDO fetchObject sets values before calling constructor) 
(patch by Pierrick)
 2009-11-15 16:20:37 +00:00
Ulf Wendel
973d7badd5 Adding CLEAN sections and making tests portable between PHP 5 and PHP 6 by replacing string(n) with %unicode|string%(n) and similar. 2009-11-04 12:33:49 +00:00
Ilia Alshanetsky
1e50b1892a Fixed bug #50023 (pdo_mysql doesn't use PHP_MYSQL_UNIX_SOCK_ADDR) 
# Original patch by six at aegis-corp dot org
 2009-10-29 13:33:51 +00:00
Ulf Wendel
58f7c5f578 Updating test - no error message any more. Maybe the PDO core has changed... whatever, one issue less 2009-10-26 11:48:47 +00:00
Ulf Wendel
ee36281037 Updating test, mysqlnd support init commands 2009-10-26 11:41:30 +00:00
Ulf Wendel
381ebe751b mysqlnd supports INIT_COMMAND and so we can add it to PDO_MYSQL @ mysqlnd 2009-09-22 15:31:35 +00:00
Antony Dovgal
193bbbbd59 fix build broken by the fix for bug #49306 2009-08-21 07:46:43 +00:00
Ilia Alshanetsky
019f4f2c22 Fixed bug #49306 (inside pdo_mysql default socket settings are ignored). 2009-08-20 12:13:38 +00:00
Jani Taskinen
5ae549c8fd - Fixed bug #49236 (Missing PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)). 2009-08-17 17:57:40 +00:00
Gwynne Raskind
9adf2ed4aa call-time pass-by-reference is deprecated in 5.3 2009-07-02 10:05:15 +00:00
Kalle Sommer Nielsen
f02ebe4a08 MFH: Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql 2009-05-20 08:30:12 +00:00
Felipe Pena
a3e90c2a63 - Fix test 2009-03-24 15:51:13 +00:00
Felipe Pena
861d51223f MFH: 
- Fixed bug #44409 (PDO::FETCH_SERIALIZE calls __construct())
  Patch by: matteo at beccati dot com
 2009-03-23 23:15:03 +00:00
Ilia Alshanetsky
a6263465cf Removed unused variable 2009-01-14 19:16:24 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Ilia Alshanetsky
bead44c487 MFB: Fixed bug #46964 (Fixed pdo_mysql build with older version of MySQL). 2008-12-30 19:11:13 +00:00
David Coallier
55ad0efd17 - Make test conform to the error reporting that always returns 
three elements. Adjusted all bugs and tests that were using
  errorInfo() and errorCode() (dbh & stmt)
 2008-11-10 18:44:04 +00:00
David Coallier
d781f9d67f - Hrphm, sorry about that, forgot the array value. Now the test runs fine 2008-11-10 12:49:51 +00:00
David Coallier
d2c1047241 - Adjusted test to make sure it reflects the behavior of the method 2008-11-10 12:40:23 +00:00
Johannes Schlüter
ef3ce03e5e MFH: Don't enable mysqlnd when pdo_mysql is being built with libmysql 2008-11-06 11:12:21 +00:00
Felipe Pena
e0fededeba - MFH: Fixed bug #44327 (PDORow::queryString property & numeric offsets / Crash) 2008-11-03 15:33:23 +00:00
Johannes Schlüter
40e42663f5 MFH: Fix #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS) 2008-10-27 18:32:08 +00:00
Felipe Pena
02fee77584 - Fixed test 2008-10-19 18:23:53 +00:00
Johannes Schlüter
a3e4b27857 Fix test 2008-10-19 18:08:29 +00:00
Johannes Schlüter
c8361e7cfe MFH: fix mysqlnd detection 2008-10-19 12:43:34 +00:00