• unknown's avatar
    Merge · 579c84f1
    unknown authored
    
    mysql-test/r/lock.result:
      Auto merged
    mysql-test/r/rpl_log.result:
      Auto merged
    mysql-test/t/lock.test:
      Auto merged
    mysql-test/r/rpl_rotate_logs.result:
      SCCS merged
    sql/sql_parse.cc:
      SCCS merged
    sql/sql_repl.cc:
      SCCS merged
    579c84f1
lock.result 2.2 KB