Skip to content

M
mariadb
Commit 7f5bf01c authored by unknown's avatar unknown
Browse files
Options

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged
parents 309b7b16 bc8d42f9
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