Commit c1d6b29c authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/psergey/mysql-5.0-bug8490-2
parents 1bfb1070 c153e612

mysql-test/r/create.result

+4 −4
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ drop table if exists t1; 
SET SESSION storage_engine="heap";

SELECT @@storage_engine;

@@storage_engine

HEAP

MEMORY

CREATE TABLE t1 (a int not null);

show create table t1;

Table	Create Table
@@ -222,7 +222,7 @@ SET SESSION storage_engine="gemini"; 
ERROR 42000: Unknown table engine 'gemini'

SELECT @@storage_engine;

@@storage_engine

HEAP

MEMORY

CREATE TABLE t1 (a int not null);

show create table t1;

Table	Create Table
@@ -371,7 +371,7 @@ drop database mysqltest; 
SET SESSION storage_engine="heap";

SELECT @@storage_engine;

@@storage_engine

HEAP

MEMORY

CREATE TABLE t1 (a int not null);

show create table t1;

Table	Create Table
@@ -383,7 +383,7 @@ SET SESSION storage_engine="gemini"; 
ERROR 42000: Unknown table engine 'gemini'

SELECT @@storage_engine;

@@storage_engine

HEAP

MEMORY

CREATE TABLE t1 (a int not null);

show create table t1;

Table	Create Table

mysql-test/r/ps_1general.result

+1 −1
Original line number Diff line number Diff line
@@ -322,8 +322,8 @@ prepare stmt4 from ' show storage engines '; 
execute stmt4;

Engine	Support	Comment

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

HEAP	YES/NO	Alias for MEMORY

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

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

mysql-test/r/variables.result

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ timed_mutexes OFF 
set storage_engine=MYISAM, storage_engine="HEAP", global storage_engine="MERGE";

show local variables like 'storage_engine';

Variable_name	Value

storage_engine	HEAP

storage_engine	MEMORY

show global variables like 'storage_engine';

Variable_name	Value

storage_engine	MERGE
@@ -254,7 +254,7 @@ set storage_engine=MERGE, big_tables=2; 
ERROR 42000: Variable 'big_tables' can't be set to the value of '2'

show local variables like 'storage_engine';

Variable_name	Value

storage_engine	HEAP

storage_engine	MEMORY

set SESSION query_cache_size=10000;

ERROR HY000: Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL

set GLOBAL storage_engine=DEFAULT;

ndb/src/kernel/blocks/ERROR_codes.txt

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Next DBTC 8035 
Next CMVMI 9000

Next BACKUP 10022

Next DBUTIL 11002

Next DBTUX 12007

Next DBTUX 12008

Next SUMA 13001



TESTING NODE FAILURE, ARBITRATION
@@ -443,6 +443,7 @@ Test routing of signals: 


Ordered index:

--------------

12007: Make next alloc node fail with no memory error



Dbdict:

-------

ndb/src/kernel/blocks/dbtup/Dbtup.hpp

+8 −0
Original line number Diff line number Diff line
@@ -1779,6 +1779,10 @@ private: 
                                Operationrec* const regOperPtr,

                                Tablerec* const regTabPtr);



  int addTuxEntries(Signal* signal,

                    Operationrec* regOperPtr,

                    Tablerec* regTabPtr);



  // these crash the node on error



  void executeTuxCommitTriggers(Signal* signal,
@@ -1789,6 +1793,10 @@ private: 
                               Operationrec* regOperPtr,

                               Tablerec* const regTabPtr);



  void removeTuxEntries(Signal* signal,

                        Operationrec* regOperPtr,

                        Tablerec* regTabPtr);



// *****************************************************************

// Error Handling routines.

// *****************************************************************