summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-11-08 13:12:11 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-11-08 13:12:11 +0200
commit7c85a8d936b1a8bb82ff069f82f5ecf3ff2ab654 (patch)
tree454eb7f2a19960396cbca0c12ead8bc0b810d03c /sql/sql_derived.cc
parente6ab6c42522bd7b156f77f53969100a2b3893b38 (diff)
parent644ffdeb9290a5fc861ecd286a5af4388b4339ad (diff)
downloadmariadb-git-7c85a8d936b1a8bb82ff069f82f5ecf3ff2ab654.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_derived.cc')
0 files changed, 0 insertions, 0 deletions