diff options
| author | Andrey Hristov <andrey@php.net> | 2012-10-31 18:29:31 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2012-10-31 18:29:31 +0100 |
| commit | 965bd32fec803c4ca20157c621ee663dccfaeb29 (patch) | |
| tree | 2fa278250976edf9e2f5074c0a416407f132522f | |
| parent | 7886f46b560c51f235da35a33c8cd0e6479c9360 (diff) | |
| parent | a17559d4224eea0148ad67de9bb1cca22cbef7f6 (diff) | |
| download | php-git-965bd32fec803c4ca20157c621ee663dccfaeb29.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index ce94ad8d8e..face502cd6 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -1201,7 +1201,7 @@ php_mysqlnd_rset_field_read(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC) p += 2; BAIL_IF_NO_MORE_DATA; - meta->decimals = uint2korr(p); + meta->decimals = uint1korr(p); p += 1; BAIL_IF_NO_MORE_DATA; |