summaryrefslogtreecommitdiff
path: root/libmariadb
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-05-07 15:00:27 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-05-07 15:00:27 +0300
commit916b237b3f6ee4d8e113d480c53bca232cadbb7b (patch)
tree238054b502f633afcb88a3fb1929d860a7e96e91 /libmariadb
parenta04202673fe8f5a89a88e543e3e0f5b9de5215d2 (diff)
parent35977e81f967ebe10db8ee40703801e693b2a0f4 (diff)
downloadmariadb-git-916b237b3f6ee4d8e113d480c53bca232cadbb7b.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'libmariadb')
m---------libmariadb0
1 files changed, 0 insertions, 0 deletions
diff --git a/libmariadb b/libmariadb
-Subproject 03d983b287f8a1fe855cb5ed479a3f7ab4f922a
+Subproject 01ada4b85f15c1c5841082f92180bf129d89deb