List:Commits« Previous MessageNext Message »
From:tomas Date:January 11 2006 3:27pm
Subject:bk commit into 5.1 tree (tomas:1.2033)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2033 06/01/11 16:26:55 tomas@stripped +6 -0
  split ndb_multi test case

  mysql-test/t/rpl_ndb_disk.test
    1.1 06/01/11 16:26:48 tomas@stripped +79 -0
    New BitKeeper file ``mysql-test/t/rpl_ndb_disk.test''

  mysql-test/t/ndb_multi_row.test
    1.1 06/01/11 16:26:48 tomas@stripped +78 -0
    New BitKeeper file ``mysql-test/t/ndb_multi_row.test''

  mysql-test/t/rpl_ndb_disk.test
    1.0 06/01/11 16:26:48 tomas@stripped +0 -0
    BitKeeper file /home/tomas/v6/mysql-test/t/rpl_ndb_disk.test

  mysql-test/t/ndb_multi_row.test
    1.0 06/01/11 16:26:48 tomas@stripped +0 -0
    BitKeeper file /home/tomas/v6/mysql-test/t/ndb_multi_row.test

  mysql-test/r/ndb_multi_row.result
    1.1 06/01/11 16:26:47 tomas@stripped +69 -0
    New BitKeeper file ``mysql-test/r/ndb_multi_row.result''

  mysql-test/t/ndb_multi.test
    1.10 06/01/11 16:26:47 tomas@stripped +6 -6
    split ndb_multi test case

  mysql-test/t/disabled.def
    1.37 06/01/11 16:26:47 tomas@stripped +2 -0
    split ndb_multi test case

  mysql-test/r/ndb_multi_row.result
    1.0 06/01/11 16:26:47 tomas@stripped +0 -0
    BitKeeper file /home/tomas/v6/mysql-test/r/ndb_multi_row.result

  mysql-test/r/ndb_multi.result
    1.10 06/01/11 16:26:47 tomas@stripped +8 -0
    split ndb_multi test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/v6

--- 1.36/mysql-test/t/disabled.def	2006-01-10 23:33:06 +01:00
+++ 1.37/mysql-test/t/disabled.def	2006-01-11 16:26:47 +01:00
@@ -20,10 +20,12 @@
 type_time       : Bug#15805
 #rpl000002       : Bug#15920 Temporary tables are not binlogged in SBR
 #ps_7ndb         : Bug#15923 Core dump in RBR mode when executing test suite
+ps_7ndb         : dbug assert in RBR mode when executing test suite
 rpl_ddl         : Bug#15963 SBR does not show "Definer" correctly
 mysqlslap       : Bug#16167
 ndb_autodiscover : TBF with CR
 ndb_autodiscover2 : TBF with CR
 ndb_binlog_basic   : Results are not deterministic, Tomas will fix
 rpl_ndb_basic   : Bug#16228
+rpl_ndb_disk    : Not yet
 rpl_ndb_idempotent : TBF with cluster DD push, fails on slave insert of a row that does not exist

--- 1.9/mysql-test/r/ndb_multi.result	2006-01-05 15:47:35 +01:00
+++ 1.10/mysql-test/r/ndb_multi.result	2006-01-11 16:26:47 +01:00
@@ -30,6 +30,14 @@
 create table t1 (a int) engine=ndbcluster;
 insert into t1 value (2);
 select * from t1;
+ERROR HY000: Table definition has changed, please retry transaction
+show warnings;
+Level	Code	Message
+Error	1296	Got error 241 'Invalid schema object version' from NDB
+Error	1412	Table definition has changed, please retry transaction
+Error	1105	Unknown error
+flush table t1;
+select * from t1;
 a
 2
 flush status;

--- 1.9/mysql-test/t/ndb_multi.test	2006-01-05 12:01:56 +01:00
+++ 1.10/mysql-test/t/ndb_multi.test	2006-01-11 16:26:47 +01:00
@@ -1,6 +1,7 @@
 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
+-- source include/have_binlog_format_statement.inc
 
 
 --disable_warnings
@@ -40,12 +41,11 @@
 create table t1 (a int) engine=ndbcluster;
 insert into t1 value (2);
 connection server1;
-## Currently a retry is required remotely
-#--error 1412
-#select * from t1;
-#show warnings;
-#flush table t1;
-# Table definition change should be propagated automatically
+# Currently a retry is required remotely
+--error 1412
+select * from t1;
+show warnings;
+flush table t1;
 select * from t1;
 
 # Connect to server2 and use the tables from there
--- New file ---
+++ mysql-test/r/ndb_multi_row.result	06/01/11 16:26:47
drop table if exists t1, t2, t3, t4;
drop table if exists t1, t2, t3, t4;
flush status;
create table t1 (a int) engine=ndbcluster;
create table t2 (a int) engine=ndbcluster;
insert into t1 value (2);
insert into t2 value (3);
select * from t1;
a
2
select * from t2;
a
3
show status like 'handler_discover%';
Variable_name	Value
Handler_discover	0
select * from t1;
a
2
drop table t1;
create table t1 (a int) engine=ndbcluster;
insert into t1 value (2);
select * from t1;
a
2
show status like 'handler_discover%';
Variable_name	Value
Handler_discover	0
drop table t1;
create table t1 (a int) engine=ndbcluster;
insert into t1 value (2);
select * from t1;
a
2
flush status;
select * from t1;
a
2
update t1 set a=3 where a=2;
show status like 'handler_discover%';
Variable_name	Value
Handler_discover	0
create table t3 (a int not null primary key, b varchar(22),
c int, last_col text) engine=ndb;
insert into t3 values(1, 'Hi!', 89, 'Longtext column');
create table t4 (pk int primary key, b int) engine=ndb;
select * from t1;
a
3
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
t2
t3
t4
drop table t1, t2, t3, t4;
drop table t1, t3, t4;

--- New file ---
+++ mysql-test/t/ndb_multi_row.test	06/01/11 16:26:48
-- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
-- source include/have_binlog_format_row.inc


--disable_warnings
connection server2;
drop table if exists t1, t2, t3, t4;
connection server1;
drop table if exists t1, t2, t3, t4;
--enable_warnings

flush status;

# Create test tables on server1
create table t1 (a int) engine=ndbcluster;
create table t2 (a int) engine=ndbcluster;
insert into t1 value (2);
insert into t2 value (3);
select * from t1;
select * from t2;
show status like 'handler_discover%';

# Check dropping and recreating table on same server
connect (con1,localhost,,,test);
connect (con2,localhost,,,test);
connection con1;
select * from t1;
connection con2;
drop table t1;
create table t1 (a int) engine=ndbcluster;
insert into t1 value (2);
connection con1;
select * from t1;

# Check dropping and recreating table on different server
connection server2;
show status like 'handler_discover%';
drop table t1;
create table t1 (a int) engine=ndbcluster;
insert into t1 value (2);
connection server1;
## Currently a retry is required remotely
#--error 1412
#select * from t1;
#show warnings;
#flush table t1;
# Table definition change should be propagated automatically
select * from t1;

# Connect to server2 and use the tables from there
connection server2;
flush status;
select * from t1;
update t1 set a=3 where a=2;
show status like 'handler_discover%';

# Create a new table on server2
create table t3 (a int not null primary key, b varchar(22),
c int, last_col text) engine=ndb;
insert into t3 values(1, 'Hi!', 89, 'Longtext column');
create table t4 (pk int primary key, b int) engine=ndb;

# Check that the tables are accessible from server1
connection server1;
select * from t1;
select * from t3;
show status like 'handler_discover%';
show tables like 't4';
show status like 'handler_discover%';
show tables;

drop table t1, t2, t3, t4;
connection server2;
drop table t1, t3, t4;

# End of 4.1 tests

--- New file ---
+++ mysql-test/t/rpl_ndb_disk.test	06/01/11 16:26:48
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
--source include/master-slave.inc

--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings

#
# Basic test of disk tables for NDB
#

#
# Start by creating a logfile group
#

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 a tablespace connected to the logfile group
#

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;

#
# Create a table using this tablespace
#

CREATE TABLE t1
(pk1 int not null primary key, b int not null, c int not null)
tablespace ts1 storage disk
engine ndb;

#
# insert some data
#

insert into t1 values (1,2,3);
select * from t1 order by pk1;

#
# check that the data is also on the slave
#

--sync_slave_with_master
--connection slave
select * from t1 order by pk1;

#
# view the binlog
#

--connection master
let $VERSION=`select version()`;
--replace_result $VERSION VERSION
show binlog events;

#
# cleanup
#

drop table t1;
--sync_slave_with_master

Thread
bk commit into 5.1 tree (tomas:1.2033)tomas11 Jan