diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-17 20:15:32 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-17 20:15:32 +0100 |
| commit | 7f51d73bb2aef3fb8b50b6a7e76ebb11f86813fa (patch) | |
| tree | abb31b78ec4ddef3c95f223bc58b1c632e526109 /ext/mysqlnd | |
| parent | db72160e5ac2b267b9ffa23ad84e62e609382a44 (diff) | |
| parent | e3b3e6812772f5739641d85a89855c085c32e17f (diff) | |
| download | php-git-7f51d73bb2aef3fb8b50b6a7e76ebb11f86813fa.tar.gz | |
Merge branch 'master' into integer_semantics
Diffstat (limited to 'ext/mysqlnd')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 74a8b721f2..20972f64be 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -2798,7 +2798,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const unsi smart_str_appendl(&tmp_str, "WITH CONSISTENT SNAPSHOT", sizeof("WITH CONSISTENT SNAPSHOT") - 1); } if (mode & (TRANS_START_READ_WRITE | TRANS_START_READ_ONLY)) { - unsigned long server_version = conn->m->get_server_version(conn TSRMLS_CC); + zend_ulong server_version = conn->m->get_server_version(conn TSRMLS_CC); if (server_version < 50605L) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "This server version doesn't support 'READ WRITE' and 'READ ONLY'. Minimum 5.6.5 is required"); smart_str_free(&tmp_str); |