diff options
| author | unknown <jimw@mysql.com> | 2004-12-03 02:44:33 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2004-12-03 02:44:33 +0100 |
| commit | 8948b7450fa543ef14f29b6087fd70ccfa640972 (patch) | |
| tree | 286a6f113bd76ec5b986c2528ab6d942c3e395b5 /mysql-test/r/insert_select.result | |
| parent | 117c7611a74ec27cf2f136b14155d29880613c74 (diff) | |
| download | mariadb-git-8948b7450fa543ef14f29b6087fd70ccfa640972.tar.gz | |
Manual fixes to merge of fix for Bug #6682 to 4.1.
sql/sql_class.h:
update tmp_disable_binlog() and reenable_binlog() macros
mysql-test/r/insert_select.result:
Handle results that differ from 4.0 to 4.1
Diffstat (limited to 'mysql-test/r/insert_select.result')
| -rw-r--r-- | mysql-test/r/insert_select.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index fcb4229fcdb..0a6a34f9a58 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -85,10 +85,10 @@ create table t1(a int); insert into t1 values(1),(1); reset master; create table t2(unique(a)) select a from t1; -Duplicate entry '1' for key 1 +ERROR 23000: Duplicate entry '1' for key 1 show binlog events; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 +master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 drop table t1; create table t1 (a int not null); create table t2 (a int not null); |