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

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/util/OutputStream.hpp:
  Auto merged
parents 65401f91 27fc5de4

mysql-test/include/ndb_backup_print.inc

0 → 100644
+6 −0
Original line number Diff line number Diff line 
--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter > $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 2 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter >> $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec sort $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec rm -f $MYSQLTEST_VARDIR/tmp/tmp.dat

--let ndb_restore_opts=

--let ndb_restore_filter=

mysql-test/r/ndb_partition_key.result

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ Number of primary keys: 3 
Length of frm data: #

Row Checksum: 1

Row GCI: 1

SingleUserMode: 0

TableStatus: Retrieved

-- Attributes -- 

a Int PRIMARY KEY AT=FIXED ST=MEMORY

mysql-test/r/ndb_restore_compat.result

+4 −4
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ SYSTEM_VALUES_ID VALUE 
0	2039

1	3

SELECT * FROM mysql.ndb_apply_status WHERE server_id=0;

server_id	epoch

0	151

server_id	epoch	log_name	start_pos	end_pos

0	151		0	0

TRUNCATE GL;

TRUNCATE ACCOUNT;

TRUNCATE TRANSACTION;
@@ -99,6 +99,6 @@ SYSTEM_VALUES_ID VALUE 
0	2297

1	5

SELECT * FROM mysql.ndb_apply_status WHERE server_id=0;

server_id	epoch

0	331

server_id	epoch	log_name	start_pos	end_pos

0	331		0	0

DROP DATABASE BANK;

mysql-test/r/ndb_restore_print.result

0 → 100644
+321 −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;

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 myisam;

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

);

select pk

,hex(a1), hex(a2), hex(a3), hex(a4), hex(a5)

,b1, b2

,c1 , c2

,d1 , d2

,e1 , e2 

,f1 , f2, f3

,g1 , g2, g3

,hex(h1), hex(h2), hex(h3)

,hex(i1), hex(i2), hex(i3)

from t1 order by pk;

pk	1

hex(a1)	1

hex(a2)	17

hex(a3)	789A

hex(a4)	789ABCDE

hex(a5)	FEDC0001

b1	127

b2	255

c1	32767

c2	65535

d1	2147483647

d2	4294967295

e1	9223372036854775807

e2	18446744073709551615

f1	1

f2	12345678901234567890123456789012

f3	123456789

g1	1

g2	12345678901234567890123456789012

g3	123456789

hex(h1)	12

hex(h2)	123456789ABCDEF0

hex(h3)	012345000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

hex(i1)	12

hex(i2)	123456789ABCDEF0

hex(i3)	00123450

pk	2

hex(a1)	0

hex(a2)	0

hex(a3)	0

hex(a4)	0

hex(a5)	0

b1	-128

b2	0

c1	-32768

c2	0

d1	-2147483648

d2	0

e1	-9223372036854775808

e2	0

f1	

f2	

f3	

g1	

g2	

g3	

hex(h1)	00

hex(h2)	0000000000000000

hex(h3)	000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

hex(i1)	00

hex(i2)	00

hex(i3)	00

pk	3

hex(a1)	NULL

hex(a2)	NULL

hex(a3)	NULL

hex(a4)	NULL

hex(a5)	NULL

b1	NULL

b2	NULL

c1	NULL

c2	NULL

d1	NULL

d2	NULL

e1	NULL

e2	NULL

f1	NULL

f2	NULL

f3	NULL

g1	NULL

g2	NULL

g3	NULL

hex(h1)	NULL

hex(h2)	NULL

hex(h3)	NULL

hex(i1)	NULL

hex(i2)	NULL

hex(i3)	NULL

alter table t1 engine ndb;

select pk

,hex(a1), hex(a2), hex(a3), hex(a4), hex(a5)

,b1, b2

,c1 , c2

,d1 , d2

,e1 , e2 

,f1 , f2, f3

,g1 , g2, g3

,hex(h1), hex(h2), hex(h3)

,hex(i1), hex(i2), hex(i3)

from t1 order by pk;

pk	1

hex(a1)	1

hex(a2)	17

hex(a3)	789A

hex(a4)	789ABCDE

hex(a5)	FEDC0001

b1	127

b2	255

c1	32767

c2	65535

d1	2147483647

d2	4294967295

e1	9223372036854775807

e2	18446744073709551615

f1	1

f2	12345678901234567890123456789012

f3	123456789

g1	1

g2	12345678901234567890123456789012

g3	123456789

hex(h1)	12

hex(h2)	123456789ABCDEF0

hex(h3)	012345000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

hex(i1)	12

hex(i2)	123456789ABCDEF0

hex(i3)	00123450

pk	2

hex(a1)	0

hex(a2)	0

hex(a3)	0

hex(a4)	0

hex(a5)	0

b1	-128

b2	0

c1	-32768

c2	0

d1	-2147483648

d2	0

e1	-9223372036854775808

e2	0

f1	

f2	

f3	

g1	

g2	

g3	

hex(h1)	00

hex(h2)	0000000000000000

hex(h3)	000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

hex(i1)	00

hex(i2)	00

hex(i3)	00

pk	3

hex(a1)	NULL

hex(a2)	NULL

hex(a3)	NULL

hex(a4)	NULL

hex(a5)	NULL

b1	NULL

b2	NULL

c1	NULL

c2	NULL

d1	NULL

d2	NULL

e1	NULL

e2	NULL

f1	NULL

f2	NULL

f3	NULL

g1	NULL

g2	NULL

g3	NULL

hex(h1)	NULL

hex(h2)	NULL

hex(h3)	NULL

hex(i1)	NULL

hex(i2)	NULL

hex(i3)	NULL

CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;

DELETE FROM test.backup_info;

LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';

SELECT @the_backup_id:=backup_id FROM test.backup_info;

@the_backup_id:=backup_id

<the_backup_id>

DROP TABLE test.backup_info;

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

2;0x0;0x0;0x0;0x0;0x0;-128;0;-32768;0;-2147483648;0;-9223372036854775808;0;;;;;;;0x0;0x0;0x0;0x0;0x0;0x0

3;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N

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

2,0x0,0x0,0x0,0x0,0x0,-128,0,-32768,0,-2147483648,0,-9223372036854775808,0,'','','','','','',0x0,0x0,0x0,0x0,0x0,0x0

3,,,,,,,,,,,,,,,,,,,,,,,,,

drop table t1;

create table t1

(pk int key

,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(9), h3 BINARY(255)

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

) engine ndb;

insert into t1 values

(1

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

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

  ,0x20,0x123456789abcdef020, 0x012345000020

,0x1200000020,0x123456789abcdef000000020, 0x00123450000020

);

create table t2 (pk int key, a int) engine ndb;

create table t3 (pk int key, a int) engine ndb;

create table t4 (pk int key, a int) engine ndb;

insert into t2 values (1,11),(2,12),(3,13),(4,14),(5,15);

insert into t3 values (1,21),(2,22),(3,23),(4,24),(5,25);

insert into t4 values (1,31),(2,32),(3,33),(4,34),(5,35);

CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;

DELETE FROM test.backup_info;

LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';

SELECT @the_backup_id:=backup_id FROM test.backup_info;

@the_backup_id:=backup_id

<the_backup_id>

DROP TABLE test.backup_info;

'1'	'1'	'12345678901234567890123456789012'	'123456789'	'1'	'12345678901234567890123456789012'	'123456789'	'0x20'	'0x123456789ABCDEF020'	'0x012345000020'	'0x1200000020'	'0x123456789ABCDEF000000020'	'0x00123450000020'



t1

--

1	1	12345678901234567890123456789012	123456789	1	12345678901234567890123456789012	123456789	0x20	0x123456789ABCDEF020	0x012345000020	0x1200000020	0x123456789ABCDEF000000020	0x00123450000020



t2

--

1	11

2	12

3	13

4	14

5	15



t3

--

1	21

2	22

3	23

4	24

5	25



t4

--

1	31

2	32

3	33

4	34

5	35

drop table t1;

create table t1

(pk int key

,a1 MEDIUMINT, a2 MEDIUMINT UNSIGNED

) engine ndb;

insert into t1 values(1, 8388607, 16777215);

insert into t1 values(2, -8388608, 0);

insert into t1 values(3, -1, 1);

CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;

DELETE FROM test.backup_info;

LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';

SELECT @the_backup_id:=backup_id FROM test.backup_info;

@the_backup_id:=backup_id

<the_backup_id>

DROP TABLE test.backup_info;

1;8388607;16777215

2;-8388608;0

3;-1;1

drop table t1;

drop table t2;

drop table t3;

drop table t4;

mysql-test/r/ndb_single_user.result

+19 −9
Original line number Diff line number Diff line 
use test;

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

create table t1 (a int key, b int unique, c int) engine ndb;

ERROR HY000: Can't create table 'test.t1' (errno: 4007)

ERROR HY000: Can't create table 'test.t1' (errno: 299)

create table t1 (a int key, b int unique, c int) engine ndb;

insert into t1 values (1,1,0),(2,2,0),(3,3,0),(4,4,0),(5,5,0),(6,6,0),(7,7,0),(8,8,0),(9,9,0),(10,10,0);

create table t2 as select * from t1;
@@ -28,19 +28,29 @@ insert into t1 select * from t2; 
drop table t1;

ERROR 42S02: Unknown table 't1'

create index new_index on t1 (c);

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER

insert into t1 values (1,1,0),(2,2,0),(3,3,0),(4,4,0),(5,5,0),(6,6,0),(7,7,0),(8,8,0),(9,9,0),(10,10,0);

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER

select * from t1 where a = 1;

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER

select * from t1 where b = 4;

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER

update t1 set b=102 where a = 2;

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER

update t1 set b=103 where b = 3;

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER

update t1 set b=b+100;

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER

update t1 set b=b+100 where a > 7;

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER

BEGIN;

update t1 set b=b+100 where a=1;

BEGIN;

update t1 set b=b+100 where a=2;

update t1 set b=b+100 where a=3;

COMMIT;

update t1 set b=b+100 where a=4;

ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER

COMMIT;

ERROR HY000: Got error 4350 'Transaction already aborted' from NDBCLUSTER

drop table t1;