• Luis Soares's avatar
    merge: 5.1 -> 5.1-rpl-merge · f7a24d72
    Luis Soares authored
    conflicts:
      Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
      Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
    f7a24d72
innodb_table_locks_func.result 1.01 KB