1
0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Commit Graph

621 Commits

Author SHA1 Message Date
Xinchen Hui c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Veres Lajos 8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Yoshinari Takaoka 1b4103c09d - addressed bug #65159, Misleading configure help text for --with-mysql-sock 2013-07-21 23:12:54 -07:00
Veres Lajos b79b13b4ef less serious compatAbility fixes 2013-07-15 00:21:39 -07:00
Anatol Belski de82e7edf7 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
2013-05-15 11:14:58 +02:00
Anatol Belski 86db5fb4c2 Fix unitialized vars when sql.safe_mode=1
which can break the subsequent mysqlnd_connect() call
2013-05-15 11:12:17 +02:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Johannes Schlüter 82fb5df380 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-17 18:26:27 +02:00
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 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
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 4e19825281 - Year++ 2012-01-01 13:15:04 +00: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
Andrey Hristov f926a3c07d Move from directly referencing an aggregated structure to using a
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
2011-10-25 23:01:49 +00:00
Andrey Hristov efb68d9399 api_ext to reverse_api 2011-10-19 15:04:12 +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
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
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
Johannes Schlüter f90bead78a - 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 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
Johannes Schlüter 0d0e6cdb17 - 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 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