Commit 641ce5e9 authored by unknown's avatar unknown
Browse files

wl2723 - ndb opt. nr 


mysql-test/t/rpl_multi_engine.test:
  merge fix
libmysqld/sql_tablespace.cc:
  New BitKeeper file ``libmysqld/sql_tablespace.cc''
mysql-test/r/ndb_basic_disk.result:
  New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
mysql-test/t/ndb_basic_disk.test:
  New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
sql/sql_tablespace.cc:
  New BitKeeper file ``sql/sql_tablespace.cc''
storage/ndb/src/kernel/blocks/OptNR.txt:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
storage/ndb/src/kernel/vm/mem.txt:
  New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
storage/ndb/tools/ndb_error_reporter:
  New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''
parent 2c0f53d6

libmysqld/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \

	item_xmlfunc.cc \

        rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc

        rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc \

        sql_tablespace.cc



libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)

EXTRA_libmysqld_a_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \

mysql-test/r/ndb_basic_disk.result

0 → 100644
+397 −0
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M

UNDO_BUFFER_SIZE = 1M

ENGINE=NDB;

alter logfile group lg1

add undofile 'undofile02.dat'

initial_size 4M engine=ndb;

CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 12M

ENGINE NDB;

alter tablespace ts1

add datafile 'datafile02.dat'

initial_size 4M engine=ndb;

CREATE TABLE t1

(pk1 int not null primary key, b int not null, c int not null)

tablespace ts1 storage disk

engine ndb;

INSERT INTO t1 VALUES (0, 0, 0);

SELECT * FROM t1;

pk1	b	c

0	0	0

INSERT INTO t1 VALUES 

(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),

(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10),

(11,11,11),(12,12,12),(13,13,13),(14,14,14),(15,15,15),

(16,16,16),(17,17,17),(18,18,18),(19,19,19),(20,20,20),

(21,21,21),(22,22,22),(23,23,23),(24,24,24),(25,25,25),

(26,26,26),(27,27,27),(28,28,28),(29,29,29),(30,30,30),

(31,31,31),(32,32,32),(33,33,33),(34,34,34),(35,35,35),

(36,36,36),(37,37,37),(38,38,38),(39,39,39),(40,40,40),

(41,41,41),(42,42,42),(43,43,43),(44,44,44),(45,45,45),

(46,46,46),(47,47,47),(48,48,48),(49,49,49),(50,50,50),

(51,51,51),(52,52,52),(53,53,53),(54,54,54),(55,55,55),

(56,56,56),(57,57,57),(58,58,58),(59,59,59),(60,60,60),

(61,61,61),(62,62,62),(63,63,63),(64,64,64),(65,65,65),

(66,66,66),(67,67,67),(68,68,68),(69,69,69),(70,70,70),

(71,71,71),(72,72,72),(73,73,73),(74,74,74),(75,75,75),

(76,76,76),(77,77,77),(78,78,78),(79,79,79),(80,80,80),

(81,81,81),(82,82,82),(83,83,83),(84,84,84),(85,85,85),

(86,86,86),(87,87,87),(88,88,88),(89,89,89),(90,90,90),

(91,91,91),(92,92,92),(93,93,93),(94,94,94),(95,95,95),

(96,96,96),(97,97,97),(98,98,98),(99,99,99),(100,100,100),

(101,101,101),(102,102,102),(103,103,103),(104,104,104),(105,105,105),

(106,106,106),(107,107,107),(108,108,108),(109,109,109),(110,110,110),

(111,111,111),(112,112,112),(113,113,113),(114,114,114),(115,115,115),

(116,116,116),(117,117,117),(118,118,118),(119,119,119),(120,120,120),

(121,121,121),(122,122,122),(123,123,123),(124,124,124),(125,125,125),

(126,126,126),(127,127,127),(128,128,128),(129,129,129),(130,130,130),

(131,131,131),(132,132,132),(133,133,133),(134,134,134),(135,135,135),

(136,136,136),(137,137,137),(138,138,138),(139,139,139),(140,140,140),

(141,141,141),(142,142,142),(143,143,143),(144,144,144),(145,145,145),

(146,146,146),(147,147,147),(148,148,148),(149,149,149),(150,150,150),

(151,151,151),(152,152,152),(153,153,153),(154,154,154),(155,155,155),

(156,156,156),(157,157,157),(158,158,158),(159,159,159),(160,160,160),

(161,161,161),(162,162,162),(163,163,163),(164,164,164),(165,165,165),

(166,166,166),(167,167,167),(168,168,168),(169,169,169),(170,170,170),

(171,171,171),(172,172,172),(173,173,173),(174,174,174),(175,175,175),

(176,176,176),(177,177,177),(178,178,178),(179,179,179),(180,180,180),

(181,181,181),(182,182,182),(183,183,183),(184,184,184),(185,185,185),

(186,186,186),(187,187,187),(188,188,188),(189,189,189),(190,190,190),

(191,191,191),(192,192,192),(193,193,193),(194,194,194),(195,195,195),

(196,196,196),(197,197,197),(198,198,198),(199,199,199),(200,200,200),

(201,201,201),(202,202,202),(203,203,203),(204,204,204),(205,205,205),

(206,206,206),(207,207,207),(208,208,208),(209,209,209),(210,210,210),

(211,211,211),(212,212,212),(213,213,213),(214,214,214),(215,215,215),

(216,216,216),(217,217,217),(218,218,218),(219,219,219),(220,220,220),

(221,221,221),(222,222,222),(223,223,223),(224,224,224),(225,225,225),

(226,226,226),(227,227,227),(228,228,228),(229,229,229),(230,230,230),

(231,231,231),(232,232,232),(233,233,233),(234,234,234),(235,235,235),

(236,236,236),(237,237,237),(238,238,238),(239,239,239),(240,240,240),

(241,241,241),(242,242,242),(243,243,243),(244,244,244),(245,245,245),

(246,246,246),(247,247,247),(248,248,248),(249,249,249),(250,250,250),

(251,251,251),(252,252,252),(253,253,253),(254,254,254),(255,255,255),

(256,256,256),(257,257,257),(258,258,258),(259,259,259),(260,260,260),

(261,261,261),(262,262,262),(263,263,263),(264,264,264),(265,265,265),

(266,266,266),(267,267,267),(268,268,268),(269,269,269),(270,270,270),

(271,271,271),(272,272,272),(273,273,273),(274,274,274),(275,275,275),

(276,276,276),(277,277,277),(278,278,278),(279,279,279),(280,280,280),

(281,281,281),(282,282,282),(283,283,283),(284,284,284),(285,285,285),

(286,286,286),(287,287,287),(288,288,288),(289,289,289),(290,290,290),

(291,291,291),(292,292,292),(293,293,293),(294,294,294),(295,295,295),

(296,296,296),(297,297,297),(298,298,298),(299,299,299),(300,300,300),

(301,301,301),(302,302,302),(303,303,303),(304,304,304),(305,305,305),

(306,306,306),(307,307,307),(308,308,308),(309,309,309),(310,310,310),

(311,311,311),(312,312,312),(313,313,313),(314,314,314),(315,315,315),

(316,316,316),(317,317,317),(318,318,318),(319,319,319),(320,320,320),

(321,321,321),(322,322,322),(323,323,323),(324,324,324),(325,325,325),

(326,326,326),(327,327,327),(328,328,328),(329,329,329),(330,330,330),

(331,331,331),(332,332,332),(333,333,333),(334,334,334),(335,335,335),

(336,336,336),(337,337,337),(338,338,338),(339,339,339),(340,340,340),

(341,341,341),(342,342,342),(343,343,343),(344,344,344),(345,345,345),

(346,346,346),(347,347,347),(348,348,348),(349,349,349),(350,350,350),

(351,351,351),(352,352,352),(353,353,353),(354,354,354),(355,355,355),

(356,356,356),(357,357,357),(358,358,358),(359,359,359),(360,360,360),

(361,361,361),(362,362,362),(363,363,363),(364,364,364),(365,365,365),

(366,366,366),(367,367,367),(368,368,368),(369,369,369),(370,370,370),

(371,371,371),(372,372,372),(373,373,373),(374,374,374),(375,375,375),

(376,376,376),(377,377,377),(378,378,378),(379,379,379),(380,380,380),

(381,381,381),(382,382,382),(383,383,383),(384,384,384),(385,385,385),

(386,386,386),(387,387,387),(388,388,388),(389,389,389),(390,390,390),

(391,391,391),(392,392,392),(393,393,393),(394,394,394),(395,395,395),

(396,396,396),(397,397,397),(398,398,398),(399,399,399),(400,400,400),

(401,401,401),(402,402,402),(403,403,403),(404,404,404),(405,405,405),

(406,406,406),(407,407,407),(408,408,408),(409,409,409),(410,410,410),

(411,411,411),(412,412,412),(413,413,413),(414,414,414),(415,415,415),

(416,416,416),(417,417,417),(418,418,418),(419,419,419),(420,420,420),

(421,421,421),(422,422,422),(423,423,423),(424,424,424),(425,425,425),

(426,426,426),(427,427,427),(428,428,428),(429,429,429),(430,430,430),

(431,431,431),(432,432,432),(433,433,433),(434,434,434),(435,435,435),

(436,436,436),(437,437,437),(438,438,438),(439,439,439),(440,440,440),

(441,441,441),(442,442,442),(443,443,443),(444,444,444),(445,445,445),

(446,446,446),(447,447,447),(448,448,448),(449,449,449),(450,450,450),

(451,451,451),(452,452,452),(453,453,453),(454,454,454),(455,455,455),

(456,456,456),(457,457,457),(458,458,458),(459,459,459),(460,460,460),

(461,461,461),(462,462,462),(463,463,463),(464,464,464),(465,465,465),

(466,466,466),(467,467,467),(468,468,468),(469,469,469),(470,470,470),

(471,471,471),(472,472,472),(473,473,473),(474,474,474),(475,475,475),

(476,476,476),(477,477,477),(478,478,478),(479,479,479),(480,480,480),

(481,481,481),(482,482,482),(483,483,483),(484,484,484),(485,485,485),

(486,486,486),(487,487,487),(488,488,488),(489,489,489),(490,490,490),

(491,491,491),(492,492,492),(493,493,493),(494,494,494),(495,495,495),

(496,496,496),(497,497,497),(498,498,498),(499,499,499),(500, 500, 500);

SELECT COUNT(*) FROM t1;

COUNT(*)

501

CREATE LOGFILE GROUP lg2

ADD UNDOFILE 'x.dat'

INITIAL_SIZE 10y

engine = ndb;

ERROR HY000: A size parameter was incorrectly specified, either number or on the form 10M

CREATE LOGFILE GROUP lg2

ADD UNDOFILE 'x.dat'

INITIAL_SIZE 10MB

engine=ndb;

ERROR HY000: A size parameter was incorrectly specified, either number or on the form 10M

CREATE LOGFILE GROUP lg2

ADD UNDOFILE 'x.dat'

INITIAL_SIZE 10 MB

engine=ndb;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MB

engine=ndb' at line 3

CREATE LOGFILE GROUP lg2

ADD UNDOFILE 'x.dat'

INITIAL_SIZE 10 M

engine=ndb;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'M

engine=ndb' at line 3

CREATE LOGFILE GROUP lg2

ADD UNDOFILE 'x.dat'

INITIAL_SIZE 1000000000000K

engine=ndb;

ERROR HY000: The size number was correct but we don't allow the digit part to be more than 2 billion

DROP TABLE t1;

create table t1 (a int primary key, b char(4) not null, c char(4) not null, key(b)) tablespace ts1 storage disk engine ndb;

insert into t1 values (1,'1','1'), (2,'2','2'), (3,'3','3');

begin;

update t1 set b = '2' where a = 1;

select b from t1 where a = 1;

b

2

select * from t1 where a = 1;

a	b	c

1	2	1

update t1 set c = '2' where a = 1;

select b from t1 where a = 1;

b

2

select * from t1 where a = 1;

a	b	c

1	2	2

update t1 set b = '3' where a = 1;

select b from t1 where a = 1;

b

3

select * from t1 where a = 1;

a	b	c

1	3	2

commit;

select * from t1 order by 1;

a	b	c

1	3	2

2	2	2

3	3	3

begin;

update t1 set c = '3' where a = 1;

select b from t1 where a = 1;

b

3

select * from t1 where a = 1;

a	b	c

1	3	3

update t1 set b = '4' where a = 1;

select b from t1 where a = 1;

b

4

select * from t1 where a = 1;

a	b	c

1	4	3

update t1 set c = '4' where a = 1;

select b from t1 where a = 1;

b

4

select * from t1 where a = 1;

a	b	c

1	4	4

commit;

select * from t1 order by 1;

a	b	c

1	4	4

2	2	2

3	3	3

update t1 set b = '5' where a = 1;

select * from t1 order by 1;

a	b	c

1	5	4

2	2	2

3	3	3

update t1 set b = '6'  where b = '5';

select * from t1 order by 1;

a	b	c

1	6	4

2	2	2

3	3	3

update t1 set b = '7'  where c = '4';

select * from t1 order by 1;

a	b	c

1	7	4

2	2	2

3	3	3

update t1 set c = '5' where a = 1;

select * from t1 order by 1;

a	b	c

1	7	5

2	2	2

3	3	3

update t1 set c = '6'  where b = '7';

select * from t1 order by 1;

a	b	c

1	7	6

2	2	2

3	3	3

update t1 set c = '7'  where c = '6';

select * from t1 order by 1;

a	b	c

1	7	7

2	2	2

3	3	3

drop table t1;

create table t1 (a int primary key, b varchar(4) not null, c char(4) not null, key(b)) tablespace ts1 storage disk engine ndb;

insert into t1 values (1,'1','1'), (2,'2','2'), (3,'3','3');

begin;

update t1 set b = '2' where a = 1;

select b from t1 where a = 1;

b

2

select * from t1 where a = 1;

a	b	c

1	2	1

update t1 set c = '2' where a = 1;

select b from t1 where a = 1;

b

2

select * from t1 where a = 1;

a	b	c

1	2	2

update t1 set b = '3' where a = 1;

select b from t1 where a = 1;

b

3

select * from t1 where a = 1;

a	b	c

1	3	2

commit;

select * from t1 order by 1;

a	b	c

1	3	2

2	2	2

3	3	3

begin;

update t1 set c = '3' where a = 1;

select b from t1 where a = 1;

b

3

select * from t1 where a = 1;

a	b	c

1	3	3

update t1 set b = '4' where a = 1;

select b from t1 where a = 1;

b

4

select * from t1 where a = 1;

a	b	c

1	4	3

update t1 set c = '4' where a = 1;

select b from t1 where a = 1;

b

4

select * from t1 where a = 1;

a	b	c

1	4	4

commit;

select * from t1 order by 1;

a	b	c

1	4	4

2	2	2

3	3	3

update t1 set b = '5' where a = 1;

select * from t1 order by 1;

a	b	c

1	5	4

2	2	2

3	3	3

update t1 set b = '6'  where b = '5';

select * from t1 order by 1;

a	b	c

1	6	4

2	2	2

3	3	3

update t1 set b = '7'  where c = '4';

select * from t1 order by 1;

a	b	c

1	7	4

2	2	2

3	3	3

update t1 set c = '5' where a = 1;

select * from t1 order by 1;

a	b	c

1	7	5

2	2	2

3	3	3

update t1 set c = '6'  where b = '7';

select * from t1 order by 1;

a	b	c

1	7	6

2	2	2

3	3	3

update t1 set c = '7'  where c = '6';

select * from t1 order by 1;

a	b	c

1	7	7

2	2	2

3	3	3

drop table t1;

create table t1 (

a int not null primary key,

b text not null

) tablespace ts1 storage disk engine=ndbcluster;

set @x0 = '01234567012345670123456701234567';

set @x0 = concat(@x0,@x0,@x0,@x0,@x0,@x0,@x0,@x0);

set @b1 = 'b1';

set @b1 = concat(@b1,@b1,@b1,@b1,@b1,@b1,@b1,@b1,@b1,@b1);

set @b1 = concat(@b1,@b1,@b1,@b1,@b1,@b1,@b1,@b1,@b1,@b1);

set @b1 = concat(@b1,@b1,@b1,@b1,@b1,@b1,@b1,@b1,@b1,@b1);

set @b1 = concat(@b1,@x0);

set @b2 = 'b2';

set @b2 = concat(@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2);

set @b2 = concat(@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2);

set @b2 = concat(@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2);

set @b2 = concat(@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2);

insert into t1 values(1,@b1);

insert into t1 values(2,@b2);

select a,length(b),substr(b,1+2*900,2) from t1 where a=1;

a	length(b)	substr(b,1+2*900,2)

1	2256	b1

select a,length(b),substr(b,1+2*9000,2) from t1 where a=2;

a	length(b)	substr(b,1+2*9000,2)

2	20000	b2

update t1 set b=@b2 where a=1;

update t1 set b=@b1 where a=2;

select a,length(b),substr(b,1+2*9000,2) from t1 where a=1;

a	length(b)	substr(b,1+2*9000,2)

1	20000	b2

select a,length(b),substr(b,1+2*900,2) from t1 where a=2;

a	length(b)	substr(b,1+2*900,2)

2	2256	b1

update t1 set b=concat(b,b) where a=1;

update t1 set b=concat(b,b) where a=2;

select a,length(b),substr(b,1+4*9000,2) from t1 where a=1;

a	length(b)	substr(b,1+4*9000,2)

1	40000	b2

select a,length(b),substr(b,1+4*900,2) from t1 where a=2;

a	length(b)	substr(b,1+4*900,2)

2	4512	b1

delete from t1 where a=1;

delete from t1 where a=2;

select count(*) from t1;

count(*)

0

drop table t1;

alter tablespace ts1 drop datafile 'datafile.dat' engine = ndb;

alter tablespace ts1 drop datafile 'datafile02.dat' engine = ndb;

drop tablespace ts1 engine = ndb;

drop logfile group lg1 engine = ndb;

mysql-test/r/ndb_partition_key.result

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ Temporary table: no 
Number of attributes: 4

Number of primary keys: 3

Length of frm data: #

Row Checksum: 1

Row GCI: 1

TableStatus: Retrieved

-- Attributes -- 

a Int PRIMARY KEY AT=FIXED ST=MEMORY

mysql-test/t/ndb_basic_disk.test

0 → 100644
+312 −0

File added.

Preview size limit exceeded, changes collapsed.

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ 
			sp_head.cc sp_pcontext.cc  sp_rcontext.cc sp.cc \

			sp_cache.cc parse_file.cc sql_trigger.cc \

			sql_plugin.cc sql_binlog.cc \

			handlerton.cc

			handlerton.cc sql_tablespace.cc

EXTRA_mysqld_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \

			ha_innodb.h  ha_berkeley.h  ha_archive.h \

			ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \