• unknown's avatar
    Merge of recent MyISAM changes into Maria. Testsuite passes as much · 0a1dc8af
    unknown authored
    as in the main 5.1 (partition and ndb_alter_table fail).
    
    
    mysql-test/r/maria.result:
      merge from MyISAM
    mysql-test/r/ps_maria.result:
      merge from MyISAM
    mysql-test/t/maria.test:
      merge from MyISAM
    sql/mysql_priv.h:
      fix after wrong merge
    sql/mysqld.cc:
      fix after wrong merge
    sql/set_var.cc:
      adding _db like other engines have
    storage/maria/Makefile.am:
      merge from MyISAM
    storage/maria/ha_maria.cc:
      merge from MyISAM
    storage/maria/ha_maria.h:
      merge from MyISAM
    storage/maria/ma_check.c:
      merge from MyISAM
    storage/maria/ma_delete.c:
      merge from MyISAM
    storage/maria/ma_init.c:
      maria_inited should rather be my_bool
    storage/maria/ma_locking.c:
      merge from MyISAM
    storage/maria/ma_packrec.c:
      merge from MyISAM
    storage/maria/ma_panic.c:
      maria_panic() should not take mutex if engine has not been inited.
    storage/maria/ma_rkey.c:
      merge from MyISAM
    storage/maria/ma_write.c:
      merge from MyISAM
    storage/maria/maria_def.h:
      merge from MyISAM. maria_inited is needed for maria_panic().
    storage/maria/maria_ftdump.c:
      merge from MyISAM
    0a1dc8af
set_var.cc 129 KB