Commit b1a3417b authored by unknown's avatar unknown
Browse files

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

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
parents 26dab541 7f7c6246

VC++Files/sql/mysqld.vcproj

+75 −0
Original line number Diff line number Diff line
@@ -4526,6 +4526,81 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="partition_info.cpp">

			<FileConfiguration

				Name="classic nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Max|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Max nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="parse_file.cpp">

			<FileConfiguration

mysql-test/r/ndb_partition_error.result

+8 −0
Original line number Diff line number Diff line
@@ -28,3 +28,11 @@ partitions 3 
partition x2 values less than (10),

partition x3 values less than (20));

drop table t1;

CREATE TABLE t1 (id INT) ENGINE=NDB

PARTITION BY LIST(id)

(PARTITION p0 VALUES IN (2, 4),

PARTITION p1 VALUES IN (42, 142));

INSERT INTO t1 VALUES (2);

UPDATE t1 SET id=5 WHERE id=2;

ERROR HY000: Table has no partition for value 5

DROP TABLE t1;

mysql-test/r/ndb_partition_range.result

+104 −0
Original line number Diff line number Diff line
@@ -117,3 +117,107 @@ t1 CREATE TABLE `t1` ( 
  UNIQUE KEY `a` (`a`)

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (b) (PARTITION x1 VALUES LESS THAN (5) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (10) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (20) ENGINE = ndbcluster)

drop table t1;

CREATE TABLE t1

(id MEDIUMINT NOT NULL,

b1 BIT(8),

vc VARCHAR(255),

bc CHAR(255),

d DECIMAL(10,4) DEFAULT 0,

f FLOAT DEFAULT 0,

total BIGINT UNSIGNED,

y YEAR,

t DATE) ENGINE=NDB

PARTITION BY RANGE (YEAR(t))

(PARTITION p0 VALUES LESS THAN (1901),

PARTITION p1 VALUES LESS THAN (1946),

PARTITION p2 VALUES LESS THAN (1966),

PARTITION p3 VALUES LESS THAN (1986),

PARTITION p4 VALUES LESS THAN (2005),

PARTITION p5 VALUES LESS THAN MAXVALUE);

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

SELECT * FROM t1;

id	b1	vc	bc	d	f	total	y	t

0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL

ALTER TABLE t1 ENGINE=MYISAM;

SELECT * FROM t1;

id	b1	vc	bc	d	f	total	y	t

0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL

DROP TABLE t1;

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

  INITIAL_SIZE 16M

UNDO_BUFFER_SIZE=1M

ENGINE=NDB;

CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

  USE LOGFILE GROUP lg1

INITIAL_SIZE 12M

ENGINE NDB;

CREATE TABLE test.t1 (

a1 INT,

a2 TEXT NOT NULL,

a3 BIT NOT NULL,

a4 DECIMAL(8,3),

a5 INT NOT NULL,

a6 VARCHAR(255),

PRIMARY KEY(a1))

TABLESPACE ts1 STORAGE DISK ENGINE=NDB

PARTITION BY LIST (a1)

(PARTITION p0 VALUES IN (1,2,3,4,5),

PARTITION p1 VALUES IN (6,7,8,9, 10),

PARTITION p2 VALUES IN (11, 12, 13, 14, 15));

SELECT COUNT(*) FROM test.t1;

COUNT(*)

15

ALTER TABLE test.t1 DROP COLUMN a4;

SELECT COUNT(*) FROM test.t1;

COUNT(*)

15

DROP TABLE t1;

CREATE TABLE test.t1 (

a1 INT,

a2 TEXT NOT NULL,

a3 BIT NOT NULL,

a4 DECIMAL(8,3),

a5 INT NOT NULL,

a6 VARCHAR(255),

PRIMARY KEY(a1))

TABLESPACE ts1 STORAGE DISK ENGINE=NDB

PARTITION BY HASH(a1)

PARTITIONS 4;

SELECT COUNT(*) FROM test.t1;

COUNT(*)

15

ALTER TABLE test.t1 DROP COLUMN a4;

SELECT COUNT(*) FROM test.t1;

COUNT(*)

15

DROP TABLE t1;

ALTER TABLESPACE ts1 

DROP DATAFILE 'datafile.dat' 

ENGINE=NDB;

DROP TABLESPACE ts1 ENGINE=NDB;

DROP LOGFILE GROUP lg1 ENGINE=NDB;

CREATE TABLE t1

(id MEDIUMINT NOT NULL,

b1 BIT(8),

vc VARCHAR(255),

bc CHAR(255),

d DECIMAL(10,4) DEFAULT 0,

f FLOAT DEFAULT 0,

total BIGINT UNSIGNED,

y YEAR,

t DATE) ENGINE=NDB

PARTITION BY LIST(id)

(PARTITION p0 VALUES IN (2, 4),

PARTITION p1 VALUES IN (42, 142));

INSERT INTO t1 VALUES (2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

SELECT * FROM t1;

id	b1	vc	bc	d	f	total	y	t

2	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL

ALTER TABLE t1 ADD PARTITION

(PARTITION p2 VALUES IN (412));

SELECT * FROM t1;

id	b1	vc	bc	d	f	total	y	t

2	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL

DROP TABLE t1;

mysql-test/r/xml.result

+2 −0
Original line number Diff line number Diff line
@@ -544,3 +544,5 @@ extractvalue('<a>a<b>B</b></a>','a|/b') 
a

select extractvalue('<a>A</a>','/<a>');

ERROR HY000: XPATH syntax error: '>'

select extractvalue('<a><b>b</b><b!>b!</b!></a>','//b!');

ERROR HY000: XPATH syntax error: '!'

mysql-test/t/ndb_partition_error.test

+12 −0
Original line number Diff line number Diff line
@@ -44,3 +44,15 @@ partitions 3 
 partition x3 values less than (20));



drop table t1;



#

# Bug #17763 mysqld cores with list partitioning if update to missing partition

#

CREATE TABLE t1 (id INT) ENGINE=NDB

  PARTITION BY LIST(id)

   (PARTITION p0 VALUES IN (2, 4),

    PARTITION p1 VALUES IN (42, 142));

INSERT INTO t1 VALUES (2);

--error ER_NO_PARTITION_FOR_GIVEN_VALUE

UPDATE t1 SET id=5 WHERE id=2;

DROP TABLE t1;