Commit c5644238 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/m51
parents 7c1748a1 7431df60

mysql-test/r/ndb_loaddatalocal.result

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

create table t1(a int) engine=myisam;

select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;

drop table t1;

create table t1(a int) engine=ndb;

load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;

select count(*) from t1;

count(*)

10000

drop table t1;

create table t1(a int) engine=myisam;

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

select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;

drop table t1;

create table t1(a int primary key) engine=ndb;

load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;

select * from t1 order by a;

a

1

2

3

drop table t1;

create table t1(a int) engine=myisam;

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

select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;

drop table t1;

create table t1(a int primary key) engine=ndb;

load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;

select * from t1 order by a;

a

1

2

3

drop table t1;

create table t1(a int) engine=myisam;

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

select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;

drop table t1;

create table t1(a int primary key) engine=ndb;

load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;

select * from t1 order by a;

a

1

2

3

drop table t1;

mysql-test/r/partition.result

+51 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (a bigint)

partition by range (a)

(partition p0 values less than (0xFFFFFFFFFFFFFFFF),

partition p1 values less than (10));

ERROR 42000: VALUES value must be of same type as partition function near '),

partition p1 values less than (10))' at line 3

create table t1 (a bigint)

partition by list (a)

(partition p0 values in (0xFFFFFFFFFFFFFFFF),

partition p1 values in (10));

ERROR 42000: VALUES value must be of same type as partition function near '),

partition p1 values in (10))' at line 3

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (100),

partition p1 values less than MAXVALUE);

insert into t1 values (1);

drop table t1;

create table t1 (a bigint unsigned)

partition by hash (a);

insert into t1 values (0xFFFFFFFFFFFFFFFD);

insert into t1 values (0xFFFFFFFFFFFFFFFE);

select * from t1 where (a + 1) < 10;

a

select * from t1 where (a + 1) > 10;

a

18446744073709551613

18446744073709551614

drop table t1;

create table t1 (a int)

engine = csv

partition by list (a)
@@ -779,6 +808,18 @@ insert into t1 values (null); 
select * from t1 where f1 is null;

f1

NULL

select * from t1 where f1 < 1;

f1

select * from t1 where f1 <= NULL;

f1

select * from t1 where f1 < NULL;

f1

select * from t1 where f1 >= NULL;

f1

select * from t1 where f1 > NULL;

f1

select * from t1 where f1 > 1;

f1

drop table t1;

create table t1 (f1 smallint)

partition by range (f1) (partition p0 values less than (0));
@@ -865,6 +906,16 @@ SHOW TABLE STATUS; 
Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Dynamic	0	0	0	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

DROP TABLE t1;

create table t1 (a bigint unsigned)

partition by list (a)

(partition p0 values in (0-1));

ERROR HY000: Partition constant is out of partition function domain

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (10));

insert into t1 values (0xFFFFFFFFFFFFFFFF);

ERROR HY000: Table has no partition for value 18446744073709551615

drop table t1;

create table t1 (a int)

partition by list (a)

(partition `s1 s2` values in (0));

mysql-test/r/partition_error.result

+4 −0
Original line number Diff line number Diff line
@@ -554,6 +554,10 @@ PARTITION BY RANGE (a) (PARTITION p1 VALUES LESS THAN(5)); 
insert into t1 values (10);

ERROR HY000: Table has no partition for value 10

drop table t1;

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (-1));

ERROR HY000: Partition constant is out of partition function domain

create table t1 (v varchar(12))

partition by range (ascii(v))

(partition p0 values less than (10));

mysql-test/r/partition_range.result

+27 −0
Original line number Diff line number Diff line
@@ -363,6 +363,33 @@ SELECT COUNT(*) FROM t1 WHERE c3 < '2000-12-31'; 
COUNT(*)

10

DROP TABLE t1;

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (10),

partition p1 values less than (0));

ERROR HY000: VALUES LESS THAN value must be strictly increasing for each partition

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (0),

partition p1 values less than (10));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(20) unsigned DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)

drop table t1;

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (2),

partition p1 values less than (10));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(20) unsigned DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (2) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)

insert into t1 values (0xFFFFFFFFFFFFFFFF);

ERROR HY000: Table has no partition for value 18446744073709551615

drop table t1;

create table t1 (a int)

partition by range (MOD(a,3))

subpartition by hash(a)

mysql-test/t/ndb_loaddatalocal.test

0 → 100644
+70 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/not_embedded.inc



--disable_warnings

DROP TABLE IF EXISTS t1;

--enable_warnings



create table t1(a int) engine=myisam;

let $1=10000;

disable_query_log;

set SQL_LOG_BIN=0;

while ($1)

{

 insert into t1 values(1);

 dec $1;

}

set SQL_LOG_BIN=1;

enable_query_log;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;

#This will generate a 20KB file, now test LOAD DATA LOCAL

drop table t1;



create table t1(a int) engine=ndb;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;

select count(*) from t1;

system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile ;

drop table t1;



create table t1(a int) engine=myisam;

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

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;

drop table t1;



create table t1(a int primary key) engine=ndb;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;

system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;

select * from t1 order by a;

drop table t1;



create table t1(a int) engine=myisam;

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

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;

drop table t1;



create table t1(a int primary key) engine=ndb;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;

system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;

select * from t1 order by a;

drop table t1;



create table t1(a int) engine=myisam;

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

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;

drop table t1;



create table t1(a int primary key) engine=ndb;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;

system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;

select * from t1 order by a;

drop table t1;



# End of 4.1 tests