diff options
| author | Andrey Hristov <andrey@php.net> | 2015-09-30 09:02:11 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-09-30 09:03:35 +0200 |
| commit | 07a8e5ce37140690cd179d0c3ae034bd4ae718cd (patch) | |
| tree | 2465813152a0c38dd0ae827d098b02fd288959bc | |
| parent | 0c10e10ee891354a3e0413bf2542bb8e8f9a47e7 (diff) | |
| download | php-git-07a8e5ce37140690cd179d0c3ae034bd4ae718cd.tar.gz | |
Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't export it (for now).
| -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 91a7ee7682..e028d60ab0 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -798,7 +798,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); |