Andrey Hristov
7314ed535f
Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
2012-10-17 17:23:37 +02:00
Andrey Hristov
c50d732f76
fix compilation failure on 32/64bit linux systems, when libmysql is used
...
with ext/mysql
2012-10-17 17:22:31 +02:00
ULF WENDEL
20e76f4487
Minor changes for MySQL 5.6
2012-09-29 12:10:24 +02:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
60ad16e11f
skip test properly
2012-08-21 22:11:22 +08:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Tjerk Anne Meesters
e29302576c
Reverted changes in connect.inc based on Ulf's feedback
...
- Moved the ini_set() entries into a separate script 'setupdefault.inc'
- Let mysql_affected_rows and mysql_insert_id test cases use the newly created script
With the ini_set() statements inside connect.inc, some test cases would be forced to 'undo' them in order to test other scenarios.
Tested on all three dev lines with and without passing db credentials. No changes detected.
2011-09-12 14:35:45 +00:00
Ferenc Kovacs
e1357bdbd1
skip these tests if can't connect to mysql
2011-09-08 11:30:58 +00:00
Ulf Wendel
64cca9fb95
Reverting to proper --INI-- section usage. Improve SKIPIF to skip test if open_basedir setting is too restrictive during test run for whatever reason.
2011-09-06 12:58:01 +00:00
Tjerk Anne Meesters
7170a996c5
Patch to run two more mysql test cases that would usually be skipped.
...
Replaced skipifdefaultconnectionfailure.inc by three additional ini_set() statements in connect.inc for the default connection settings
Patch also includes a typo in connect.inc concerning mysql.default_socket
2011-09-04 14:21:27 +00:00
Ulf Wendel
b23baaf0fc
Coverage for bug#54704, of which I think it is bogus, thus no dedicated test.
2011-09-02 13:35:17 +00:00
Ulf Wendel
286d8afda9
Fixing error handling. Skip if load data is not allowed
2011-09-01 15:45:47 +00:00
Ulf Wendel
afb0cce4c9
Can't reproduce the server has gone away messages, Andrey. Please, have a look. I tried MySQL 5.1, 5.5 and 5.6.
2011-09-01 15:25:15 +00:00
Johannes Schlüter
1cb8c01f0d
- Fix Bug #55550 mysql.trace_mode miscounts result sets,
...
fixes ext/mysql/tests/mysql_deprecated_api.phpt
2011-08-31 11:11:08 +00:00
Xinchen Hui
344136e8e9
Apply r315270 to 5.3
...
Fixed test script failed when host mysql doesn't listen on 3306
Fxied test script failed due to mysql_pconnect trigger a warning
2011-08-24 08:00:23 +00:00
Andrey Hristov
36c11fcaf3
Don't run the test on windows, Unix specific
2011-08-22 11:07:35 +00:00
Andrey Hristov
1da5b05dbd
Fix Bug #55473 mysql_pconnect leaks file descriptors on reconnect
...
The fix is for now in 5_4 and trunk, to be merged into 5_3 after 5.3.8
is packaged (expected today). The test case goes to all branches
2011-08-22 10:42:43 +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
Andrey Hristov
4a7bf95c90
completely compile out a currently non-needed function
2011-08-02 14:18:56 +00:00
Felipe Pena
23e438594d
- Make usage of new PHP_FE_END macro
2011-07-25 11:42:53 +00:00
Johannes Schlüter
9aa379c724
- handle out of memory
2011-05-18 11:49:49 +00:00
Ilia Alshanetsky
011143d1bf
Fixed variable re-declarations
2011-02-14 14:05:46 +00:00
Ulf Wendel
cad4c34510
Handle deprecation messages differently in tests to reduce test differences between 5.3 and trunk: suppress warnings by default, check warnings in a dedicated test
2011-01-25 14:01:00 +00:00
Andrey Hristov
97fe653692
fix more parameter stuff, now it is complete
2011-01-14 15:37:49 +00:00
Andrey Hristov
f144bb7153
pass data which is available
2011-01-14 15:10:09 +00:00
Andrey Hristov
eaaef0d870
Proper fix for
...
Bug #53503 mysqli::query returns false after successful LOAD DATA query
which fixes als #56349 , same behavior but in ext/mysql. Both due to a bug
in mysqlnd. Never was a problem with libmysql.
Also fixed the 53503's test case as it always reported PASS, even when there
should have been a failure.
2011-01-07 14:22:30 +00:00
Felipe Pena
927bf09c29
- Year++
2011-01-01 02:19:59 +00:00
Kalle Sommer Nielsen
efe22e3bfa
Fix constness warnings
2010-10-05 09:48:07 +00:00
Ulf Wendel
5aca10ee13
Trying to fix compiler warnings (on Windows).
2010-10-04 13:36:23 +00:00
Ulf Wendel
71bbb24ff0
Sorry again, nothing but removal of white space from the end of the lines.
...
- fix compile warning "ext/mysql/php_mysql.c:640:11: warning: extra tokens at end of #ifdef directive"
2010-10-04 10:08:10 +00:00
Andrey Hristov
60327d87a7
Plug a leak in mysqli when in the same script
...
a pconn is reused.
Call end_psession earlier - so will mysqlnd and
the plugins free data earlier.
2010-09-30 18:10:03 +00:00
Kalle Sommer Nielsen
c2c3467ab4
Fixed bug #52636 (php_mysql_fetch_hash writes long value into int)
...
# Tested by rein at basefarm dot no
2010-08-18 20:00:18 +00:00
Andrey Hristov
33c7b63c6c
Update with PHP_DEF_FE, also update the test
2010-08-17 18:07:11 +00:00
Felipe Pena
0488a86634
- Fix arginfo name
2010-06-28 01:19:08 +00:00
Felipe Pena
e64734f986
- Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for function aliases)
2010-06-26 16:03:39 +00:00
Ulf Wendel
f3448471df
Don't bail if there is another extension that exports constants starting with mysql<something>
2010-06-18 09:56:18 +00:00
Ulf Wendel
20f6aaeca9
Make the tests pass with sql strict mode enabled
2010-06-08 15:47:51 +00:00
Andrey Hristov
bccf2cea5d
Handle the situation when mysql_init()/mysqlnd_init()
...
return NULL. It is a rare case of OOM but PHP shouldn't crash, if possible.
2010-05-25 22:55:10 +00:00
Felipe Pena
b4500e9b85
- Added arginfo
2010-05-20 17:28:16 +00:00
Andrey Hristov
c91c86b743
Remove duplicated code.
...
Use one centralized functions for data extraction.
2010-05-18 11:50:31 +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
Andrey Hristov
ec36ac1610
Fix tests that fail when the MySQL's socket file is not /tmp/mysql.sock
...
as it is in when compiled from source and the default for mysqlnd.
SuSE for example uses /var/run/mysql/mysql.sock . Also, sql.safe_mode
(ext/mysql and ingres) needs the socket.
Fix possible crashes in mysqlnd. When packets are shorter, functions should
return error.
2010-03-26 16:58:25 +00:00
Adam Harvey
bdbb2e77ca
Fixed bug #51242 (Empty mysql.default_port does not default to 3306 anymore, but 0).
2010-03-09 05:08:31 +00:00
Andrey Hristov
52371a2d15
Fix bug#50416
...
PROCEDURE db.myproc can't return a result set in the given context
2010-02-08 13:09:34 +00:00
Ulf Wendel
0004679f8a
The internal zval cache has been removed and not been reintroduced... remove corresponding test code
2010-01-04 15:05:34 +00:00
Sebastian Bergmann
9ba1e81665
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php
2010-01-03 09:23:27 +00:00
Andrey Hristov
06a417b6a9
Remove stub code which never actually was used for anything.
...
Things like this can be built on top of the core.
2009-12-09 20:38:11 +00:00
Andrey Hristov
6f598e62ff
Remove the zval caching from mysqlnd. It was disabled versions ago
...
due to problems on windows, which were not debugged. Better have
code that is disabled not in the core.
2009-12-09 20:21:05 +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
