unknown 2efb657600 Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines ...

into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines


sql/lock.cc:
  Use local.
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/sql_update.cc:
  Manual merge.

2006-12-20 20:01:31 +04:00

39 KiB

Raw Blame History

View Raw