• Alexander Nozdrin's avatar
    Manual merge from mysql-5.1-bugteam. · 4b70e544
    Alexander Nozdrin authored
    Conflicts:
      - mysql-test/collections/default.experimental
      - 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
      - mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
    4b70e544
mysqldump.c 157 KB