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
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
Stanislav Malyshev
a226fcc15e
improve open_basedir handling
2011-09-06 19:51:35 +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
Ulf Wendel
1a53d78b0c
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
Stanislav Malyshev
22fbe247e3
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
Tjerk Anne Meesters
9582b62111
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
66b7705da2
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
67faaa1cae
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