diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
| commit | 01554bf3e417f13baf7af874e449c265c0309279 (patch) | |
| tree | 8aca46ab27a54cea34c14001af774942f0502e39 /ext/mysqli | |
| parent | 65c8edd525108f6598a8bb25fb3c5d6c80233322 (diff) | |
| parent | 719083bd943e6c287c2dcb47918cf51f89a4ac08 (diff) | |
| download | php-git-01554bf3e417f13baf7af874e449c265c0309279.tar.gz | |
Merge branch 'master' into zppFailOnOverflow
Diffstat (limited to 'ext/mysqli')
4 files changed, 8 insertions, 8 deletions
diff --git a/ext/mysqli/tests/mysqli_ps_select_union.phpt b/ext/mysqli/tests/mysqli_ps_select_union.phpt index fed81b309d..a4659c4267 100644 --- a/ext/mysqli/tests/mysqli_ps_select_union.phpt +++ b/ext/mysqli/tests/mysqli_ps_select_union.phpt @@ -44,8 +44,8 @@ require_once('skipifconnectfailure.inc'); if ($IS_MYSQLND) { /* Advantage mysqlnd - - The metadata mysqlnd has availabe after prepare is better than - the one made availabe by the MySQL Client Library (libmysql). + The metadata mysqlnd has available after prepare is better than + the one made available by the MySQL Client Library (libmysql). "libmysql" will give wrong results and that is OK - http://bugs.mysql.com/bug.php?id=47483 */ diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt index 9b5d476ac4..e009267754 100644 --- a/ext/mysqli/tests/mysqli_result_references.phpt +++ b/ext/mysqli/tests/mysqli_result_references.phpt @@ -19,7 +19,7 @@ require_once('skipifconnectfailure.inc'); $idx = 0; while ($row = mysqli_fetch_assoc($res)) { - /* mysqlnd: force seperation - create copies */ + /* mysqlnd: force separation - create copies */ $references[$idx] = array( 'id' => &$row['id'], 'label' => $row['label'] . ''); @@ -30,7 +30,7 @@ require_once('skipifconnectfailure.inc'); mysqli_data_seek($res, 0); while ($row = mysqli_fetch_assoc($res)) { - /* mysqlnd: force seperation - create copies */ + /* mysqlnd: force separation - create copies */ $references[$idx] = array( 'id' => &$row['id'], 'label' => $row['label'] . ''); @@ -48,7 +48,7 @@ require_once('skipifconnectfailure.inc'); printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); while ($row = mysqli_fetch_assoc($res)) { - /* mysqlnd: force seperation - create copies*/ + /* mysqlnd: force separation - create copies*/ $references[$idx] = array( 'id' => &$row['id'], 'label' => $row['label'] . ''); diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt index 3935365257..60c5491b54 100644 --- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt @@ -48,7 +48,7 @@ if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) $references[$idx]['row_copy'] = $rows[$i]; $references[$idx]['id_ref'] = &$rows[$i]['id']; $references[$idx]['id_copy'] = $rows[$i]['id']; - /* enforce seperation */ + /* enforce separation */ $references[$idx]['id_copy_mod']= $rows[$i]['id'] + 0; } mysqli_free_result($res); diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt index 03d15902af..e7bce112af 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt @@ -21,9 +21,9 @@ require_once('skipifconnectfailure.inc'); echo "Test 1:\n"; $stmt = $link->prepare("SELECT ? FOO"); - var_dump($foo); // here you can see the bar member var beeing a string + var_dump($foo); // here you can see the bar member var being a string $stmt->bind_param("s", $foo->bar); - var_dump($foo); // this will show $foo->bar beeing a reference string + var_dump($foo); // this will show $foo->bar being a reference string $stmt->bind_result($one); $stmt->execute(); $stmt->fetch(); |