diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-11-27 18:20:24 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-11-27 18:20:24 -0700 |
| commit | 08fc358542509a63e04eb544885d03f10c576a22 (patch) | |
| tree | 9162f72dd22e4223cb1b3da255a9e1e53e07632a /mysql-test | |
| parent | 312e5e82c0b17983bc3ac43b50fac891cccf0ea2 (diff) | |
| download | mariadb-git-08fc358542509a63e04eb544885d03f10c576a22.tar.gz | |
fixed alias drop bug in binlog
fixed skip counter to do the RightThing (TM) when the user messes up.
Still do RightThing when he gets it right.
mysql-test/r/rpl000016.result:
updated test result
mysql-test/t/rpl000013.test:
test alias bug
mysql-test/t/rpl000016.test:
test for proper skip when the user messes up
sql/slave.cc:
proper skip even when the user goofs up
sql/sql_base.cc:
drop real name, not last used alias in the log
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl000016.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl000013.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl000016.test | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result index abe4275a124..1390291f1e8 100644 --- a/mysql-test/r/rpl000016.result +++ b/mysql-test/r/rpl000016.result @@ -10,7 +10,7 @@ master-bin.003 Log_name master-bin.003 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9999 60 master-bin.003 184 Yes 0 0 +127.0.0.1 root 9999 60 master-bin.003 206 Yes 0 0 m 34 65 diff --git a/mysql-test/t/rpl000013.test b/mysql-test/t/rpl000013.test index af693a720d4..a190d5324ae 100644 --- a/mysql-test/t/rpl000013.test +++ b/mysql-test/t/rpl000013.test @@ -12,7 +12,7 @@ insert into t2 select * from t1; connection master1; create temporary table t1 (n int); insert into t1 values (4),(5); -insert into t2 select * from t1; +insert into t2 select * from t1 as t10; save_master_pos; disconnect master; connection slave; diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test index 7b46bc75498..c9b6ccabcd2 100644 --- a/mysql-test/t/rpl000016.test +++ b/mysql-test/t/rpl000016.test @@ -28,7 +28,7 @@ select * from t1; connection master; flush logs; drop table if exists t2; -create table t2(m int not null primary key); +create table t2(m int not null auto_increment primary key); insert into t2 values (34),(67),(123); save_master_pos; flush logs; @@ -44,7 +44,8 @@ insert into t2 values(1234); #same value on the master connection master; save_master_pos; -insert into t2 values(1234); +set insert_id=1234; +insert into t2 values(NULL); connection slave; sync_with_master; |