Skip to content

M
mariadb
Commit 1ed72f41 authored by unknown's avatar unknown
Browse files
Options

Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/marko/k/mysql-4.1


sql/mysqld.cc:
  Auto merged
parents 3c3ca269 767a49c7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7