Alexander Nozdrin 2b0f6b5ace Manual merge from mysql-trunk-merge. ...

Conflicts:
  - mysql-test/suite/rpl/r/rpl_binlog_grant.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - mysql-test/suite/rpl/t/rpl_binlog_grant.test
  - sql/sql_parse.cc
  - sql/sql_table.cc
  - sql/sql_test.cc

2010-01-31 01:06:50 +03:00

236 KiB

Raw Blame History

View Raw