diff options
| author | Andrey Hristov <andrey@php.net> | 2015-10-30 14:31:12 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | f7a445856dc6abcf7bca13377ea94ab474681874 (patch) | |
| tree | 356844cadfe2b5e8cf7f83ec0ccf9e76a16db659 /ext/mysqlnd/mysqlnd_ps.c | |
| parent | 280c834c49284eb0e5f284e1f24453dbeb0c8a79 (diff) | |
| download | php-git-f7a445856dc6abcf7bca13377ea94ab474681874.tar.gz | |
MNDR:
- pass connection closer and its context
- remove unused parameter
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 3f1bdb8597..59f600a2ee 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -168,8 +168,7 @@ MYSQLND_METHOD(mysqlnd_stmt, get_result)(MYSQLND_STMT * const s) /* Nothing to store for UPSERT/LOAD DATA*/ if (GET_CONNECTION_STATE(&conn->state) != CONN_FETCHING_DATA || stmt->state != MYSQLND_STMT_WAITING_USE_OR_STORE) { - SET_CLIENT_ERROR(conn->error_info, CR_COMMANDS_OUT_OF_SYNC, - UNKNOWN_SQLSTATE, mysqlnd_out_of_sync); + SET_CLIENT_ERROR(conn->error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE, mysqlnd_out_of_sync); DBG_RETURN(NULL); } @@ -1215,8 +1214,7 @@ MYSQLND_METHOD(mysqlnd_stmt, fetch)(MYSQLND_STMT * const s, zend_bool * const fe } DBG_INF_FMT("stmt=%lu", stmt->stmt_id); - if (!stmt->result || - stmt->state < MYSQLND_STMT_WAITING_USE_OR_STORE) { + if (!stmt->result || stmt->state < MYSQLND_STMT_WAITING_USE_OR_STORE) { SET_CLIENT_ERROR(stmt->error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE, mysqlnd_out_of_sync); DBG_ERR("command out of sync"); |