• unknown's avatar
    Finish the merge of the patch for bug #15195 from 4.1 -> 5.0 · 93eef69d
    unknown authored
    - Adapt it to work with the handlerton class
    
    
    sql/handler.cc:
      Only create new MERGE handler if merge engine is enabled
    sql/mysql_priv.h:
      Use the myisammrg_hton.state field for the have_merge_db option
    sql/mysqld.cc:
      Handle the OPT_MERGE (--skip-merge) option case
    93eef69d
mysqld.cc 271 KB