Commit aca2e92c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
parents e3ced7ad f3a286cc

mysql-test/r/ndb_autodiscover3.result

0 → 100644
+45 −0
Original line number Diff line number Diff line 
drop table if exists t1, t2;

create table t1 (a int key) engine=ndbcluster;

begin;

insert into t1 values (1);

insert into t1 values (2);

ERROR HY000: Got temporary error 4025 'Node failure caused abort of transaction' from ndbcluster

commit;

ERROR HY000: Got error 4350 'Transaction already aborted' from ndbcluster

drop table t1;

create table t2 (a int, b int, primary key(a,b)) engine=ndbcluster;

insert into t2 values (1,1),(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,1);

select * from t2 order by a limit 3;

a	b

1	1

2	1

3	1

create table t2 (a int key) engine=ndbcluster;

insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

select * from t2 order by a limit 3;

a

1

2

3

select * from t2 order by a limit 3;

ERROR HY000: Can't lock file (errno: 241)

select * from t2 order by a limit 3;

a

1

2

3

show tables;

Tables_in_test

create table t2 (a int key) engine=ndbcluster;

insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

select * from t2 order by a limit 3;

a

1

2

3

select * from t2 order by a limit 3;

a

1

2

3

drop table t2;

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/t/ndb_autodiscover3.test

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

-- source include/have_multi_ndb.inc

-- source include/not_embedded.inc





--disable_warnings

drop table if exists t1, t2;

--enable_warnings



#

# Transaction ongoing while cluster is restarted

#

--connection server1

create table t1 (a int key) engine=ndbcluster;



begin;

insert into t1 values (1);



--exec $NDB_MGM --no-defaults -e "all restart" >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT



--error 1297

insert into t1 values (2);

--error 1296

commit;



drop table t1;



#

# Stale cache after restart -i

#

--connection server1

create table t2 (a int, b int, primary key(a,b)) engine=ndbcluster;

insert into t2 values (1,1),(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,1);

select * from t2 order by a limit 3;



--exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT



--connection server2

create table t2 (a int key) engine=ndbcluster;

insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

select * from t2 order by a limit 3;



# server 1 should have a stale cache, and in this case wrong frm, transaction must be retried

--connection server1

--error 1015

select * from t2 order by a limit 3;

select * from t2 order by a limit 3;



--exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT



--connection server1

show tables;

create table t2 (a int key) engine=ndbcluster;

insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

select * from t2 order by a limit 3;



# server 2 should have a stale cache, but with right frm, transaction need not be retried

--connection server2

select * from t2 order by a limit 3;



drop table t2;

# End of 4.1 tests

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

ndb/include/mgmapi/mgmapi_config_parameters.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#define CFG_DB_BACKUP_DATA_BUFFER_MEM     134

#define CFG_DB_BACKUP_LOG_BUFFER_MEM      135

#define CFG_DB_BACKUP_WRITE_SIZE          136

#define CFG_DB_BACKUP_MAX_WRITE_SIZE      139



#define CFG_LOG_DESTINATION           147