Skip to content

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

Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.0-merge 

into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.1


sql/sql_table.cc:
  Manual merge - use local.
parents eaa2d87b eeb8d4c8
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