diff options
| author | Andrey Hristov <andrey@php.net> | 2016-03-16 10:47:27 +0100 | 
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2016-03-16 10:47:27 +0100 | 
| commit | 3a33ee63e83a412b679eb2d72c63beb0064a3b5b (patch) | |
| tree | c1b34bcbc55ffbbc1b3bad4fe2f43bdbfcdfde62 /ext/mysqlnd/mysqlnd_result.c | |
| parent | d45f478454c846adf15fa44d7c026e8b702694d2 (diff) | |
| parent | f2ab731a8c47d2988ddf0d61cb06c0f62e17ab19 (diff) | |
| download | php-git-3a33ee63e83a412b679eb2d72c63beb0064a3b5b.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index d649efcbb9..fa80ca1ca6 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -12,11 +12,11 @@    | obtain it through the world-wide-web, please send a note to          |    | license@php.net so we can mail you a copy immediately.               |    +----------------------------------------------------------------------+ -  | Authors: Andrey Hristov <andrey@mysql.com>                           | -  |          Ulf Wendel <uwendel@mysql.com>                              | -  |          Georg Richter <georg@mysql.com>                             | +  | Authors: Andrey Hristov <andrey@php.net>                             | +  |          Ulf Wendel <uw@php.net>                                     |    +----------------------------------------------------------------------+  */ +  #include "php.h"  #include "mysqlnd.h"  #include "mysqlnd_wireprotocol.h" | 
