diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2016-07-03 22:42:10 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2016-07-03 22:42:10 -0500 |
| commit | d9a9cf8ecaef891b2369969e9efe9f6261359158 (patch) | |
| tree | 04bcc83b3c9be1924007e007e1f508f7229af7ab /ext/mysqli/mysqli_nonapi.c | |
| parent | 583386d59e6b362fe49e51594718a109d0c0cc2f (diff) | |
| parent | c2b29a58bc0916e248ba2584564558097b16b51f (diff) | |
| download | php-git-d9a9cf8ecaef891b2369969e9efe9f6261359158.tar.gz | |
Merge branch 'master' into iterable
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 49db7bbfe6..e3efca25c6 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -156,7 +156,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne } else { mysql->persistent = persistent = TRUE; - hash_key = strpprintf(0, "mysqli_%s_%s%ld%s%s%s", SAFE_STR(hostname), SAFE_STR(socket), + hash_key = strpprintf(0, "mysqli_%s_%s" ZEND_LONG_FMT "%s%s%s", SAFE_STR(hostname), SAFE_STR(socket), port, SAFE_STR(username), SAFE_STR(dbname), SAFE_STR(passwd)); @@ -202,14 +202,14 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne } } if (MyG(max_links) != -1 && MyG(num_links) >= MyG(max_links)) { - php_error_docref(NULL, E_WARNING, "Too many open links (%pd)", MyG(num_links)); + php_error_docref(NULL, E_WARNING, "Too many open links (" ZEND_LONG_FMT ")", MyG(num_links)); goto err; } if (persistent && MyG(max_persistent) != -1 && (MyG(num_active_persistent) + MyG(num_inactive_persistent))>= MyG(max_persistent)) { - php_error_docref(NULL, E_WARNING, "Too many open persistent links (%pd)", + php_error_docref(NULL, E_WARNING, "Too many open persistent links (" ZEND_LONG_FMT ")", MyG(num_active_persistent) + MyG(num_inactive_persistent)); goto err; } @@ -1088,7 +1088,7 @@ PHP_FUNCTION(mysqli_begin_transaction) } MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); if (flags < 0) { - php_error_docref(NULL, E_WARNING, "Invalid value for parameter flags (%pd)", flags); + php_error_docref(NULL, E_WARNING, "Invalid value for parameter flags (" ZEND_LONG_FMT ")", flags); err = TRUE; } if (!name_len) { |