• unknown's avatar
    Manually merged · 9d3ddf38
    unknown authored
    
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/archive.result:
      Auto merged
    mysql-test/r/auto_increment.result:
      Auto merged
    mysql-test/r/func_time.result:
      Auto merged
    mysql-test/r/ndb_lock.result:
      Auto merged
    mysql-test/r/rpl_log.result:
      Auto merged
    mysql-test/r/select.result:
      Auto merged
    mysql-test/t/archive.test:
      Auto merged
    mysql-test/t/auto_increment.test:
      Auto merged
    mysql-test/t/func_time.test:
      Auto merged
    mysql-test/t/ndb_lock.test:
      Auto merged
    mysql-test/t/rpl_log.test:
      Auto merged
    mysql-test/t/select.test:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/item_timefunc.h:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    tests/mysql_client_test.c:
      Auto merged
    9d3ddf38
ha_archive.cc 33.5 KB