diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-09-30 12:59:45 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-09-30 12:59:45 +0800 |
| commit | df1a99d9a46dd2aa025ca92da0c1c12fa652467a (patch) | |
| tree | 28db795ebcffc25f6700ede114815c96f1d964a1 | |
| parent | 64990642cf6bac5fcb9d93ce4c9b859cc552f70e (diff) | |
| parent | 7b787ebbb6fca7340f3f7daa56889a747ff0ecf3 (diff) | |
| download | php-git-df1a99d9a46dd2aa025ca92da0c1c12fa652467a.tar.gz | |
Merge branch 'PHP-7.0' of git.php.net:/php-src 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); |