• unknown's avatar
    Merge of Myisam changes into Maria. · 4535e559
    unknown authored
    First step: ha_maria moves to storage/maria.
    
    
    BitKeeper/deleted/.del-ft_maria.c:
      Delete: storage/maria/ft_maria.c
    storage/maria/ha_maria.h:
      Rename: sql/ha_maria.h -> storage/maria/ha_maria.h
    storage/maria/ha_maria.cc:
      Rename: sql/ha_maria.cc -> storage/maria/ha_maria.cc
    libmysqld/Makefile.am:
      ha_maria moves to other dir (like myisam has)
    sql/Makefile.am:
      ha_maria moves to other dir (like myisam has)
    sql/mysqld.cc:
      ha_maria moves to other dir (like myisam has)
    storage/maria/Makefile.am:
      I delete ft_maria.c like ft_myisam.c has
    storage/maria/ma_test_all.sh:
      -l option is removed (no MyISAM log in Maria), maria_log is removed too.
    4535e559
mysqld.cc 302 KB