• unknown's avatar
    merge · b631ea01
    unknown authored
    
    Docs/manual.texi:
      Auto merged
    mysql-test/t/rpl000013.test:
      Auto merged
    mysql-test/t/rpl000016.test:
      Auto merged
    extra/resolveip.c:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    b631ea01
manual.texi 1.94 MB