diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-28 17:06:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-28 17:31:57 +0200 |
| commit | b1818dccf772e0fd495502c6dfc1600853e007d0 (patch) | |
| tree | d9c441c38681d634d50cf36021a3bf439b2e44ca /mysql-test/t/func_json.test | |
| parent | c34602995894c9a04f4312484cfe6e45c43426e6 (diff) | |
| parent | aafb9d44d65e42df72af28c940e5b23b4bc3bd43 (diff) | |
| download | mariadb-git-b1818dccf772e0fd495502c6dfc1600853e007d0.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/t/func_json.test')
| -rw-r--r-- | mysql-test/t/func_json.test | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/func_json.test b/mysql-test/t/func_json.test index 32c1b54b1e4..2669408fdce 100644 --- a/mysql-test/t/func_json.test +++ b/mysql-test/t/func_json.test @@ -398,7 +398,7 @@ drop table t1; select json_extract('{"test":8.437e-5}','$.test'); --echo # ---echo # Start of 10.3 tests +--echo # End of 10.2 tests --echo # --echo # @@ -420,3 +420,7 @@ SELECT --enable_ps_protocol --disable_metadata + +--echo # +--echo # End of 10.3 tests +--echo # |