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

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
parents 7c4db88a d7dadcd7

mysql-test/r/ndb_restore.result

+40 −40
Original line number Diff line number Diff line 
use test;

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

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c;

CREATE TABLE `t1` (

CREATE TABLE `t1_c` (

`capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,

`goaledatta` char(2) NOT NULL default '',

`maturegarbagefa` varchar(32) NOT NULL default '',

PRIMARY KEY  (`capgoaledatta`,`goaledatta`,`maturegarbagefa`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t1` VALUES (2,'3','q3plus.qt'),(4,'4','q3plus.qt'),(1,'3','q3.net'),(3,'4','q3.net'),(3,'20','threetrees.qt');

CREATE TABLE `t2` (

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t1_c` VALUES (2,'3','q3plus.qt'),(4,'4','q3plus.qt'),(1,'3','q3.net'),(3,'4','q3.net'),(3,'20','threetrees.qt');

CREATE TABLE `t2_c` (

`capgotod` smallint(5) unsigned NOT NULL auto_increment,

`gotod` smallint(5) unsigned NOT NULL default '0',

`goaledatta` char(2) default NULL,
@@ -16,16 +16,16 @@ CREATE TABLE `t2` ( 
`descrpooppo` varchar(64) default NULL,

`svcutonsa` varchar(64) NOT NULL default '',

PRIMARY KEY  (`capgotod`),

KEY `i_quadaddsvr` (`gotod`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t2` VALUES (5,4,'','q3.net','addavp:MK_CASELECTOR=1','postorod rattoaa'),(2,1,'4','','addavp:MK_BRANDTAD=345','REDS Brandtad'),(3,2,'4','q3.net','execorder','fixedRatediPO REDS'),(1,1,'3','','addavp:MK_BRANDTAD=123','TEST Brandtad'),(6,5,'','told.q3.net','addavp:MK_BRANDTAD=123','Brandtad Toldzone'),(4,3,'3','q3.net','addavp:MK_POOLHINT=2','ratedi PO TEST');

CREATE TABLE `t3` (

KEY `i quadaddsvr` (`gotod`)

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t2_c` VALUES (5,4,'','q3.net','addavp:MK_CASELECTOR=1','postorod rattoaa'),(2,1,'4','','addavp:MK_BRANDTAD=345','REDS Brandtad'),(3,2,'4','q3.net','execorder','fixedRatediPO REDS'),(1,1,'3','','addavp:MK_BRANDTAD=123','TEST Brandtad'),(6,5,'','told.q3.net','addavp:MK_BRANDTAD=123','Brandtad Toldzone'),(4,3,'3','q3.net','addavp:MK_POOLHINT=2','ratedi PO TEST');

CREATE TABLE `t3_c` (

`CapGoaledatta` smallint(5) unsigned NOT NULL default '0',

`capgotod` smallint(5) unsigned NOT NULL default '0',

PRIMARY KEY  (`capgotod`,`CapGoaledatta`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t3` VALUES (5,3),(2,4),(5,4),(1,3);

CREATE TABLE `t4` (

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t3_c` VALUES (5,3),(2,4),(5,4),(1,3);

CREATE TABLE `t4_c` (

`capfa` bigint(20) unsigned NOT NULL auto_increment,

`realm` varchar(32) NOT NULL default '',

`authpwchap` varchar(32) default NULL,
@@ -35,23 +35,23 @@ CREATE TABLE `t4` ( 
PRIMARY KEY  (`fa`,`realm`),

KEY `capfa` (`capfa`),

KEY `i_quadentity` (`fa`,`realm`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t4` VALUES (18,'john.smith','q3.net','dessjohn.smith',0,NULL),(21,'quad_katt_with_brandtad','q3.net','acne',0,NULL),(22,'quad_katt_carattoaa','q3.net','acne',0,NULL),(26,'436462612809','sqasdt.q3.net','N/A',0,'6'),(19,'john','smith.qt','dessjohn',0,NULL),(33,'436643196120','sqasdt.q3.net','N/A',1,'6'),(28,'436642900019','sqasdt.q3.net','N/A',0,'6'),(30,'436462900209','sqasdt.q3.net','N/A',0,'6'),(16,'436640006666','sqasdt.q3.net','',0,NULL),(19,'dette','el-redun.com','dessdette',0,NULL),(12,'quad_kattPP','q3.net','acne',2,NULL),(14,'436640008888','sqasdt.q3.net','',0,NULL),(29,'463624900028','sqasdt.q3.net','N/A',0,'6'),(15,'436640099099','sqasdt.q3.net','',0,NULL),(13,'pap','q3plus.qt','acne',1,NULL),(19,'436642612091','sqasdt.q3.net','N/A',0,'6'),(12,'quad_katt','q3.net','acne',0,NULL),(11,'quad_kattVK','q3.net','acne',1,NULL),(32,'463641969502','sqasdt.q3.net','N/A',1,'6'),(20,'joe','q3.net','joedesswd',0,NULL),(29,'436642900034','sqasdt.q3.net','N/A',0,'6'),(25,'contind','armerde.qt','acne',1,NULL);

CREATE TABLE `t5` (

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t4_c` VALUES (18,'john.smith','q3.net','dessjohn.smith',0,NULL),(21,'quad_katt_with_brandtad','q3.net','acne',0,NULL),(22,'quad_katt_carattoaa','q3.net','acne',0,NULL),(26,'436462612809','sqasdt.q3.net','N/A',0,'6'),(19,'john','smith.qt','dessjohn',0,NULL),(33,'436643196120','sqasdt.q3.net','N/A',1,'6'),(28,'436642900019','sqasdt.q3.net','N/A',0,'6'),(30,'436462900209','sqasdt.q3.net','N/A',0,'6'),(16,'436640006666','sqasdt.q3.net','',0,NULL),(19,'dette','el-redun.com','dessdette',0,NULL),(12,'quad_kattPP','q3.net','acne',2,NULL),(14,'436640008888','sqasdt.q3.net','',0,NULL),(29,'463624900028','sqasdt.q3.net','N/A',0,'6'),(15,'436640099099','sqasdt.q3.net','',0,NULL),(13,'pap','q3plus.qt','acne',1,NULL),(19,'436642612091','sqasdt.q3.net','N/A',0,'6'),(12,'quad_katt','q3.net','acne',0,NULL),(11,'quad_kattVK','q3.net','acne',1,NULL),(32,'463641969502','sqasdt.q3.net','N/A',1,'6'),(20,'joe','q3.net','joedesswd',0,NULL),(29,'436642900034','sqasdt.q3.net','N/A',0,'6'),(25,'contind','armerde.qt','acne',1,NULL);

CREATE TABLE `t5_c` (

`capfa` bigint(20) unsigned NOT NULL default '0',

`gotod` smallint(5) unsigned NOT NULL default '0',

`orderutonsa` varchar(64) NOT NULL default '',

PRIMARY KEY  (`capfa`,`gotod`,`orderutonsa`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t5` VALUES (21,2,''),(21,1,''),(22,4,'');

CREATE TABLE `t6` (

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t5_c` VALUES (21,2,''),(21,1,''),(22,4,'');

CREATE TABLE `t6_c` (

`capfa_parent` bigint(20) unsigned NOT NULL default '0',

`capfa_child` bigint(20) unsigned NOT NULL default '0',

`relatta` smallint(5) unsigned NOT NULL default '0',

PRIMARY KEY  (`capfa_child`,`capfa_parent`,`relatta`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t6` VALUES (15,16,0),(19,20,0),(18326932092909551615,30,0),(26,29,0),(18326932092909551615,29,0),(19,18,0),(26,28,0),(12,14,0);

CREATE TABLE `t7` (

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t6_c` VALUES (15,16,0),(19,20,0),(18326932092909551615,30,0),(26,29,0),(18326932092909551615,29,0),(19,18,0),(26,28,0),(12,14,0);

CREATE TABLE `t7_c` (

`dardpo` char(15) NOT NULL default '',

`dardtestard` tinyint(3) unsigned NOT NULL default '0',

`FastFA` char(5) NOT NULL default '',
@@ -60,9 +60,9 @@ CREATE TABLE `t7` ( 
`Fastmag` char(1) NOT NULL default '',

`Beareratta` char(2) NOT NULL default '',

PRIMARY KEY  (`dardpo`,`dardtestard`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t7` VALUES ('2.6.2.4',24,'CECHP','54545','0','0','5'),('2.2.5.4',26,'CANFA','33223','1','1','4'),('4.3.2.4',28,'ITALD','54222','1','0','5'),('129..0.0.eins',28,'G','99999','1','1','5'),('1.1.1.1',24,'AUTPT','32323','0','1','3');

CREATE TABLE `t8` (

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t7_c` VALUES ('2.6.2.4',24,'CECHP','54545','0','0','5'),('2.2.5.4',26,'CANFA','33223','1','1','4'),('4.3.2.4',28,'ITALD','54222','1','0','5'),('129..0.0.eins',28,'G','99999','1','1','5'),('1.1.1.1',24,'AUTPT','32323','0','1','3');

CREATE TABLE `t8_c` (

`kattjame` varchar(32) NOT NULL default '',

`realm` varchar(32) NOT NULL default '',

`realm_entered` varchar(32) NOT NULL default '',
@@ -88,9 +88,9 @@ CREATE TABLE `t8` ( 
`acctinputoctets` bigint(20) unsigned default NULL,

PRIMARY KEY  (`kattjame`,`hunderaaarbagefa`,`hassetistart`,`hassetino`),

KEY `squardporoot` (`squardporoot`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t8` VALUES ('4tt45345235','pap','q3plus.qt','q3plus.qt','q3.net','436643196120','436643196929','8956234534568968','5524595699','uxasmt21.net.acne.qt/481889229462692422','','1.1.1.1','2.2.4.6','4','86989','34','x','x','2012-03-12 12:55:34','2012-12-05 11:20:04',3223433,3369,9565),('4545435545','john','q3.net','q3.net','acne.li','436643196120','436643196929','45345234568968','995696699','uxasmt21.net.acne.qt/481889229462692423','','1.1.1.1','2.2.9.8','2','86989','34','x','x','2012-03-12 11:35:03','2012-12-05 08:50:04',8821923,169,3565),('versteckter_q3net_katt','joe','q3.net','elredun.com','q3.net','436643196120','436643196939','91341234568968','695595699','uxasmt21.net.acne.qt/481889229462692421','','1.1.1.1','2.5.2.5','3','86989','34','x','x','2012-03-12 18:35:04','2012-12-05 12:35:04',1923123,9569,6565);

CREATE TABLE `t9` (

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t8_c` VALUES ('4tt45345235','pap','q3plus.qt','q3plus.qt','q3.net','436643196120','436643196929','8956234534568968','5524595699','uxasmt21.net.acne.qt/481889229462692422','','1.1.1.1','2.2.4.6','4','86989','34','x','x','2012-03-12 12:55:34','2012-12-05 11:20:04',3223433,3369,9565),('4545435545','john','q3.net','q3.net','acne.li','436643196120','436643196929','45345234568968','995696699','uxasmt21.net.acne.qt/481889229462692423','','1.1.1.1','2.2.9.8','2','86989','34','x','x','2012-03-12 11:35:03','2012-12-05 08:50:04',8821923,169,3565),('versteckter_q3net_katt','joe','q3.net','elredun.com','q3.net','436643196120','436643196939','91341234568968','695595699','uxasmt21.net.acne.qt/481889229462692421','','1.1.1.1','2.5.2.5','3','86989','34','x','x','2012-03-12 18:35:04','2012-12-05 12:35:04',1923123,9569,6565);

CREATE TABLE `t9_c` (

`kattjame` varchar(32) NOT NULL default '',

`kattjame_entered` varchar(32) NOT NULL default '',

`realm` varchar(32) NOT NULL default '',
@@ -114,20 +114,20 @@ CREATE TABLE `t9` ( 
`actinputocctets` bigint(20) unsigned default NULL,

`terminateraste` tinyint(3) unsigned default NULL,

PRIMARY KEY  (`kattjame`,`hunderaaarbagefa`,`hassetistart`,`hassetino`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t9` VALUES ('3g4jh8gar2t','joe','q3.net','elredun.com','q3.net','436643316120','436643316939','91341234568968','695595699','1.1.1.1','2.2.6.2','3','86989','34','x','x','2012-03-12 18:35:04','2012-12-05 12:35:04',3123123,9569,6565,1),('4tt45345235','pap','q3plus.qt','q3plus.qt','q3.net','436643316120','436643316939','8956234534568968','5254595969','1.1.1.1','8.6.2.2','4','86989','34','x','x','2012-03-12 12:55:34','2012-12-05 11:20:04',3223433,3369,9565,2),('4545435545','john','q3.net','q3.net','acne.li','436643316120','436643316939','45345234568968','995696699','1.1.1.1','2.9.9.2','2','86998','34','x','x','2012-03-12 11:35:03','2012-12-05 08:50:04',8823123,169,3565,3);

create table t10 (a int auto_increment key);

insert into t10 values (1),(2),(3);

create table t1_c engine=ndbcluster as select * from t1;

create table t2_c engine=ndbcluster as select * from t2;

create table t3_c engine=ndbcluster as select * from t3;

create table t4_c engine=ndbcluster as select * from t4;

create table t5_c engine=ndbcluster as select * from t5;

create table t6_c engine=ndbcluster as select * from t6;

create table t7_c engine=ndbcluster as select * from t7;

create table t8_c engine=ndbcluster as select * from t8;

create table t9_c engine=ndbcluster as select * from t9;

create table t10_c engine=ndbcluster as select * from t10;

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t9_c` VALUES ('3g4jh8gar2t','joe','q3.net','elredun.com','q3.net','436643316120','436643316939','91341234568968','695595699','1.1.1.1','2.2.6.2','3','86989','34','x','x','2012-03-12 18:35:04','2012-12-05 12:35:04',3123123,9569,6565,1),('4tt45345235','pap','q3plus.qt','q3plus.qt','q3.net','436643316120','436643316939','8956234534568968','5254595969','1.1.1.1','8.6.2.2','4','86989','34','x','x','2012-03-12 12:55:34','2012-12-05 11:20:04',3223433,3369,9565,2),('4545435545','john','q3.net','q3.net','acne.li','436643316120','436643316939','45345234568968','995696699','1.1.1.1','2.9.9.2','2','86998','34','x','x','2012-03-12 11:35:03','2012-12-05 08:50:04',8823123,169,3565,3);

create table t10_c (a int auto_increment key) ENGINE=ndbcluster;

insert into t10_c values (1),(2),(3);

create table t1 engine=myisam as select * from t1_c;

create table t2 engine=myisam as select * from t2_c;

create table t3 engine=myisam as select * from t3_c;

create table t4 engine=myisam as select * from t4_c;

create table t5 engine=myisam as select * from t5_c;

create table t6 engine=myisam as select * from t6_c;

create table t7 engine=myisam as select * from t7_c;

create table t8 engine=myisam as select * from t8_c;

create table t9 engine=myisam as select * from t9_c;

create table t10 engine=myisam as select * from t10_c;

drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c, t10_c;

show tables;

Tables_in_test

mysql-test/t/ndb_restore.test

+45 −42
Original line number Diff line number Diff line
@@ -8,15 +8,18 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; 
drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c;

--enable_warnings



CREATE TABLE `t1` (

CREATE TABLE `t1_c` (

  `capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,

  `goaledatta` char(2) NOT NULL default '',

  `maturegarbagefa` varchar(32) NOT NULL default '',

  PRIMARY KEY  (`capgoaledatta`,`goaledatta`,`maturegarbagefa`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t1` VALUES (2,'3','q3plus.qt'),(4,'4','q3plus.qt'),(1,'3','q3.net'),(3,'4','q3.net'),(3,'20','threetrees.qt');



CREATE TABLE `t2` (

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t1_c` VALUES (2,'3','q3plus.qt'),(4,'4','q3plus.qt'),(1,'3','q3.net'),(3,'4','q3.net'),(3,'20','threetrees.qt');

#

# Bug #27758 Restoring NDB backups makes table usable in SQL nodes

# - space in key made table unusable after restore

#

CREATE TABLE `t2_c` (

  `capgotod` smallint(5) unsigned NOT NULL auto_increment,

  `gotod` smallint(5) unsigned NOT NULL default '0',

  `goaledatta` char(2) default NULL,
@@ -24,18 +27,18 @@ CREATE TABLE `t2` ( 
  `descrpooppo` varchar(64) default NULL,

  `svcutonsa` varchar(64) NOT NULL default '',

  PRIMARY KEY  (`capgotod`),

  KEY `i_quadaddsvr` (`gotod`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t2` VALUES (5,4,'','q3.net','addavp:MK_CASELECTOR=1','postorod rattoaa'),(2,1,'4','','addavp:MK_BRANDTAD=345','REDS Brandtad'),(3,2,'4','q3.net','execorder','fixedRatediPO REDS'),(1,1,'3','','addavp:MK_BRANDTAD=123','TEST Brandtad'),(6,5,'','told.q3.net','addavp:MK_BRANDTAD=123','Brandtad Toldzone'),(4,3,'3','q3.net','addavp:MK_POOLHINT=2','ratedi PO TEST');

  KEY `i quadaddsvr` (`gotod`)

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t2_c` VALUES (5,4,'','q3.net','addavp:MK_CASELECTOR=1','postorod rattoaa'),(2,1,'4','','addavp:MK_BRANDTAD=345','REDS Brandtad'),(3,2,'4','q3.net','execorder','fixedRatediPO REDS'),(1,1,'3','','addavp:MK_BRANDTAD=123','TEST Brandtad'),(6,5,'','told.q3.net','addavp:MK_BRANDTAD=123','Brandtad Toldzone'),(4,3,'3','q3.net','addavp:MK_POOLHINT=2','ratedi PO TEST');



CREATE TABLE `t3` (

CREATE TABLE `t3_c` (

  `CapGoaledatta` smallint(5) unsigned NOT NULL default '0',

  `capgotod` smallint(5) unsigned NOT NULL default '0',

  PRIMARY KEY  (`capgotod`,`CapGoaledatta`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t3` VALUES (5,3),(2,4),(5,4),(1,3);

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t3_c` VALUES (5,3),(2,4),(5,4),(1,3);



CREATE TABLE `t4` (

CREATE TABLE `t4_c` (

  `capfa` bigint(20) unsigned NOT NULL auto_increment,

  `realm` varchar(32) NOT NULL default '',

  `authpwchap` varchar(32) default NULL,
@@ -45,26 +48,26 @@ CREATE TABLE `t4` ( 
  PRIMARY KEY  (`fa`,`realm`),

  KEY `capfa` (`capfa`),

  KEY `i_quadentity` (`fa`,`realm`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t4` VALUES (18,'john.smith','q3.net','dessjohn.smith',0,NULL),(21,'quad_katt_with_brandtad','q3.net','acne',0,NULL),(22,'quad_katt_carattoaa','q3.net','acne',0,NULL),(26,'436462612809','sqasdt.q3.net','N/A',0,'6'),(19,'john','smith.qt','dessjohn',0,NULL),(33,'436643196120','sqasdt.q3.net','N/A',1,'6'),(28,'436642900019','sqasdt.q3.net','N/A',0,'6'),(30,'436462900209','sqasdt.q3.net','N/A',0,'6'),(16,'436640006666','sqasdt.q3.net','',0,NULL),(19,'dette','el-redun.com','dessdette',0,NULL),(12,'quad_kattPP','q3.net','acne',2,NULL),(14,'436640008888','sqasdt.q3.net','',0,NULL),(29,'463624900028','sqasdt.q3.net','N/A',0,'6'),(15,'436640099099','sqasdt.q3.net','',0,NULL),(13,'pap','q3plus.qt','acne',1,NULL),(19,'436642612091','sqasdt.q3.net','N/A',0,'6'),(12,'quad_katt','q3.net','acne',0,NULL),(11,'quad_kattVK','q3.net','acne',1,NULL),(32,'463641969502','sqasdt.q3.net','N/A',1,'6'),(20,'joe','q3.net','joedesswd',0,NULL),(29,'436642900034','sqasdt.q3.net','N/A',0,'6'),(25,'contind','armerde.qt','acne',1,NULL);

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t4_c` VALUES (18,'john.smith','q3.net','dessjohn.smith',0,NULL),(21,'quad_katt_with_brandtad','q3.net','acne',0,NULL),(22,'quad_katt_carattoaa','q3.net','acne',0,NULL),(26,'436462612809','sqasdt.q3.net','N/A',0,'6'),(19,'john','smith.qt','dessjohn',0,NULL),(33,'436643196120','sqasdt.q3.net','N/A',1,'6'),(28,'436642900019','sqasdt.q3.net','N/A',0,'6'),(30,'436462900209','sqasdt.q3.net','N/A',0,'6'),(16,'436640006666','sqasdt.q3.net','',0,NULL),(19,'dette','el-redun.com','dessdette',0,NULL),(12,'quad_kattPP','q3.net','acne',2,NULL),(14,'436640008888','sqasdt.q3.net','',0,NULL),(29,'463624900028','sqasdt.q3.net','N/A',0,'6'),(15,'436640099099','sqasdt.q3.net','',0,NULL),(13,'pap','q3plus.qt','acne',1,NULL),(19,'436642612091','sqasdt.q3.net','N/A',0,'6'),(12,'quad_katt','q3.net','acne',0,NULL),(11,'quad_kattVK','q3.net','acne',1,NULL),(32,'463641969502','sqasdt.q3.net','N/A',1,'6'),(20,'joe','q3.net','joedesswd',0,NULL),(29,'436642900034','sqasdt.q3.net','N/A',0,'6'),(25,'contind','armerde.qt','acne',1,NULL);



CREATE TABLE `t5` (

CREATE TABLE `t5_c` (

  `capfa` bigint(20) unsigned NOT NULL default '0',

  `gotod` smallint(5) unsigned NOT NULL default '0',

  `orderutonsa` varchar(64) NOT NULL default '',

  PRIMARY KEY  (`capfa`,`gotod`,`orderutonsa`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t5` VALUES (21,2,''),(21,1,''),(22,4,'');

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t5_c` VALUES (21,2,''),(21,1,''),(22,4,'');



CREATE TABLE `t6` (

CREATE TABLE `t6_c` (

  `capfa_parent` bigint(20) unsigned NOT NULL default '0',

  `capfa_child` bigint(20) unsigned NOT NULL default '0',

  `relatta` smallint(5) unsigned NOT NULL default '0',

  PRIMARY KEY  (`capfa_child`,`capfa_parent`,`relatta`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t6` VALUES (15,16,0),(19,20,0),(18326932092909551615,30,0),(26,29,0),(18326932092909551615,29,0),(19,18,0),(26,28,0),(12,14,0);

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t6_c` VALUES (15,16,0),(19,20,0),(18326932092909551615,30,0),(26,29,0),(18326932092909551615,29,0),(19,18,0),(26,28,0),(12,14,0);



CREATE TABLE `t7` (

CREATE TABLE `t7_c` (

  `dardpo` char(15) NOT NULL default '',

  `dardtestard` tinyint(3) unsigned NOT NULL default '0',

  `FastFA` char(5) NOT NULL default '',
@@ -73,10 +76,10 @@ CREATE TABLE `t7` ( 
  `Fastmag` char(1) NOT NULL default '',

  `Beareratta` char(2) NOT NULL default '',

  PRIMARY KEY  (`dardpo`,`dardtestard`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t7` VALUES ('2.6.2.4',24,'CECHP','54545','0','0','5'),('2.2.5.4',26,'CANFA','33223','1','1','4'),('4.3.2.4',28,'ITALD','54222','1','0','5'),('129..0.0.eins',28,'G','99999','1','1','5'),('1.1.1.1',24,'AUTPT','32323','0','1','3');

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t7_c` VALUES ('2.6.2.4',24,'CECHP','54545','0','0','5'),('2.2.5.4',26,'CANFA','33223','1','1','4'),('4.3.2.4',28,'ITALD','54222','1','0','5'),('129..0.0.eins',28,'G','99999','1','1','5'),('1.1.1.1',24,'AUTPT','32323','0','1','3');



CREATE TABLE `t8` (

CREATE TABLE `t8_c` (

  `kattjame` varchar(32) NOT NULL default '',

  `realm` varchar(32) NOT NULL default '',

  `realm_entered` varchar(32) NOT NULL default '',
@@ -102,10 +105,10 @@ CREATE TABLE `t8` ( 
  `acctinputoctets` bigint(20) unsigned default NULL,

  PRIMARY KEY  (`kattjame`,`hunderaaarbagefa`,`hassetistart`,`hassetino`),

  KEY `squardporoot` (`squardporoot`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t8` VALUES ('4tt45345235','pap','q3plus.qt','q3plus.qt','q3.net','436643196120','436643196929','8956234534568968','5524595699','uxasmt21.net.acne.qt/481889229462692422','','1.1.1.1','2.2.4.6','4','86989','34','x','x','2012-03-12 12:55:34','2012-12-05 11:20:04',3223433,3369,9565),('4545435545','john','q3.net','q3.net','acne.li','436643196120','436643196929','45345234568968','995696699','uxasmt21.net.acne.qt/481889229462692423','','1.1.1.1','2.2.9.8','2','86989','34','x','x','2012-03-12 11:35:03','2012-12-05 08:50:04',8821923,169,3565),('versteckter_q3net_katt','joe','q3.net','elredun.com','q3.net','436643196120','436643196939','91341234568968','695595699','uxasmt21.net.acne.qt/481889229462692421','','1.1.1.1','2.5.2.5','3','86989','34','x','x','2012-03-12 18:35:04','2012-12-05 12:35:04',1923123,9569,6565);

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t8_c` VALUES ('4tt45345235','pap','q3plus.qt','q3plus.qt','q3.net','436643196120','436643196929','8956234534568968','5524595699','uxasmt21.net.acne.qt/481889229462692422','','1.1.1.1','2.2.4.6','4','86989','34','x','x','2012-03-12 12:55:34','2012-12-05 11:20:04',3223433,3369,9565),('4545435545','john','q3.net','q3.net','acne.li','436643196120','436643196929','45345234568968','995696699','uxasmt21.net.acne.qt/481889229462692423','','1.1.1.1','2.2.9.8','2','86989','34','x','x','2012-03-12 11:35:03','2012-12-05 08:50:04',8821923,169,3565),('versteckter_q3net_katt','joe','q3.net','elredun.com','q3.net','436643196120','436643196939','91341234568968','695595699','uxasmt21.net.acne.qt/481889229462692421','','1.1.1.1','2.5.2.5','3','86989','34','x','x','2012-03-12 18:35:04','2012-12-05 12:35:04',1923123,9569,6565);



CREATE TABLE `t9` (

CREATE TABLE `t9_c` (

  `kattjame` varchar(32) NOT NULL default '',

  `kattjame_entered` varchar(32) NOT NULL default '',

  `realm` varchar(32) NOT NULL default '',
@@ -129,26 +132,26 @@ CREATE TABLE `t9` ( 
  `actinputocctets` bigint(20) unsigned default NULL,

  `terminateraste` tinyint(3) unsigned default NULL,

  PRIMARY KEY  (`kattjame`,`hunderaaarbagefa`,`hassetistart`,`hassetino`)

) ENGINE=myisam DEFAULT CHARSET=latin1;

INSERT INTO `t9` VALUES ('3g4jh8gar2t','joe','q3.net','elredun.com','q3.net','436643316120','436643316939','91341234568968','695595699','1.1.1.1','2.2.6.2','3','86989','34','x','x','2012-03-12 18:35:04','2012-12-05 12:35:04',3123123,9569,6565,1),('4tt45345235','pap','q3plus.qt','q3plus.qt','q3.net','436643316120','436643316939','8956234534568968','5254595969','1.1.1.1','8.6.2.2','4','86989','34','x','x','2012-03-12 12:55:34','2012-12-05 11:20:04',3223433,3369,9565,2),('4545435545','john','q3.net','q3.net','acne.li','436643316120','436643316939','45345234568968','995696699','1.1.1.1','2.9.9.2','2','86998','34','x','x','2012-03-12 11:35:03','2012-12-05 08:50:04',8823123,169,3565,3);

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t9_c` VALUES ('3g4jh8gar2t','joe','q3.net','elredun.com','q3.net','436643316120','436643316939','91341234568968','695595699','1.1.1.1','2.2.6.2','3','86989','34','x','x','2012-03-12 18:35:04','2012-12-05 12:35:04',3123123,9569,6565,1),('4tt45345235','pap','q3plus.qt','q3plus.qt','q3.net','436643316120','436643316939','8956234534568968','5254595969','1.1.1.1','8.6.2.2','4','86989','34','x','x','2012-03-12 12:55:34','2012-12-05 11:20:04',3223433,3369,9565,2),('4545435545','john','q3.net','q3.net','acne.li','436643316120','436643316939','45345234568968','995696699','1.1.1.1','2.9.9.2','2','86998','34','x','x','2012-03-12 11:35:03','2012-12-05 08:50:04',8823123,169,3565,3);



# Bug #20820

# auto inc table not handled correctly when restored from cluster backup

# - before fix ndb_restore would not set auto inc value correct,

#   seen by select below

create table t10 (a int auto_increment key);

insert into t10 values (1),(2),(3);



create table t1_c engine=ndbcluster as select * from t1;

create table t2_c engine=ndbcluster as select * from t2;

create table t3_c engine=ndbcluster as select * from t3;

create table t4_c engine=ndbcluster as select * from t4;

create table t5_c engine=ndbcluster as select * from t5;

create table t6_c engine=ndbcluster as select * from t6;

create table t7_c engine=ndbcluster as select * from t7;

create table t8_c engine=ndbcluster as select * from t8;

create table t9_c engine=ndbcluster as select * from t9;

create table t10_c engine=ndbcluster as select * from t10;

create table t10_c (a int auto_increment key) ENGINE=ndbcluster;

insert into t10_c values (1),(2),(3);



create table t1 engine=myisam as select * from t1_c;

create table t2 engine=myisam as select * from t2_c;

create table t3 engine=myisam as select * from t3_c;

create table t4 engine=myisam as select * from t4_c;

create table t5 engine=myisam as select * from t5_c;

create table t6 engine=myisam as select * from t6_c;

create table t7 engine=myisam as select * from t7_c;

create table t8 engine=myisam as select * from t8_c;

create table t9 engine=myisam as select * from t9_c;

create table t10 engine=myisam as select * from t10_c;





--exec $NDB_MGM --no-defaults -e "start backup" >> $NDB_TOOLS_OUTPUT

ndb/include/ndbapi/Ndb.hpp

+16 −4

File changed.

Preview size limit exceeded, changes collapsed.

ndb/include/ndbapi/NdbDictionary.hpp

+12 −12

File changed.

Preview size limit exceeded, changes collapsed.

ndb/include/ndbapi/NdbReceiver.hpp

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public: 
  };

  

  NdbReceiver(Ndb *aNdb);

  void init(ReceiverType type, void* owner);

  int init(ReceiverType type, void* owner);

  void release();

  ~NdbReceiver();
@@ -75,7 +75,7 @@ private: 
   * At setup

   */

  class NdbRecAttr * getValue(const class NdbColumnImpl*, char * user_dst_ptr);

  void do_get_value(NdbReceiver*, Uint32 rows, Uint32 key_size, Uint32 range);

  int do_get_value(NdbReceiver*, Uint32 rows, Uint32 key_size, Uint32 range);

  void prepareSend();

  void calculate_batch_size(Uint32, Uint32, Uint32&, Uint32&, Uint32&);