Commit 8945183f authored by mskold/marty@linux.site's avatar mskold/marty@linux.site
Browse files

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
parents c41a4472 ad88a849

mysql-test/r/ndb_backup_print.result

0 → 100644
+64 −0
Original line number Diff line number Diff line 
use test;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;

Connected to Management Server at: :

Waiting for completed, this may take several minutes

Backup  started from node 

Backup  started from node  completed

 StartGCP:  StopGCP: 

 #Records:  #LogRecords: 

 Data:  bytes Log:  bytes

create table t1

(pk int key

,a1 BIT(1), a2 BIT(5), a3 BIT(33), a4 BIT(63), a5 BIT(64)

,b1 TINYINT, b2 TINYINT UNSIGNED

,c1 SMALLINT, c2 SMALLINT UNSIGNED

,d1 INT, d2 INT UNSIGNED

,e1 BIGINT, e2 BIGINT UNSIGNED

,f1 CHAR(1) BINARY, f2 CHAR(32) BINARY, f3 CHAR(255) BINARY

,g1 VARCHAR(32) BINARY, g2 VARCHAR(255) BINARY, g3 VARCHAR(1000) BINARY

,h1 BINARY(1), h2 BINARY(8), h3 BINARY(255)

,i1 VARBINARY(32), i2 VARBINARY(255), i3 VARBINARY(1000)

) engine ndb;

insert into t1 values

(1

,0x1, 0x17, 0x789a, 0x789abcde, 0xfedc0001

,127, 255

,32767, 65535

,2147483647, 4294967295

,9223372036854775807, 18446744073709551615

,'1','12345678901234567890123456789012','123456789'

  ,'1','12345678901234567890123456789012','123456789'

  ,0x12,0x123456789abcdef0, 0x012345

,0x12,0x123456789abcdef0, 0x00123450

);

insert into t1 values

(2

,0, 0, 0, 0, 0

,-128, 0

,-32768, 0

,-2147483648, 0

,-9223372036854775808, 0

,'','',''

  ,'','',''

  ,0x0,0x0,0x0

,0x0,0x0,0x0

);

insert into t1 values

(3

,NULL,NULL,NULL,NULL,NULL

,NULL,NULL

,NULL,NULL

,NULL,NULL

,NULL,NULL

,NULL,NULL,NULL

,NULL,NULL,NULL

,NULL,NULL,NULL

,NULL,NULL,NULL

);

Connected to Management Server at: :

Waiting for completed, this may take several minutes

Backup  started from node 

Backup  started from node  completed

 StartGCP:  StopGCP: 

 #Records:  #LogRecords: 

 Data:  bytes Log:  bytes

mysql-test/t/ndb_backup_print.test

0 → 100644
+66 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/ndb_default_cluster.inc

-- source include/not_embedded.inc



--disable_warnings

use test;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;

--enable_warnings



#NO.1 test output of backup

--exec $NDB_TOOLS_DIR/../src/mgmclient/ndb_mgm -e "start backup" |sed -e 's/[0-9]//g' |sed -e 's/localhost//g' |sed -e 's/\.\.\.*//g'



create table t1

 (pk int key

  ,a1 BIT(1), a2 BIT(5), a3 BIT(33), a4 BIT(63), a5 BIT(64)

  ,b1 TINYINT, b2 TINYINT UNSIGNED

  ,c1 SMALLINT, c2 SMALLINT UNSIGNED

  ,d1 INT, d2 INT UNSIGNED

  ,e1 BIGINT, e2 BIGINT UNSIGNED

  ,f1 CHAR(1) BINARY, f2 CHAR(32) BINARY, f3 CHAR(255) BINARY

  ,g1 VARCHAR(32) BINARY, g2 VARCHAR(255) BINARY, g3 VARCHAR(1000) BINARY

  ,h1 BINARY(1), h2 BINARY(8), h3 BINARY(255)

  ,i1 VARBINARY(32), i2 VARBINARY(255), i3 VARBINARY(1000)

 ) engine ndb;



insert into t1 values

 (1

  ,0x1, 0x17, 0x789a, 0x789abcde, 0xfedc0001

  ,127, 255

  ,32767, 65535

  ,2147483647, 4294967295

  ,9223372036854775807, 18446744073709551615

  ,'1','12345678901234567890123456789012','123456789'

  ,'1','12345678901234567890123456789012','123456789'

  ,0x12,0x123456789abcdef0, 0x012345

  ,0x12,0x123456789abcdef0, 0x00123450

 );



insert into t1 values

 (2

  ,0, 0, 0, 0, 0

  ,-128, 0

  ,-32768, 0

  ,-2147483648, 0

  ,-9223372036854775808, 0

  ,'','',''

  ,'','',''

  ,0x0,0x0,0x0

  ,0x0,0x0,0x0

 );



insert into t1 values

 (3

  ,NULL,NULL,NULL,NULL,NULL

  ,NULL,NULL

  ,NULL,NULL

  ,NULL,NULL

  ,NULL,NULL

  ,NULL,NULL,NULL

  ,NULL,NULL,NULL

  ,NULL,NULL,NULL

  ,NULL,NULL,NULL

 );



#NO.2 test output of backup after some simple SQL operations

--exec $NDB_TOOLS_DIR/../src/mgmclient/ndb_mgm -e "start backup" |sed -e 's/[0-9]//g' |sed -e 's/localhost//g' |sed -e 's/\.\.\.*//g'

ndb/include/debugger/EventLogger.hpp

+1 −1
Original line number Diff line number Diff line
@@ -175,5 +175,5 @@ private: 
  char m_text[MAX_TEXT_LENGTH];

};





extern void getRestartAction(Uint32 action, BaseString &str);

#endif

ndb/src/common/transporter/TransporterRegistry.cpp

+1 −0
Original line number Diff line number Diff line
@@ -959,6 +959,7 @@ TransporterRegistry::performReceive() 
        {

          Uint32 * ptr;

          Uint32 sz = t->getReceiveData(&ptr);

          transporter_recv_from(callbackObj, nodeId);

          Uint32 szUsed = unpack(ptr, sz, nodeId, ioStates[nodeId]);

          t->updateReceiveDataPtr(szUsed);

	}

ndb/src/kernel/blocks/ERROR_codes.txt

+2 −1
Original line number Diff line number Diff line 
Next QMGR 1

Next NDBCNTR 1000

Next NDBCNTR 1002

Next NDBFS 2000

Next DBACC 3002

Next DBTUP 4014
@@ -501,3 +501,4 @@ TUP: 
NDBCNTR:



1000: Crash insertion on SystemError::CopyFragRef

1001: Delay sending NODE_FAILREP (to own node), until error is cleared