summaryrefslogtreecommitdiff
path: root/mysql-test/main/func_json.test
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2018-11-191-0/+18
* Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-0/+20
* Merge branch '10.2' into 10.3Sergei Golubchik2018-08-121-0/+18
* Merge 10.2 into 10.3Marko Mäkelä2018-08-031-0/+6
* Merge remote-tracking branch 'origin/10.2' into 10.3Alexander Barkov2018-07-241-0/+10
* Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-0/+15
* Create 'main' test directory and move 't' and 'r' thereMichael Widenius2018-03-291-0/+426