Commit 47c727a1 authored by unknown's avatar unknown
Browse files

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

There are no changes