1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Commit Graph

661 Commits

Author SHA1 Message Date
Stanislav Malyshev a2d8ae9a1f fix mysql tests & mark nextRowset problematic tests 2013-08-24 23:56:48 -07:00
Christopher Jones c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text.
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Stanislav Malyshev c793a65690 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos 8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Stanislav Malyshev b8d4a6939e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
2013-07-21 23:14:42 -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
Veres Lajos 227556c6a2 less serious compatAbility fixes 2013-07-15 00:17:35 -07:00
Andrey Hristov 378a5f9bfe updates 2013-05-21 13:27:45 +02:00
Anatol Belski 077b575d51 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
2013-05-15 11:17:18 +02: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
Nikita Popov 4633e07e29 Fix mysql_list_fields.phpt test
The minimum length is given in bytes, so it is charset dependent.
For utf8 charsets for example it's 3 rather than 1.
2013-03-24 17:07:16 +01:00
Nikita Popov aa2b54812f Fix version check in test 2013-03-24 13:58:35 +01:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08: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
Adam Harvey b7091aaf01 Deprecate ext/mysql.
Per https://wiki.php.net/rfc/mysql_deprecation, connecting to a MySQL database
via ext/mysql now generates an E_DEPRECATED error. This commit includes the
minimal EXPECTF updates required for the test suite to pass: it may be
preferable to refactor some of the tests to suppress deprecation errors in
situations where no other error is expected from mysql_[p]connect(), but I'm
not enough of a MySQL expert to want to get my hands that dirty in a long
standing test suite.
2012-12-10 22:12:09 +08:00
ULF WENDEL e7fc671dc0 Deprecating undocumented function alias, related to bug #63295 2012-10-23 12:02:58 +02:00
Johannes Schlüter 36e60436db Merge branch 'PHP-5.4' 2012-10-17 18:27:03 +02: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 ccf749e38d Merge branch 'PHP-5.4'
* PHP-5.4:
  - BFN
  Minor changes for MySQL 5.6
  NEWS for 76601c4
2012-09-29 12:21:55 +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 4e5e8c9da0 Merge branch 'PHP-5.4' 2012-10-10 10:45:34 +08:00
Xinchen Hui 4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Xinchen Hui 460d258e57 Merge branch 'PHP-5.4' 2012-08-21 22:19:23 +08: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 8775a37559 - 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 845d8fa10c 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 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
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
Tjerk Anne Meesters 7b1790bdfb 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 f40fd8236e 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