Commit 7a1cc524 authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  zim.(none):/home/brian/mysql/mysql-5.0


sql/ha_federated.cc:
  Auto merged
parents da0f9ece fa8fcecb

sql/examples/ha_archive.cc

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static HASH archive_open_tables; 
#define ARCHIVE_CHECK_HEADER 254 // The number we use to determine corruption



/* dummy handlerton - only to have something to return from archive_db_init */

static handlerton archive_hton = {

handlerton archive_hton = {

  "archive",

  0,       /* slot */

  0,       /* savepoint size. */

sql/examples/ha_example.cc

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
#include "ha_example.h"





static handlerton example_hton= {

handlerton example_hton= {

  "CSV",

  0,       /* slot */

  0,       /* savepoint size. */

sql/examples/ha_tina.cc

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ pthread_mutex_t tina_mutex; 
static HASH tina_open_tables;

static int tina_init= 0;



static handlerton tina_hton= {

handlerton tina_hton= {

  "CSV",

  0,       /* slot */

  0,       /* savepoint size. */

sql/ha_berkeley.cc

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int berkeley_close_connection(THD *thd); 
static int berkeley_commit(THD *thd, bool all);

static int berkeley_rollback(THD *thd, bool all);



static handlerton berkeley_hton = {

handlerton berkeley_hton = {

  "BerkeleyDB",

  0, /* slot */

  0, /* savepoint size */

sql/ha_blackhole.cc

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


/* Blackhole storage engine handlerton */



static handlerton blackhole_hton= {

handlerton blackhole_hton= {

  "BLACKHOLE",

  0,       /* slot */

  0,       /* savepoint size. */