diff options
| author | guilhem@gbichot2 <> | 2003-12-20 00:38:30 +0100 |
|---|---|---|
| committer | guilhem@gbichot2 <> | 2003-12-20 00:38:30 +0100 |
| commit | d67bbe72c22a6b43d301b4c1f37b60f697d8873b (patch) | |
| tree | cdf066b74e4da92e314ad82f0d2016859366b868 /mysql-test/r/insert_select.result | |
| parent | 1333f636ae47fe4c88b38e9bfdf582336228112e (diff) | |
| download | mariadb-git-d67bbe72c22a6b43d301b4c1f37b60f697d8873b.tar.gz | |
Now merge is done.
For previous commit I had run only rpl* tests, here the other ones had a
few surprises. Latest status:
- all tests pass
- all replication tests pass with Valgrind
This is the final-final commit & push.
Doc remains.
Diffstat (limited to 'mysql-test/r/insert_select.result')
| -rw-r--r-- | mysql-test/r/insert_select.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index a77d67b5f64..378716ecc39 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -73,9 +73,9 @@ reset master; insert into t1 select * from t2; ERROR 23000: Duplicate entry '2' for key 1 show binlog events; -Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 -master-bin.000001 79 Query 1 79 use `test`; insert into t1 select * from t2 +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 95 Query 1 183 use `test`; insert into t1 select * from t2 select * from t1; a 1 |