diff options
| author | Xinchen Hui <laruence@php.net> | 2014-08-28 14:56:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-08-28 14:56:53 +0800 |
| commit | 697472e3e1347da644e67ccbf06fc4d851537adc (patch) | |
| tree | 938fe09c495c759b4c7cfb620dfb8717d5b7ebce /ext/mysql | |
| parent | de4282fa3e6c47aec15216b878d7d2e185621b01 (diff) | |
| parent | a4532f6d4d2c4f12f642abdc318dd7f38d105eca (diff) | |
| download | php-git-697472e3e1347da644e67ccbf06fc4d851537adc.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
Diffstat (limited to 'ext/mysql')
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 4b316b4526..424f923d78 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1372,7 +1372,7 @@ PHP_FUNCTION(mysql_client_encoding) PHP_FUNCTION(mysql_set_charset) { char *csname; - int csname_len; + size_t csname_len; php_mysql_conn *mysql; zval *mysql_link = NULL; |