Commit graph

99 commits

Author SHA1 Message Date
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
Xinchen Hui
cd34067aec skip test properly 2012-08-21 22:15:54 +08:00
Xinchen Hui
60ad16e11f skip test properly 2012-08-21 22:11:22 +08:00
Rasmus Lerdorf
29cdc2cf46 Typo 2011-11-11 02:18:24 +00:00
Rasmus Lerdorf
b27d604b28 Suppress lsof warnings here to avoid FUSE-related
warnings in certain environments. This doesn't
affect what is being tested.
2011-11-11 02:05:54 +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
Tjerk Anne Meesters
828c07c500 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
Ferenc Kovacs
b82f0659c6 skip these tests if can't connect to mysql 2011-09-08 11:30:58 +00:00
Stanislav Malyshev
6577512462 improve open_basedir handling 2011-09-06 19:51:35 +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
Ulf Wendel
faeae7ea47 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
Stanislav Malyshev
119601b0d3 fix test 2011-09-06 05:20:51 +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
Tjerk Anne Meesters
9bea3822ac 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
748e8b9dec 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
c1370c2443 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
Ulf Wendel
b32a8d7a4d 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
Xinchen Hui
d4a50542ea Eliminated compile warning "comparison is always false due to limited range of data type"
Fixed test failed due to mysql_pconnect throw warning
Fixed test failed when host mysql server doesn't listen on 3306
2011-08-24 10:15:47 +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
ee96b2df8f Don't run the test on windows, Unix specific 2011-08-22 11:07:35 +00:00
Andrey Hristov
36c11fcaf3 Don't run the test on windows, Unix specific 2011-08-22 11:07:35 +00:00
Andrey Hristov
0aa6354a2d 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
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
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
Ulf Wendel
e5e8ca7f43 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
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
Andrey Hristov
5549e066f2 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
Andrey Hristov
cfac5f5b67 extending the API interface - plugins can register
themselves with a structure and can be searched.
Every plugin can have statistics and they are shown
under the statistics of mysqlnd in MINFO.
2010-12-28 15:16:21 +00:00
Andrey Hristov
33c7b63c6c Update with PHP_DEF_FE, also update the test 2010-08-17 18:07:11 +00:00
Andrey Hristov
00825de6a2 Use PHP_DEP_FE - good for reflection 2010-08-17 17:40:31 +00:00
Andrey Hristov
8600c1b4da Deprecate mysql_list_dbs, as mysql_list_tables is already deprecated.
As well as mysql_list
2010-08-17 15:37:44 +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
c71d35120c 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
Ulf Wendel
df3b9225fd Make the tests pass with sql strict mode enabled 2010-06-08 15:47:51 +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
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
Andrey Hristov
7868bca437 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
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