Skip to content

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

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents f58e9f54 ae737d69
Show 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