diff options
| author | unknown <serg@serg.mylan> | 2003-11-25 20:06:41 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-11-25 20:06:41 +0100 |
| commit | 8e9d7bc6bc35241e78faea574db372c4920f1027 (patch) | |
| tree | 8cc43c192dcee4e7b495d445175607e1cdda5c85 /mysql-test/r/rpl_change_master.result | |
| parent | f2927d6202b8cd65b1b183c78a2ff207cf1ff725 (diff) | |
| download | mariadb-git-8e9d7bc6bc35241e78faea574db372c4920f1027.tar.gz | |
post-merge fixes
Makefile.am:
spurious space (from a bad merge) deleted
mysql-test/r/rpl_change_master.result:
test results updated
Diffstat (limited to 'mysql-test/r/rpl_change_master.result')
| -rw-r--r-- | mysql-test/r/rpl_change_master.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_change_master.result b/mysql-test/r/rpl_change_master.result index 546a0ee2710..a6342d47b49 100644 --- a/mysql-test/r/rpl_change_master.result +++ b/mysql-test/r/rpl_change_master.result @@ -8,7 +8,7 @@ select get_lock("a",5); get_lock("a",5) 1 create table t1(n int); -insert into t1 values(1+get_lock("a",10)*0); +insert into t1 values(1+get_lock("a",15)*0); insert into t1 values(2); stop slave; select * from t1; |