Commit 724f46c2 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-15185 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/handler.cc:
  Auto merged
parents 23331172 4e82e0af

sql/handler.cc

+25 −10
Original line number Diff line number Diff line
@@ -300,39 +300,56 @@ handler *get_new_handler(TABLE *table, MEM_ROOT *alloc, enum db_type db_type) 
  case DB_TYPE_HASH:

    return new (alloc) ha_hash(table);

#endif

  case DB_TYPE_MRG_MYISAM:

  case DB_TYPE_MRG_ISAM:

    return new (alloc) ha_myisammrg(table);

#ifdef HAVE_BERKELEY_DB

  case DB_TYPE_BERKELEY_DB:

    if (have_berkeley_db == SHOW_OPTION_YES)

      return new (alloc) ha_berkeley(table);

    return NULL;

#endif

#ifdef HAVE_INNOBASE_DB

  case DB_TYPE_INNODB:

    if (have_innodb == SHOW_OPTION_YES)

      return new (alloc) ha_innobase(table);

    return NULL;

#endif

#ifdef HAVE_EXAMPLE_DB

  case DB_TYPE_EXAMPLE_DB:

    if (have_example_db == SHOW_OPTION_YES)

      return new (alloc) ha_example(table);

    return NULL;

#endif

#if defined(HAVE_ARCHIVE_DB)

  case DB_TYPE_ARCHIVE_DB:

    if (have_archive_db == SHOW_OPTION_YES)

      return new (alloc) ha_archive(table);

    return NULL;

#endif

#ifdef HAVE_BLACKHOLE_DB

  case DB_TYPE_BLACKHOLE_DB:

    if (have_blackhole_db == SHOW_OPTION_YES)

      return new (alloc) ha_blackhole(table);

    return NULL;

#endif

#ifdef HAVE_FEDERATED_DB

  case DB_TYPE_FEDERATED_DB:

    if (have_federated_db == SHOW_OPTION_YES)

      return new (alloc) ha_federated(table);

    return NULL;

#endif

#ifdef HAVE_CSV_DB

  case DB_TYPE_CSV_DB:

    if (have_csv_db == SHOW_OPTION_YES)

      return new (alloc) ha_tina(table);

    return NULL;

#endif

#ifdef HAVE_NDBCLUSTER_DB

  case DB_TYPE_NDBCLUSTER:

    if (have_ndbcluster == SHOW_OPTION_YES)

      return new (alloc) ha_ndbcluster(table);

    return NULL;

#endif

  case DB_TYPE_HEAP:

    return new (alloc) ha_heap(table);
@@ -346,8 +363,6 @@ handler *get_new_handler(TABLE *table, MEM_ROOT *alloc, enum db_type db_type) 
  /* Fall back to MyISAM */

  case DB_TYPE_MYISAM:

    return new (alloc) ha_myisam(table);

  case DB_TYPE_MRG_MYISAM:

    return new (alloc) ha_myisammrg(table);

  }

}