summaryrefslogtreecommitdiff
path: root/libmariadb
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-04-21 11:45:00 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-04-21 11:45:00 +0300
commit4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68 (patch)
treeed6b2754116233ca8a39515c7ba06e09b2a8cdc8 /libmariadb
parent502b769561760f35d2b612ab984906c8a4bb9b51 (diff)
parentd104fe6f734df2aebe24b3e5e3dbc189a5302920 (diff)
downloadmariadb-git-4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68.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 b6f8883d9687936a50a7ed79bd9e5af2340efcc
+Subproject 03d983b287f8a1fe855cb5ed479a3f7ab4f922a