Remi Collet
784850211e
Reduce case where this test will fails:
...
- no connection AND no mysqli extension
So, will succeed when no configured connection, but mysqli available.
2012-12-03 15:32:52 +01:00
Anatoliy Belsky
f85ae48f4f
Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
...
There is a constant now which only is there when mysqli with
mysqlnd and pdo_mysql was compiled at the same time, or when
libmysql version > 50605. So checking for that dynamically,
will fail only if there is no mysqli and no connection.
2012-11-14 21:18:16 +01:00
Johannes Schlüter
44b1a07d85
Allow setting SHA256 auth public key as option
2012-10-31 16:54:11 +01:00
Johannes Schlüter
d21d909072
Merge branch 'PHP-5.4'
2012-10-26 14:23:22 +02:00
Johannes Schlüter
4f4d77805c
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/pdo_mysql/mysql_statement.c
2012-10-26 14:22:31 +02:00
ULF WENDEL
5d4c691e51
Merge branch 'PHP-5.4'
...
* PHP-5.4:
This won't make the test pass but now its at least one that shows no unnecessary error messages...
2012-10-26 12:32:39 +02:00
ULF WENDEL
056ecf3201
This won't make the test pass but now its at least one that shows no unnecessary error messages...
2012-10-26 12:32:10 +02:00
ULF WENDEL
b8595e1d40
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix for bug #62820
2012-10-23 15:14:45 +02:00
ULF WENDEL
0737be7e7b
Fix for bug #62820
2012-10-23 15:13:57 +02:00
ULF WENDEL
848780606d
Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests
2012-10-23 14:58:16 +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
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
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +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
75a2c0d715
Merge branch 'PHP-5.4'
2012-10-09 13:30:22 +08:00
Stanislav Malyshev
a3322f8927
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
Johannes Schlüter
21cbe30be3
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Remove extra ;
2012-06-22 17:33:38 +02:00
Johannes Schlüter
5e23a047ac
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove extra ;
2012-06-22 17:33:22 +02:00
Johannes Schlüter
a62d4e2c43
Remove extra ;
2012-06-22 17:32:46 +02:00
andrey
cd9e4d1def
Merge branch 'PHP-5.4'
2012-05-02 16:15:35 +02:00
andrey
67419499b2
Merge branch 'PHP-5.3' into PHP-5.4
2012-05-02 15:57:08 +02:00
andrey
b42d000471
Fix for bug#61411
...
Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the root cause of the problem and the crash at free.
2012-05-02 15:55:22 +02:00
Johannes Schlüter
d2718cb9ff
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Commit generated file
Fix bug #61755 parsing bug can lead to access violations
2012-04-19 12:49:47 +02:00
Johannes Schlüter
0589b19abf
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Commit generated file
Fix bug #61755 parsing bug can lead to access violations
Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
2012-04-19 12:47:47 +02:00
Johannes Schlüter
1b78aef426
Fix bug #61755 parsing bug can lead to access violations
2012-04-19 12:46:02 +02:00
Pierrick Charron
919085b822
Merge branch 'PHP-5.4'
2012-03-24 18:00:04 -04:00
Pierrick Charron
7f05a39fce
Merge branch 'PHP-5.3' into PHP-5.4
2012-03-24 17:59:46 -04:00
Pierrick Charron
da2da13f93
Remove unused variable
2012-03-24 17:49:58 -04:00
Johannes Schlüter
abd5670566
Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails
2012-03-06 01:43:49 +00:00
Johannes Schlüter
f36cc4f7c8
Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails
2012-03-06 01:43:49 +00:00
Johannes Schlüter
d796ebb0b5
Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails
2012-03-06 01:43:49 +00:00
Johannes Schlüter
dc0070e323
Fix bug #61194 PDO should export compression flag with myslqnd
2012-03-05 23:57:24 +00:00
Johannes Schlüter
048f1fa092
Fix bug #61194 PDO should export compression flag with myslqnd
2012-03-05 23:57:24 +00:00
Johannes Schlüter
46608a073c
Fix bug #61194 PDO should export compression flag with myslqnd
2012-03-05 23:57:24 +00:00
Johannes Schlüter
b526e0e410
Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work
2012-03-05 23:38:15 +00:00
Johannes Schlüter
5c896b344a
Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work
2012-03-05 23:38:15 +00:00
Johannes Schlüter
f666285805
Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work
2012-03-05 23:38:15 +00: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
Johannes Schlüter
6781f17575
- Fix bug #60155 (pdo_mysql.default_socket ignored).
2011-11-02 15:45:53 +00:00
Johannes Schlüter
539a0f3bd3
- Fix bug #60155 (pdo_mysql.default_socket ignored).
2011-11-02 15:45:53 +00:00
Johannes Schlüter
026445a0aa
- Fix bug #60155 (pdo_mysql.default_socket ignored).
2011-11-02 15:45:53 +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
