Skip to content

M
MariaDB
Commit a694e132 authored by unknown's avatar unknown
Browse files
Options

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge


sql/mysqld.cc:
  Auto merged
parents 747855f9 5fafb662
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