• unknown's avatar
    Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria · 1ec645bd
    unknown authored
    into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-logpurge
    
    
    mysql-test/r/maria.result:
      Auto merged
    storage/maria/ma_checkpoint.c:
      Auto merged
    storage/maria/ma_recovery.c:
      Auto merged
    storage/maria/ha_maria.cc:
      Merge
    storage/maria/ma_loghandler.c:
      Merge
    storage/maria/ma_loghandler.h:
      Merge
    1ec645bd
maria.result 70.4 KB