Commit 2ce04bdc authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/25492/my51-25492 

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


libmysqld/lib_sql.cc:
  Auto merged
parents bd36057b 2a480ced

There are no changes