diff options
| author | Nikita Popov <nikic@php.net> | 2016-02-13 15:21:16 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-02-13 15:21:16 +0100 |
| commit | 70c8db08c6a4882898bc347a8ab1f9205f4e8467 (patch) | |
| tree | f9f46976a285b7fe2b238665953e5b2512b65347 /ext/pdo_mysql | |
| parent | ccc06e252bdf4c54cb2c96dbcab9a2aeb933181c (diff) | |
| parent | bc419fee5c9704eb4ce338acacbc2380c6f4427d (diff) | |
| download | php-git-70c8db08c6a4882898bc347a8ab1f9205f4e8467.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/pdo_mysql/mysql_driver.c
Diffstat (limited to 'ext/pdo_mysql')
| -rw-r--r-- | ext/pdo_mysql/tests/bug71569.phpt | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/ext/pdo_mysql/tests/bug71569.phpt b/ext/pdo_mysql/tests/bug71569.phpt new file mode 100644 index 0000000000..3ace1e98bf --- /dev/null +++ b/ext/pdo_mysql/tests/bug71569.phpt @@ -0,0 +1,23 @@ +--TEST-- +Bug #70389 (PDO constructor changes unrelated variables) +--SKIPIF-- +<?php +require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc'); +require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); +MySQLPDOTest::skip(); +?> +--FILE-- +<?php +require(dirname(__FILE__). DIRECTORY_SEPARATOR . 'config.inc'); + +try { + new PDO(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, [ + PDO::MYSQL_ATTR_INIT_COMMAND => null, + ]); +} catch (PDOException $e) { + echo $e->getMessage(); +} + +?> +--EXPECT-- +SQLSTATE[42000] [1065] Query was empty |