summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-05-02 17:23:36 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-05-02 17:23:36 +0200
commitb85aa20065504bdda4bc03c2bd7eb7de38865c5d (patch)
tree95bfad29754c859353d513502a621918f2b29048 /sql/mysqld.cc
parent8cda7ab6a211380d8c6d297181bca32b04f08ed7 (diff)
parentaba911542641c93553bad0307021983998042d69 (diff)
downloadmariadb-git-b85aa20065504bdda4bc03c2bd7eb7de38865c5d.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/mysqld.cc')
0 files changed, 0 insertions, 0 deletions