diff options
| author | Andrey Hristov <andrey@php.net> | 2015-09-30 09:04:00 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-09-30 09:04:00 +0200 |
| commit | 7b787ebbb6fca7340f3f7daa56889a747ff0ecf3 (patch) | |
| tree | 7f1023adca53f09f79a728cd124333176e3e6d44 | |
| parent | 11baa1b672718c11636b601a3dc8b45be09fb088 (diff) | |
| parent | 07a8e5ce37140690cd179d0c3ae034bd4ae718cd (diff) | |
| download | php-git-7b787ebbb6fca7340f3f7daa56889a747ff0ecf3.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | ext/mysqli/mysqli.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 1c933d9ca4..ff1638d7d5 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -801,7 +801,9 @@ PHP_MINIT_FUNCTION(mysqli) REGISTER_LONG_CONSTANT("MYSQLI_TYPE_CHAR", FIELD_TYPE_CHAR, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_INTERVAL", FIELD_TYPE_INTERVAL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_GEOMETRY", FIELD_TYPE_GEOMETRY, CONST_CS | CONST_PERSISTENT); - +#ifdef FIELD_TYPE_JSON + REGISTER_LONG_CONSTANT("MYSQLI_TYPE_JSON", FIELD_TYPE_JSON, CONST_CS | CONST_PERSISTENT); +#endif #if MYSQL_VERSION_ID > 50002 || defined(MYSQLI_USE_MYSQLND) REGISTER_LONG_CONSTANT("MYSQLI_TYPE_NEWDECIMAL", FIELD_TYPE_NEWDECIMAL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_BIT", FIELD_TYPE_BIT, CONST_CS | CONST_PERSISTENT); |