bk commit into 5.1 tree (jmiller:1.2084)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.2084 06/02/08 16:47:46 jmiller@stripped +9 -0
  Implement suggestions from lars review

  mysql-test/extra/rpl_tests/rpl_insert_id.test
    1.4 06/02/08 16:47:06 jmiller@stripped +1 -0
    updated per lars

  mysql-test/r/rpl_insert_id_pk.result
    1.1 06/02/08 16:44:41 jmiller@stripped +75 -0
    Suggested PK test by Lars

  mysql-test/r/rpl_insert_id_pk.result
    1.0 06/02/08 16:44:41 jmiller@stripped +0 -0
    BitKeeper file
/home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_insert_id_pk.result

  mysql-test/t/rpl_insert_id_pk-slave.opt
    1.1 06/02/08 16:44:24 jmiller@stripped +1 -0
    Suggested PK test by Lars

  mysql-test/t/rpl_insert_id_pk-slave.opt
    1.0 06/02/08 16:44:24 jmiller@stripped +0 -0
    BitKeeper file
/home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_insert_id_pk-slave.opt

  mysql-test/t/rpl_insert_id_pk.test
    1.1 06/02/08 16:44:07 jmiller@stripped +6 -0
    Suggested PK test by Lars

  mysql-test/t/rpl_insert_id_pk.test
    1.0 06/02/08 16:44:07 jmiller@stripped +0 -0
    BitKeeper file
/home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_insert_id_pk.test

  mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
    1.1 06/02/08 16:43:50 jmiller@stripped +87 -0
    Suggested PK test by Lars

  mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
    1.0 06/02/08 16:43:50 jmiller@stripped +0 -0
    BitKeeper file
/home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test

  mysql-test/r/rpl_insert_id.result
    1.14 06/02/08 16:08:44 jmiller@stripped +4 -4
    updated results

  mysql-test/extra/rpl_tests/rpl_insert_id.test
    1.3 06/02/08 16:08:21 jmiller@stripped +11 -5
    updated per lars

  mysql-test/r/rpl_row_blob_myisam.result
    1.3 06/02/08 15:46:29 jmiller@stripped +2 -2
    Changes that Larss requested

  mysql-test/r/rpl_row_blob_innodb.result
    1.3 06/02/08 15:46:19 jmiller@stripped +2 -2
    Changes that Larss requested

  mysql-test/extra/rpl_tests/rpl_row_blob.test
    1.2 06/02/08 15:45:09 jmiller@stripped +4 -5
    Changes that Larss requested

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new
--- New file ---
+++ mysql-test/extra/rpl_tests/rpl_insert_id_pk.test	06/02/08 16:43:50
###########################################################
# 2006-02-08: By JBM:  
###########################################################
# See if queries that use both auto_increment and LAST_INSERT_ID()
# are replicated well
############################################################
# REQUIREMENT
# Auto increment should work for a table with auto_increment column
# and primary key.
##############################################################

# We also check how the foreign_key_check variable is replicated

-- source include/master-slave.inc
#should work for both SBR and RBR

connection master;
create table t1(a int auto_increment, primary key(a));
create table t2(b int auto_increment, c int, primary key(b));
insert into t1 values (1),(2),(3);
insert into t1 values (null);
insert into t2 values (null,last_insert_id());
save_master_pos;
connection slave;
sync_with_master;
select * from t1 ORDER BY a;
select * from t2 ORDER BY b;
connection master;
#check if multi-line inserts,
#which set last_insert_id to the first id inserted,
#are replicated the same way
drop table t1;
drop table t2;
--disable_warnings
eval create table t1(a int auto_increment, key(a)) engine=$engine_type;
eval create table t2(b int auto_increment, c int, key(b), foreign key(b) references t1(a))
engine=$engine_type;
--enable_warnings
SET FOREIGN_KEY_CHECKS=0;
insert into t1 values (10);
insert into t1 values (null),(null),(null);
insert into t2 values (5,0);
insert into t2 values (null,last_insert_id());
SET FOREIGN_KEY_CHECKS=1;
save_master_pos;
connection slave;
sync_with_master;
select * from t1;
select * from t2;
connection master;

# check if INSERT SELECT in auto_increment is well replicated (bug #490)

drop table t2;
drop table t1;
create table t1(a int auto_increment, primary key(a));
create table t2(b int auto_increment, c int, primary key(b));
insert into t1 values (10);
insert into t1 values (null),(null),(null);
insert into t2 values (5,0);
insert into t2 (c) select * from t1 ORDER BY a;
select * from t2 ORDER BY b;
save_master_pos;
connection slave;
sync_with_master;
select * from t1 ORDER BY a;
select * from t2 ORDER BY b;
connection master;
drop table t1;
drop table t2;
save_master_pos;
connection slave;
sync_with_master;

#
# Bug#8412: Error codes reported in binary log for CHARACTER SET,
#           FOREIGN_KEY_CHECKS
#
connection master;
SET TIMESTAMP=1000000000;
CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0;
# Duplicate Key Errors codes
--error 1022, 1062
INSERT INTO t1 VALUES (1),(1);
sync_slave_with_master;

# End of 4.1 tests


--- 1.1/mysql-test/extra/rpl_tests/rpl_row_blob.test	2006-01-05 03:54:01 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_row_blob.test	2006-02-08 15:45:09 +01:00
@@ -20,12 +20,11 @@
 --echo *****  Table Create Section ****
 --echo
 --disable_warnings
---replace_result $engine_type engine_type
-CREATE TABLE test.t1 (c1 int not null auto_increment, 
+--replace_result $engine_type #
+eval CREATE TABLE test.t1 (c1 int not null auto_increment, 
 data LONGBLOB, PRIMARY KEY(c1))ENGINE=$engine_type;
 --enable_warnings
 --echo
-
 --echo **** Data Insert Section test.t1 *****
 --echo
 INSERT INTO test.t1 VALUES (NULL, NULL);
@@ -77,8 +76,8 @@
 --echo **** Create Table test.t2 ****
 --echo
 --disable_warnings
---replace_result $engine_type engine_type
-CREATE TABLE test.t2 (
+--replace_result $engine_type #
+eval CREATE TABLE test.t2 (
   c1 INT NOT NULL PRIMARY KEY,
   c2 TEXT,
   c3 INT,
--- New file ---
+++ mysql-test/r/rpl_insert_id_pk.result	06/02/08 16:44:41
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
create table t1(a int auto_increment, primary key(a));
create table t2(b int auto_increment, c int, primary key(b));
insert into t1 values (1),(2),(3);
insert into t1 values (null);
insert into t2 values (null,last_insert_id());
select * from t1 ORDER BY a;
a
1
2
3
4
select * from t2 ORDER BY b;
b	c
1	4
drop table t1;
drop table t2;
create table t1(a int auto_increment, key(a)) engine=innodb;
create table t2(b int auto_increment, c int, key(b), foreign key(b) references t1(a))
engine=innodb;
SET FOREIGN_KEY_CHECKS=0;
insert into t1 values (10);
insert into t1 values (null),(null),(null);
insert into t2 values (5,0);
insert into t2 values (null,last_insert_id());
SET FOREIGN_KEY_CHECKS=1;
select * from t1;
a
10
11
12
13
select * from t2;
b	c
5	0
6	11
drop table t2;
drop table t1;
create table t1(a int auto_increment, primary key(a));
create table t2(b int auto_increment, c int, primary key(b));
insert into t1 values (10);
insert into t1 values (null),(null),(null);
insert into t2 values (5,0);
insert into t2 (c) select * from t1 ORDER BY a;
select * from t2 ORDER BY b;
b	c
5	0
6	10
7	11
8	12
9	13
select * from t1 ORDER BY a;
a
10
11
12
13
select * from t2 ORDER BY b;
b	c
5	0
6	10
7	11
8	12
9	13
drop table t1;
drop table t2;
SET TIMESTAMP=1000000000;
CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0;
INSERT INTO t1 VALUES (1),(1);
Got one of the listed errors


--- 1.2/mysql-test/r/rpl_row_blob_innodb.result	2006-02-08 02:46:48 +01:00
+++ 1.3/mysql-test/r/rpl_row_blob_innodb.result	2006-02-08 15:46:19 +01:00
@@ -9,7 +9,7 @@
 *****  Table Create Section ****
 
 CREATE TABLE test.t1 (c1 int not null auto_increment, 
-data LONGBLOB, PRIMARY KEY(c1))ENGINE=engine_type;
+data LONGBLOB, PRIMARY KEY(c1))ENGINE=#;
 
 **** Data Insert Section test.t1 *****
 
@@ -76,7 +76,7 @@
 c2 TEXT,
 c3 INT,
 c4 LONGBLOB,
-KEY(c3))ENGINE=engine_type;
+KEY(c3))ENGINE=#;
 
 *** Setup Values For test.t2 ***
 set @x0 = '01234567012345670123456701234567';

--- 1.2/mysql-test/r/rpl_row_blob_myisam.result	2006-02-08 02:58:05 +01:00
+++ 1.3/mysql-test/r/rpl_row_blob_myisam.result	2006-02-08 15:46:29 +01:00
@@ -9,7 +9,7 @@
 *****  Table Create Section ****
 
 CREATE TABLE test.t1 (c1 int not null auto_increment, 
-data LONGBLOB, PRIMARY KEY(c1))ENGINE=engine_type;
+data LONGBLOB, PRIMARY KEY(c1))ENGINE=#;
 
 **** Data Insert Section test.t1 *****
 
@@ -76,7 +76,7 @@
 c2 TEXT,
 c3 INT,
 c4 LONGBLOB,
-KEY(c3))ENGINE=engine_type;
+KEY(c3))ENGINE=#;
 
 *** Setup Values For test.t2 ***
 set @x0 = '01234567012345670123456701234567';
--- New file ---
+++ mysql-test/t/rpl_insert_id_pk-slave.opt	06/02/08 16:44:24
--innodb

--- New file ---
+++ mysql-test/t/rpl_insert_id_pk.test	06/02/08 16:44:07
#################################
# Wrapper for rpl_insert_id.test#
#################################
-- source include/have_innodb.inc
let $engine_type=innodb;
-- source extra/rpl_tests/rpl_insert_id_pk.test


--- 1.2/mysql-test/extra/rpl_tests/rpl_insert_id.test	2006-02-07 16:32:19 +01:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_insert_id.test	2006-02-08 16:47:06 +01:00
@@ -1,8 +1,14 @@
 ###########################################################
-# 2006-02-01: By JBM: Added 1022, ORDER BY and PK for NDB
+# 2006-02-01: By JBM: Added 1022, ORDER BY 
 ###########################################################
 # See if queries that use both auto_increment and LAST_INSERT_ID()
 # are replicated well
+############################################################
+# REQUIREMENT
+# Auto increment should work for a table with an auto_increment
+# column and index but without primary key.
+##############################################################
+
 
 # We also check how the foreign_key_check variable is replicated
 
@@ -10,8 +16,8 @@
 #should work for both SBR and RBR
 
 connection master;
-create table t1(a int auto_increment, PRIMARY key(a));
-create table t2(b int auto_increment, c int, PRIMARY key(b));
+create table t1(a int auto_increment, key(a));
+create table t2(b int auto_increment, c int, key(b));
 insert into t1 values (1),(2),(3);
 insert into t1 values (null);
 insert into t2 values (null,last_insert_id());
@@ -47,8 +53,8 @@
 
 drop table t2;
 drop table t1;
-create table t1(a int auto_increment, PRIMARY key(a));
-create table t2(b int auto_increment, c int, PRIMARY key(b));
+create table t1(a int auto_increment, key(a));
+create table t2(b int auto_increment, c int, key(b));
 insert into t1 values (10);
 insert into t1 values (null),(null),(null);
 insert into t2 values (5,0);
@@ -74,6 +80,7 @@
 SET TIMESTAMP=1000000000;
 CREATE TABLE t1 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
+# Duplicate Key Errors
 --error 1022, 1062
 INSERT INTO t1 VALUES (1),(1);
 sync_slave_with_master;

--- 1.13/mysql-test/r/rpl_insert_id.result	2006-02-07 16:32:32 +01:00
+++ 1.14/mysql-test/r/rpl_insert_id.result	2006-02-08 16:08:44 +01:00
@@ -4,8 +4,8 @@
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-create table t1(a int auto_increment, PRIMARY key(a));
-create table t2(b int auto_increment, c int, PRIMARY key(b));
+create table t1(a int auto_increment, key(a));
+create table t2(b int auto_increment, c int, key(b));
 insert into t1 values (1),(2),(3);
 insert into t1 values (null);
 insert into t2 values (null,last_insert_id());
@@ -40,8 +40,8 @@
 6	11
 drop table t2;
 drop table t1;
-create table t1(a int auto_increment, PRIMARY key(a));
-create table t2(b int auto_increment, c int, PRIMARY key(b));
+create table t1(a int auto_increment, key(a));
+create table t2(b int auto_increment, c int, key(b));
 insert into t1 values (10);
 insert into t1 values (null),(null),(null);
 insert into t2 values (5,0);