Commit 135adc63 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/mysql-5.1-new
parents 2230bc97 f2394839

mysql-test/r/ndb_binlog_discover.result

0 → 100644
+13 −0
Original line number Diff line number Diff line 
drop table if exists t1;

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

reset master;

insert into t1 values(1);

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Table_map	#	#	table_id: # (cluster.apply_status)

master-bin.000001	#	Write_rows	#	#	table_id: #

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	COMMIT

drop table t1;

mysql-test/r/ndb_dd_basic.result

+22 −1
Original line number Diff line number Diff line
@@ -3,11 +3,32 @@ CREATE LOGFILE GROUP lg1 
ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M

UNDO_BUFFER_SIZE = 1M

ENGINE=NDB;

ENGINE=MYISAM;

Warnings:

Error	1539	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'

ALTER LOGFILE GROUP lg1

ADD UNDOFILE 'undofile02.dat'

INITIAL_SIZE = 4M 

ENGINE=XYZ;

Warnings:

Error	1266	Using storage engine MyISAM for table 'lg1'

Error	1539	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'

CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 12M;

Warnings:

Error	1539	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'

set storage_engine=ndb;

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M

UNDO_BUFFER_SIZE = 1M;

ALTER LOGFILE GROUP lg1

ADD UNDOFILE 'undofile02.dat'

INITIAL_SIZE = 4M 

ENGINE=NDB;

set storage_engine=myisam;

CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1

mysql-test/r/ndb_restore.result

+6 −0
Original line number Diff line number Diff line
@@ -528,6 +528,9 @@ SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID; 
SYSTEM_VALUES_ID	VALUE

0	4767

1	6

SELECT * FROM cluster.apply_status WHERE server_id=0;

server_id	epoch

0	314

TRUNCATE GL;

TRUNCATE ACCOUNT;

TRUNCATE TRANSACTION;
@@ -579,4 +582,7 @@ SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID; 
SYSTEM_VALUES_ID	VALUE

0	2297

1	5

SELECT * FROM cluster.apply_status WHERE server_id=0;

server_id	epoch

0	331

DROP DATABASE BANK;

mysql-test/t/ndb_binlog_discover.test

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

-- source include/have_binlog_format_row.inc



--disable_warnings

drop table if exists t1;

--enable_warnings



#

# Bug #14516 Restart of cluster can cause NDB API replication failure

#

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

reset master;

--exec $NDB_MGM --no-defaults -e "all restart -n" > /dev/null

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --not-started > /dev/null

--exec $NDB_MGM --no-defaults -e "all start" > /dev/null

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null

insert into t1 values(1);

--source include/show_binlog_events.inc

drop table t1;

mysql-test/t/ndb_dd_basic.test

+20 −2
Original line number Diff line number Diff line
@@ -14,16 +14,33 @@ 
DROP TABLE IF EXISTS t1;

--enable_warnings



# some negative tests

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M

UNDO_BUFFER_SIZE = 1M

ENGINE=MYISAM;



ALTER LOGFILE GROUP lg1

ADD UNDOFILE 'undofile02.dat'

INITIAL_SIZE = 4M 

ENGINE=XYZ;



CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 12M;



##################################

# Basic test of disk tables for NDB

# Start by creating a logfile group

##################################



set storage_engine=ndb;

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M

UNDO_BUFFER_SIZE = 1M

ENGINE=NDB;

UNDO_BUFFER_SIZE = 1M;



ALTER LOGFILE GROUP lg1

ADD UNDOFILE 'undofile02.dat'
@@ -34,6 +51,7 @@ ENGINE=NDB; 
# Create a tablespace connected to the logfile group

###################################################



set storage_engine=myisam;

CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1