Commit 4aeb8434 authored by unknown's avatar unknown
Browse files

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

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
parents 97327cec a0a942fb

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=17

NDB_VERSION_BUILD=18

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/t/ndb_read_multi_range.test

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
-- source include/not_embedded.inc



--disable_warnings

DROP TABLE IF EXISTS t1, r1;

DROP TABLE IF EXISTS t1, t2, r1;

--enable_warnings



#

ndb/include/kernel/signaldata/DumpStateOrd.hpp

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ public: 
    LqhDumpAllScanRec = 2301,

    LqhDumpAllActiveScanRec = 2302,

    LqhDumpLcpState = 2303,

    LqhErrorInsert5042 = 2315,



    AccDumpOneScanRec = 2400,

    AccDumpAllScanRec = 2401,

    AccDumpAllActiveScanRec = 2402,

ndb/include/ndb_version.h.in

+3 −0
Original line number Diff line number Diff line
@@ -57,5 +57,8 @@ char ndb_version_string_buf[NDB_VERSION_STRING_BUF_SZ]; 
 */

/*#define NDB_VERSION_ID 0*/



#define NDBD_INCL_NODECONF_VERSION_4 MAKE_VERSION(4,1,17)

#define NDBD_INCL_NODECONF_VERSION_5 MAKE_VERSION(5,0,18)



#endif

ndb/src/kernel/blocks/ERROR_codes.txt

+9 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ Insert system error in GCP participant when receiving GCP_SAVEREQ. 
5007:

Delay GCP_SAVEREQ by 10 secs



7165: Delay INCL_NODE_REQ in starting node yeilding error in GCP_PREPARE



ERROR CODES FOR TESTING NODE FAILURE, LOCAL CHECKPOINT HANDLING:

-----------------------------------------------------------------
@@ -155,11 +157,15 @@ Insert node failure handling when receiving COMPLETEREQ. 
5006:

Insert node failure handling when receiving ABORTREQ.



5042:

As 5002, but with specified table (see DumpStateOrd)



These error code can be combined with error codes for testing time-out

handling in DBTC to ensure that node failures are also well handled in

time-out handling. They can also be used to test multiple node failure

handling.





ERROR CODES FOR TESTING TIME-OUT HANDLING IN DBLQH

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

5011:
@@ -198,6 +204,9 @@ Delay execution of ABORTREQ signal 2 seconds to generate time-out. 


8050: Send TCKEYREF is operation is non local



5100,5101: Drop ABORT req in primary replica

           Crash on "next" ABORT



ERROR CODES FOR TESTING TIME-OUT HANDLING IN DBTC

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

8040: