summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-08-04 09:32:40 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-08-04 09:32:40 +0200
commita346a5613ee7c0b17b0b4ce377659c996ef6bb75 (patch)
treeff3b930cee6a102898f052298241f14044da8a31 /sql/sql_derived.cc
parentd85d6c9c416aab85f1ded344a5b870d4cc56f9f6 (diff)
parentd2a19082c03485c69157c7b1e040f2806eb2e153 (diff)
downloadmariadb-git-a346a5613ee7c0b17b0b4ce377659c996ef6bb75.tar.gz
Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.32
Includes Percona XtraDB and TokuDB 5.6.36-82.1
Diffstat (limited to 'sql/sql_derived.cc')
0 files changed, 0 insertions, 0 deletions