From 77b746b7c5edb86f606e42fcc80f5bee092c0389 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Feb 2006 12:58:33 +0100 Subject: [PATCH] WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX Fixes for row level logging. --- mysql-test/r/binlog_row_insert_select.result | 4 ++-- mysql-test/r/rpl_row_basic_2myisam.result | 6 +++--- mysql-test/r/rpl_row_basic_3innodb.result | 6 +++--- mysql-test/r/rpl_row_create_table.result | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mysql-test/r/binlog_row_insert_select.result b/mysql-test/r/binlog_row_insert_select.result index 27c515e5781..90a8a5473e9 100644 --- a/mysql-test/r/binlog_row_insert_select.result +++ b/mysql-test/r/binlog_row_insert_select.result @@ -4,7 +4,7 @@ create table t2(a int); insert into t2 values(1),(2); reset master; insert into t1 select * from t2; -ERROR 23000: Duplicate entry '2' for key 1 +ERROR 23000: Duplicate entry '2' for key 'a' show binlog events; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4 @@ -19,7 +19,7 @@ create table t1(a int); insert into t1 values(1),(1); reset master; create table t2(unique(a)) select a from t1; -ERROR 23000: Duplicate entry '1' for key 1 +ERROR 23000: Duplicate entry '1' for key 'a' show binlog events; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4 diff --git a/mysql-test/r/rpl_row_basic_2myisam.result b/mysql-test/r/rpl_row_basic_2myisam.result index 12a8d8282e3..972e69cd619 100644 --- a/mysql-test/r/rpl_row_basic_2myisam.result +++ b/mysql-test/r/rpl_row_basic_2myisam.result @@ -392,11 +392,11 @@ DROP TABLE t7; CREATE TABLE t7 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = 'MYISAM' ; INSERT INTO t7 VALUES (99,99,99); INSERT INTO t7 VALUES (99,22,33); -ERROR 23000: Duplicate entry '99' for key 1 +ERROR 23000: Duplicate entry '99' for key 'PRIMARY' INSERT INTO t7 VALUES (11,99,33); -ERROR 23000: Duplicate entry '99' for key 2 +ERROR 23000: Duplicate entry '99' for key 'b' INSERT INTO t7 VALUES (11,22,99); -ERROR 23000: Duplicate entry '99' for key 3 +ERROR 23000: Duplicate entry '99' for key 'c' SELECT * FROM t7 ORDER BY a; a b c 99 99 99 diff --git a/mysql-test/r/rpl_row_basic_3innodb.result b/mysql-test/r/rpl_row_basic_3innodb.result index ed9b231e1a1..aa0361b38bc 100644 --- a/mysql-test/r/rpl_row_basic_3innodb.result +++ b/mysql-test/r/rpl_row_basic_3innodb.result @@ -392,11 +392,11 @@ DROP TABLE t7; CREATE TABLE t7 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = 'INNODB' ; INSERT INTO t7 VALUES (99,99,99); INSERT INTO t7 VALUES (99,22,33); -ERROR 23000: Duplicate entry '99' for key 1 +ERROR 23000: Duplicate entry '99' for key 'PRIMARY' INSERT INTO t7 VALUES (11,99,33); -ERROR 23000: Duplicate entry '99' for key 2 +ERROR 23000: Duplicate entry '99' for key 'b' INSERT INTO t7 VALUES (11,22,99); -ERROR 23000: Duplicate entry '99' for key 3 +ERROR 23000: Duplicate entry '99' for key 'c' SELECT * FROM t7 ORDER BY a; a b c 99 99 99 diff --git a/mysql-test/r/rpl_row_create_table.result b/mysql-test/r/rpl_row_create_table.result index 9182a1d6d89..4d485802a53 100644 --- a/mysql-test/r/rpl_row_create_table.result +++ b/mysql-test/r/rpl_row_create_table.result @@ -126,12 +126,12 @@ NULL 4 2 NULL 5 10 NULL 6 12 CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3; -ERROR 23000: Duplicate entry '2' for key 1 +ERROR 23000: Duplicate entry '2' for key 'b' SHOW BINLOG EVENTS FROM 1256; Log_name Pos Event_type Server_id End_log_pos Info CREATE TABLE t7 (a INT, b INT UNIQUE); INSERT INTO t7 SELECT a,b FROM tt3; -ERROR 23000: Duplicate entry '2' for key 1 +ERROR 23000: Duplicate entry '2' for key 'b' SELECT * FROM t7 ORDER BY a,b; a b 1 2