Commit cf02f52c authored by unknown's avatar unknown
Browse files

Ndb handler cleanup: 

  - removed some returns on ndb internal error codes, return ndb cause in warnings
  - moved all errorcode mapping mysqld-ndb to ndberror.c
  - ndb util thread to discover all ndb tables at startup
  - ndb util thread to wait for mysqld startup
parent cff12b93

mysql-test/r/ndb_autodiscover2.result

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ a b 
4	5

show status like 'handler_discover%';

Variable_name	Value

Handler_discover	1

Handler_discover	0

drop table t9;

select * from t10;

ERROR HY000: Got error 4263 'Invalid blob attributes or invalid blob parts table' from NDBCLUSTER

mysql-test/r/ndb_bitfield.result

+10 −2
Original line number Diff line number Diff line
@@ -201,10 +201,18 @@ create table t1 ( 
pk1 bit(9) not null primary key,

b int

) engine=ndbcluster;

ERROR HY000: Can't create table './test/t1.frm' (errno: 739)

ERROR HY000: Can't create table './test/t1.frm' (errno: 140)

show warnings;

Level	Code	Message

Error	1296	Got error 739 'Unsupported primary key length' from NDB

Error	1005	Can't create table './test/t1.frm' (errno: 140)

create table t1 (

pk1 int not null primary key,

b bit(9),

key(b)

) engine=ndbcluster;

ERROR HY000: Can't create table './test/t1.frm' (errno: 743)
 
ERROR HY000: Can't create table './test/t1.frm' (errno: 140)

show warnings;

Level	Code	Message

Error	1296	Got error 743 'Unsupported character set in table or index' from NDB

Error	1005	Can't create table './test/t1.frm' (errno: 140)

mysql-test/r/ndb_multi.result

+6 −1
Original line number Diff line number Diff line
@@ -29,7 +29,12 @@ drop table t1; 
create table t1 (a int) engine=ndbcluster;

insert into t1 value (2);

select * from t1;

ERROR HY000: Got error 241 'Invalid schema object version' from NDBCLUSTER

ERROR HY000: Table definition has changed, please retry transaction

show warnings;

Level	Code	Message

Error	1296	Got error 241 'Invalid schema object version' from NDB

Error	1412	Table definition has changed, please retry transaction

Error	1105	Unknown error

select * from t1;

a

2

mysql-test/r/ndb_partition_error.result

+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ partitions 3 
(partition x1 values less than (5) nodegroup 12,

partition x2 values less than (10) nodegroup 13,

partition x3 values less than (20) nodegroup 14);

ERROR HY000: Can't create table './test/t1.frm' (errno: 771)

ERROR HY000: Can't create table './test/t1.frm' (errno: 140)

show warnings;

Level	Code	Message

Error	1296	Got error 771 'Given NODEGROUP doesn't exist in this cluster' from NDB

Error	1005	Can't create table './test/t1.frm' (errno: 140)

CREATE TABLE t1 (

a int not null,

b int not null,

mysql-test/r/ndb_read_multi_range.result

+1 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1, r1;

DROP TABLE IF EXISTS t1, t2, r1;

create table t1 (

a int primary key,

b int not null,