database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00
Code Activity

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
This commit is contained in:
jmiller@mysql.com
2006-01-12 13:34:58 +01:00
parent 9f82755b81 ed4c583d16
commit 2158cbded8
9 changed files with 49 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/rpl_row_EE_err.result → mysql-test/r/rpl_EE_err.result
View File

@@ -9,11 +9,3 @@ flush tables;
drop table if exists t1;
Warnings:
Error 2 Can't find file: 't1' (errno: 2)
create table t1 (a int, unique(a)) engine=myisam;
set sql_log_bin=0;
insert into t1 values(2);
set sql_log_bin=1;
insert into t1 values(1),(2);
ERROR 23000: Duplicate entry '2' for key 1
drop table t1;
stop slave;

5
mysql-test/r/rpl_stm_EE_err.result → mysql-test/r/rpl_stm_EE_err2.result
View File

@@ -4,11 +4,6 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
create table t1 (a int) engine=myisam;
flush tables;
drop table if exists t1;
Warnings:
Error 2 Can't find file: 't1' (errno: 2)
create table t1 (a int, unique(a)) engine=myisam;
set sql_log_bin=0;
insert into t1 values(2);