summaryrefslogtreecommitdiff
path: root/mysql-test/main/func_json.result
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2018-11-191-0/+20
|\
| * Merge 10.2 into 10.3Marko Mäkelä2018-11-191-0/+20
* | Merge 10.3 into 10.4Marko Mäkelä2018-10-051-0/+20
|\ \ | |/
| * Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-0/+20
* | Merge 10.3 into 10.4Marko Mäkelä2018-08-161-0/+30
|\ \ | |/
| * Merge branch '10.2' into 10.3Sergei Golubchik2018-08-121-0/+24
| * Merge 10.2 into 10.3Marko Mäkelä2018-08-031-0/+6
* | Merge remote-tracking branch 'origin/10.3' into 10.4Alexander Barkov2018-07-251-1/+14
|\ \ | |/
| * Merge remote-tracking branch 'origin/10.2' into 10.3Alexander Barkov2018-07-241-1/+14
* | Merge remote-tracking branch 'origin/10.3' into 10.4Alexander Barkov2018-07-031-0/+8
|\ \ | |/
| * Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-0/+8
* | MDEV-16351 JSON_OBJECT() treats hybrid functions with boolean arguments as nu...Alexander Barkov2018-05-311-0/+88
|/
* Create 'main' test directory and move 't' and 'r' thereMichael Widenius2018-03-291-0/+770