diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-05-08 21:24:15 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-05-08 21:24:15 +0400 |
| commit | 5390ad33f918c379ddd750295d7ec0014a03d1ce (patch) | |
| tree | c91f8453c3e6396d6f1b36e71ebfa7851783ee2c /mysql-test/r/mysqlbinlog.result | |
| parent | c5548ad7bdb8faa673c8455ebd4d98aad93b43eb (diff) | |
| parent | c0cd2742af13c90f117b563e368566ed489b1fca (diff) | |
| download | mariadb-git-5390ad33f918c379ddd750295d7ec0014a03d1ce.tar.gz | |
Manual merge.
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
| -rw-r--r-- | mysql-test/r/mysqlbinlog.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index b55a96b6f30..295a2f41d40 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -471,4 +471,7 @@ IS NOT NULL 1 *** Unsigned server_id 4294967295 is found: 1 *** SET @@global.server_id= 1; +RESET MASTER; +FLUSH LOGS; +End of 5.0 tests End of 5.1 tests |