summaryrefslogtreecommitdiff
path: root/storage/innobase/gis/gis0rtree.cc
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2020-01-17 00:46:40 +0300
committerSergei Petrunia <psergey@askmonty.org>2020-01-17 00:46:40 +0300
commite709eb9bf712006d070767629518f827cd2f6bed (patch)
tree103290899cbe2a67f78277e0e33486e51ef01717 /storage/innobase/gis/gis0rtree.cc
parentd531b4ee3a9bcd89a2fa6b49a2207eaf966f53e3 (diff)
parentb04429434ad1ee7f49d263762a560f4ff31dd111 (diff)
downloadmariadb-git-e709eb9bf712006d070767629518f827cd2f6bed.tar.gz
Merge branch '10.2' into 10.3
# Conflicts: # mysql-test/suite/galera/r/MW-388.result # mysql-test/suite/galera/t/MW-388.test # mysql-test/suite/innodb/r/truncate_inject.result # mysql-test/suite/innodb/t/truncate_inject.test # mysql-test/suite/rpl/r/rpl_stop_slave.result # mysql-test/suite/rpl/t/rpl_stop_slave.test # sql/sp_head.cc # sql/sp_head.h # sql/sql_lex.cc # sql/sql_yacc.yy # storage/xtradb/buf/buf0dblwr.cc
Diffstat (limited to 'storage/innobase/gis/gis0rtree.cc')
0 files changed, 0 insertions, 0 deletions