diff options
| author | Matteo Beccati <mbeccati@php.net> | 2015-01-05 12:11:46 +0100 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2015-01-05 12:11:46 +0100 |
| commit | 38f1b569c27eef4d7edaca1bd70230f330a12b97 (patch) | |
| tree | 84674e13a9d5be252c8f2e867e4dac1a89c92f30 | |
| parent | e372e037dd60d7c94b9edf49337a3a0273284e3a (diff) | |
| parent | ea1c0c56273c10362f33aa3270168f37a26c29d6 (diff) | |
| download | php-git-38f1b569c27eef4d7edaca1bd70230f330a12b97.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update test after fixing bug #68371
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt index 29b3c11f76..8cd028fc53 100644 --- a/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt @@ -50,6 +50,7 @@ MySQLPDOTest::skip(); PDO::MYSQL_ATTR_DIRECT_QUERY => 'PDO::MYSQL_ATTR_DIRECT_QUERY', PDO::MYSQL_ATTR_INIT_COMMAND => 'PDO::MYSQL_ATTR_INIT_COMMAND', + PDO::ATTR_EMULATE_PREPARES => 'PDO::ATTR_EMULATE_PREPARES', ); $defaults = array( @@ -163,19 +164,10 @@ MySQLPDOTest::skip(); ?> --EXPECTF-- [003] [TODO][CHANGEREQUEST] Please, lets not ignore invalid options and bail out! -[003a] Expecting default value for 'PDO::ATTR_EMULATE_PREPARES' of '1'/integer, getAttribute() reports setting ''/boolean [003a] Expecting default value for 'PDO::MYSQL_ATTR_INIT_COMMAND' of ''/string, getAttribute() reports setting ''/boolean - -Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this function: driver does not support that attribute in %s on line %d -[010] [TODO][CHANGEREQUEST] ATTR_EMULATE_PREPARES should be on - -Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this function: driver does not support that attribute in %s on line %d - -Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this function: driver does not support that attribute in %s on line %d [015] PDO::ATTR_EMULATE_PREPARES should be on [016] PDO::MYSQL_ATTR_DIRECT_QUERY should be on - -Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this function: driver does not support that attribute in %s on line %d +[017] PDO::ATTR_EMULATE_PREPARES should be off [018] PDO::MYSQL_ATTR_DIRECT_QUERY should be off [021] Execting '1'/boolean got ''/boolean' for options 'PDO::MYSQL_ATTR_LOCAL_INFILE' [023] Execting 'SET @a=1'/string got ''/boolean' for options 'PDO::MYSQL_ATTR_INIT_COMMAND' |