Commit d7d940ee authored by unknown's avatar unknown
Browse files

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql51
parents 6387eb20 0a1351c1

mysql-test/r/ndb_alter_table_row.result

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ a b c 
2	two	two

alter table t1 drop index c;

select * from t1 where c = 'two';

ERROR HY000: Table definition has changed, please retry transaction

select * from t1 where c = 'two';

a	b	c

2	two	two

drop table t1;

mysql-test/r/ndb_binlog_ddl_multi.result

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

drop database if exists mysqltest;

drop table if exists t1,t2;

drop database if exists mysqltest;

reset master;

reset master;

create database mysqltest;

use mysqltest;

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

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

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin1.000001	#	Query	#	#	create database mysqltest

master-bin1.000001	#	Query	#	#	use `mysqltest`; create table t1 (a int primary key) engine=ndb

master-bin1.000001	#	Query	#	#	use `test`; create table t2 (a int primary key) engine=ndb

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	create database mysqltest

master-bin.000001	#	Query	#	#	use `mysqltest`; create table t1 (a int primary key) engine=ndb

master-bin.000001	#	Query	#	#	use `test`; create table t2 (a int primary key) engine=ndb

reset master;

reset master;

use mysqltest;

drop table test.t2;

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

alter table t2 add column (b int);

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `mysqltest`; drop table test.t2

master-bin1.000001	#	Query	#	#	use `mysqltest`; create table t2 (a int primary key) engine=ndb

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `mysqltest`; alter table t2 add column (b int)

reset master;

reset master;

ALTER DATABASE mysqltest CHARACTER SET latin1;

insert into t1 values (1);

drop table t1;

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	ALTER DATABASE mysqltest CHARACTER SET latin1

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	cluster_replication.apply_status

master-bin.000001	#	Write_rows	#	#	

master-bin.000001	#	Table_map	#	#	mysqltest.t1

master-bin.000001	#	Write_rows	#	#	

master-bin.000001	#	Query	#	#	COMMIT

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	cluster_replication.apply_status

master-bin.000001	#	Write_rows	#	#	

master-bin.000001	#	Query	#	#	COMMIT

master-bin.000001	#	Query	#	#	use `mysqltest`; drop table `t1`

reset master;

reset master;

insert into t2 values (1,2);

drop database mysqltest;

use test;

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

use test;

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Table_map	#	#	mysqltest.t2

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	drop database mysqltest

master-bin1.000001	#	Query	#	#	use `test`; create table t1 (a int primary key) engine=ndb

reset master;

reset master;

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;

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;

drop table t1;

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin1.000001	#	Query	#	#	CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M

UNDO_BUFFER_SIZE = 1M

ENGINE=NDB

master-bin1.000001	#	Query	#	#	ALTER LOGFILE GROUP lg1

ADD UNDOFILE 'undofile02.dat'

INITIAL_SIZE = 4M 

ENGINE=NDB

master-bin1.000001	#	Query	#	#	CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 12M

ENGINE NDB

master-bin1.000001	#	Query	#	#	ALTER TABLESPACE ts1

ADD DATAFILE 'datafile02.dat'

INITIAL_SIZE = 4M 

ENGINE=NDB

master-bin1.000001	#	Query	#	#	ALTER TABLESPACE ts1 

DROP DATAFILE 'datafile.dat' 

ENGINE = NDB

master-bin1.000001	#	Query	#	#	ALTER TABLESPACE ts1 

DROP DATAFILE 'datafile02.dat' 

ENGINE = NDB

master-bin1.000001	#	Query	#	#	DROP TABLESPACE ts1 

ENGINE = NDB

master-bin1.000001	#	Query	#	#	DROP LOGFILE GROUP lg1 

ENGINE =NDB

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `test`; drop table `t1`

mysql-test/r/ndb_database.result

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

drop database if exists mysqltest;

drop table if exists t1;

drop database if exists mysqltest;

create database mysqltest;

create database mysqltest;

create table mysqltest.t1 (a int primary key, b int) engine=ndb;

use mysqltest;
@@ -10,18 +6,8 @@ show tables; 
Tables_in_mysqltest

t1

drop database mysqltest;

use mysqltest;

show tables;

Tables_in_mysqltest

create database mysqltest;

create table mysqltest.t1 (c int, d int primary key) engine=ndb;

use mysqltest;

show tables;

Tables_in_mysqltest

t1

drop database mysqltest;
 
use mysqltest;

show tables;

Tables_in_mysqltest

drop table if exists t1;

drop database if exists mysqltest;

mysql-test/r/ndb_multi_row.result

+0 −6
Original line number Diff line number Diff line
@@ -50,15 +50,9 @@ a 
select * from t3;

a	b	c	last_col

1	Hi!	89	Longtext column

show status like 'handler_discover%';

Variable_name	Value

Handler_discover	1

show tables like 't4';

Tables_in_test (t4)

t4

show status like 'handler_discover%';

Variable_name	Value

Handler_discover	2

show tables;

Tables_in_test

t1

mysql-test/t/ndb_alter_table_row.test

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ select * from t1 where c = 'two'; 
connection server1;

alter table t1 drop index c;

connection server2;

--error 1412

select * from t1 where c = 'two';

--sleep 5

select * from t1 where c = 'two';

connection server1;

drop table t1;