Commit cfbb40bb authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.1-release 

into  mysql.com:/home/bk/mysql-5.1-release-bug13418-lars


mysql-test/t/disabled.def:
  Auto merged
parents 50397f3f a9dab911

client/mysqlimport.c

+0 −2
Original line number Diff line number Diff line
@@ -145,13 +145,11 @@ static struct my_option my_long_options[] = 
   (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#include <sslopt-longopts.h>

#if 0

  {"use-threads", OPT_USE_THREADS,

   "Load files in parallel. The argument is the number "

   "of threads to use for loading data.",

   (gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0, 

   GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#endif

#ifndef DONT_ALLOW_USER_CHANGE

  {"user", 'u', "User for login if not current user.", (gptr*) &current_user,

   (gptr*) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

mysql-test/r/mysqldump.result

+30 −0
Original line number Diff line number Diff line
@@ -2650,3 +2650,33 @@ DELIMITER ; 


DROP TRIGGER tr1;

DROP TABLE t1;

create table t1 (a text , b text);

create table t2 (a text , b text);

insert t1 values ("Duck, Duck", "goose");

insert t1 values ("Duck, Duck", "pidgeon");

insert t2 values ("We the people", "in order to perform");

insert t2 values ("a more perfect", "union");

select * from t1;

a	b

Duck, Duck	goose

Duck, Duck	pidgeon

select * from t2;

a	b

We the people	in order to perform

a more perfect	union

test.t1: Records: 2  Deleted: 0  Skipped: 0  Warnings: 0

test.t2: Records: 2  Deleted: 0  Skipped: 0  Warnings: 0

select * from t1;

a	b

Duck, Duck	goose

Duck, Duck	pidgeon

Duck, Duck	goose

Duck, Duck	pidgeon

select * from t2;

a	b

We the people	in order to perform

a more perfect	union

We the people	in order to perform

a more perfect	union

drop table t1;

drop table t2;

mysql-test/r/partition.result

+33 −0
Original line number Diff line number Diff line
@@ -315,4 +315,37 @@ drop table t1; 
create table t1 (s1 int, unique (s1)) partition by list (s1) (partition x1 VALUES in (10), partition x2 values in (20));

alter table t1 add partition (partition x3 values in (30));

drop table t1;

CREATE TABLE t1 (

f_int1 INTEGER, f_int2 INTEGER,

f_char1 CHAR(10), f_char2 CHAR(10), f_charbig VARCHAR(1000)

)

PARTITION BY RANGE(f_int1 DIV 2)

SUBPARTITION BY HASH(f_int1)

SUBPARTITIONS 2

(PARTITION parta VALUES LESS THAN (0),

PARTITION partb VALUES LESS THAN (5),

PARTITION parte VALUES LESS THAN (10),

PARTITION partf VALUES LESS THAN (2147483647));

INSERT INTO t1 SET f_int1 = NULL , f_int2 = -20, f_char1 = CAST(-20 AS CHAR),

f_char2 = CAST(-20 AS CHAR), f_charbig = '#NULL#';

SELECT * FROM t1 WHERE f_int1 IS NULL;

f_int1	f_int2	f_char1	f_char2	f_charbig

NULL	-20	-20	-20	#NULL#

SELECT * FROM t1;

f_int1	f_int2	f_char1	f_char2	f_charbig

NULL	-20	-20	-20	#NULL#

drop table t1;

CREATE TABLE t1 (

f_int1 INTEGER, f_int2 INTEGER,

f_char1 CHAR(10), f_char2 CHAR(10), f_charbig VARCHAR(1000)  )

PARTITION BY LIST(MOD(f_int1,2))

SUBPARTITION BY KEY(f_int1)

(PARTITION part1 VALUES IN (-1) (SUBPARTITION sp1, SUBPARTITION sp2),

PARTITION part2 VALUES IN (0) (SUBPARTITION sp3, SUBPARTITION sp5),

PARTITION part3 VALUES IN (1) (SUBPARTITION sp4, SUBPARTITION sp6));

INSERT INTO t1 SET f_int1 = 2, f_int2 = 2, f_char1 = '2', f_char2 = '2', f_charbig = '===2===';

INSERT INTO t1 SET f_int1 = 2, f_int2 = 2, f_char1 = '2', f_char2 = '2', f_charbig = '===2===';

SELECT * FROM t1 WHERE f_int1  IS NULL;

f_int1	f_int2	f_char1	f_char2	f_charbig

drop table t1;

End of 5.1 tests

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -36,4 +36,3 @@ rpl_sp : Bug#16456 
rpl_until               : Unstable test case, bug#15886

sp-goto                 : GOTO is currently is disabled - will be fixed in the future

rpl_ndb_log             : results are not deterministic
 
mysqldump               : Bug#17443 mysqlimport --use-threads=5 gives crashes

mysql-test/t/mysqldump.test

+0 −2
Original line number Diff line number Diff line
@@ -1049,7 +1049,6 @@ SET SQL_MODE = @old_sql_mode; 
DROP TRIGGER tr1;

DROP TABLE t1;



--disable_parsing

#

# Added for use-thread option

#
@@ -1073,4 +1072,3 @@ select * from t2; 


drop table t1;

drop table t2;
 
--enable_parsing