diff options
| author | Anatol Belski <ab@php.net> | 2014-11-26 08:17:35 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-26 08:17:35 +0100 |
| commit | 3ca0ca1548324e8993e0707dfaf67a8cb58a0fb2 (patch) | |
| tree | ed14da274390f69bc4235a1f21121cfe8b370144 /ext/pdo_mysql | |
| parent | 4f3ac2cdbedf7a84d64bfee7405f0c023641a806 (diff) | |
| parent | 108b2c4bb993f7bd3855a801f71175fd65c6828a (diff) | |
| download | php-git-3ca0ca1548324e8993e0707dfaf67a8cb58a0fb2.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (102 commits)
fix dir separator in test
fix TS build
fix TS build
Better fix for bug #68446
Revert "Merge remote-tracking branch 'origin/PHP-5.6'"
Revert NEWS and set test to XFAIL
Revert "Fix bug #68446 (bug with constant defaults and type hints)"
Improved zend_hash_clean() and added new optimized zend_symtable_clean()
Use inline version of zval_ptr_dtor()
Added new optimized zend_array_destroy() function
Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h
fix REGISTER_NS_*_CONSTANT macros
Removed useless assert. EG(uninitialized_zval) can't be refcounted.
Use specialized destructors when types of zvals are known.
move tests into proper place
Improved assignment to object property
Reuse zend_assign_to_variable() in zend_std_write_property()
cleanup comments from svn/cvs era
fix dir separator in test
fork test for windows
...
Diffstat (limited to 'ext/pdo_mysql')
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt index 96489ef861..f809e02b11 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt @@ -49,7 +49,7 @@ MySQLPDOTest::skip(); } if ($label !== $value) { - printf("[%03d + 3] Returned value seems to be wrong (%d vs. %d charachters). Check manually\n", + printf("[%03d + 3] Returned value seems to be wrong (%d vs. %d characters). Check manually\n", $offset, strlen($label), strlen($value)); return false; } @@ -64,7 +64,7 @@ MySQLPDOTest::skip(); $ret = $stmt->fetch(PDO::FETCH_ASSOC); if ($ret['label'] !== $value) { - printf("[%03d + 3] Returned value seems to be wrong (%d vs. %d charachters). Check manually\n", + printf("[%03d + 3] Returned value seems to be wrong (%d vs. %d characters). Check manually\n", $offset, strlen($ret['label']), strlen($value)); return false; } |