Commit d800227f authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push


sql/ha_ndbcluster.cc:
  Auto merged
parents 16328ca2 614fb882

mysql-test/r/ps_1general.result

+2 −7
Original line number Diff line number Diff line
@@ -323,17 +323,12 @@ execute stmt4; 
Engine	Support	Comment

MyISAM	YES/NO	Default engine as of MySQL 3.23 with great performance

MEMORY	YES/NO	Hash based, stored in memory, useful for temporary tables

HEAP	YES/NO	Alias for MEMORY

MERGE	YES/NO	Collection of identical MyISAM tables

MRG_MYISAM	YES/NO	Alias for MERGE

MRG_MYISAM	YES/NO	Collection of identical MyISAM tables

ISAM	YES/NO	Obsolete storage engine, now replaced by MyISAM

MRG_ISAM	YES/NO	Obsolete storage engine, now replaced by MERGE

InnoDB	YES/NO	Supports transactions, row-level locking, and foreign keys

INNOBASE	YES/NO	Alias for INNODB

BDB	YES/NO	Supports transactions and page-level locking

BERKELEYDB	YES/NO	Alias for BDB

BERKELEYDB	YES/NO	Supports transactions and page-level locking

NDBCLUSTER	YES/NO	Clustered, fault-tolerant, memory-based tables

NDB	YES/NO	Alias for NDBCLUSTER

EXAMPLE	YES/NO	Example storage engine

ARCHIVE	YES/NO	Archive storage engine

CSV	YES/NO	CSV storage engine

mysql-test/r/variables.result

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ Variable_name Value 
storage_engine	MEMORY

show global variables like 'storage_engine';

Variable_name	Value

storage_engine	MERGE

storage_engine	MRG_MYISAM

set GLOBAL query_cache_size=100000;

set GLOBAL myisam_max_sort_file_size=2000000;

show global variables like 'myisam_max_sort_file_size';

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. */