diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-01-08 15:21:41 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-01-08 15:21:41 +0100 |
| commit | c41291feb9d8b713684331307147bbaef43bc22a (patch) | |
| tree | b37ea7740e55ff310eaffc2af2fa0797cd35002c | |
| parent | f566b4d32183032663ecb35895c0dafd8e051853 (diff) | |
| parent | 56dd1e30f5828187cdec09570ac4c3ddc37d9656 (diff) | |
| download | php-git-c41291feb9d8b713684331307147bbaef43bc22a.tar.gz | |
Merge branch 'master' of git.php.net:php-src
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/mysqli/tests/057.phpt | 4 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 1 |
3 files changed, 4 insertions, 2 deletions
@@ -1,5 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +<<<<<<< HEAD ?? ??? 201?, PHP 5.6.0 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>> diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt index 2cb887506a..7c7e2b7568 100644 --- a/ext/mysqli/tests/057.phpt +++ b/ext/mysqli/tests/057.phpt @@ -35,8 +35,8 @@ require_once('skipifconnectfailure.inc'); var_dump(mysqli_stmt_reset($stmt)); var_dump($stmt = mysqli_prepare($link, "SELECT * FROM test_store_result")); - if ($IS_MYSQLND && $stmt->affected_rows !== -1) - printf("[001] Expecting -1, got %d\n", $stmt->affected_rows); + if ($stmt->affected_rows !== 0) + printf("[001] Expecting 0, got %d\n", $stmt->affected_rows); var_dump(mysqli_stmt_execute($stmt)); var_dump($stmt = @mysqli_prepare($link, "SELECT * FROM test_store_result"), mysqli_error($link)); diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 134be5fc53..4916c0650d 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -307,6 +307,7 @@ mysqlnd_stmt_read_prepare_response(MYSQLND_STMT * s TSRMLS_DC) stmt->warning_count = stmt->conn->upsert_status->warning_count = prepare_resp->warning_count; stmt->field_count = stmt->conn->field_count = prepare_resp->field_count; stmt->param_count = prepare_resp->param_count; + stmt->upsert_status->affected_rows = 0; /* be like libmysql */ done: PACKET_FREE(prepare_resp); |