diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-16 11:22:43 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-16 11:22:43 +0200 |
| commit | f684553c2cc6f717447f1bbd69b09ebcd6973dfa (patch) | |
| tree | af84ff9a8ca4a44dcd4ee336f0acb0391645b1be /ext/mysqlnd | |
| parent | 0a2fd0db3cb57a567954c55e6607cf2102eb91ce (diff) | |
| parent | a1c1736bfb88d006542dc9bcc10d7101617517a6 (diff) | |
| download | php-git-f684553c2cc6f717447f1bbd69b09ebcd6973dfa.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix MySQL local infile / attr handling on big endian systems
Diffstat (limited to 'ext/mysqlnd')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 5207c1b506..de4e19a402 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -1798,8 +1798,8 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_set)(MYSQLND_STMT * const s, break; } case STMT_ATTR_CURSOR_TYPE: { - unsigned int ival = *(unsigned int *) value; - if (ival > (zend_ulong) CURSOR_TYPE_READ_ONLY) { + unsigned long ival = *(unsigned long *) value; + if (ival > (unsigned long) CURSOR_TYPE_READ_ONLY) { SET_CLIENT_ERROR(stmt->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "Not implemented"); DBG_INF("FAIL"); DBG_RETURN(FAIL); @@ -1808,7 +1808,7 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_set)(MYSQLND_STMT * const s, break; } case STMT_ATTR_PREFETCH_ROWS: { - unsigned int ival = *(unsigned int *) value; + unsigned long ival = *(unsigned long *) value; if (ival == 0) { ival = MYSQLND_DEFAULT_PREFETCH_ROWS; } else if (ival > 1) { @@ -1847,10 +1847,10 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_get)(const MYSQLND_STMT * const s, *(zend_bool *) value= stmt->update_max_length; break; case STMT_ATTR_CURSOR_TYPE: - *(zend_ulong *) value= stmt->flags; + *(unsigned long *) value= stmt->flags; break; case STMT_ATTR_PREFETCH_ROWS: - *(zend_ulong *) value= stmt->prefetch_rows; + *(unsigned long *) value= stmt->prefetch_rows; break; default: DBG_RETURN(FAIL); |