Alexander Nozdrin 69cfd5c8ec Manual merge from mysql-trunk. ...

Conflicts:
  - client/mysqltest.cc
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/t/disabled.def
  - sql/mysqld.cc
  - sql/opt_range.cc
  - sql/sp.cc
  - sql/sql_acl.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc

2009-12-11 12:39:38 +03:00

17 KiB

Raw Blame History

View Raw