diff options
| author | monty@mysql.com <> | 2004-12-06 17:15:54 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-06 17:15:54 +0200 |
| commit | 75d0958dc317561bd373da992ff9056f8c22d196 (patch) | |
| tree | adca7e39f11a6ff5883c21958f614b2e665a3d84 /mysql-test/r/insert_select.result | |
| parent | 0de4777187a869b4a070ba1e0da28a2ffe1abf05 (diff) | |
| download | mariadb-git-75d0958dc317561bd373da992ff9056f8c22d196.tar.gz | |
After merge fixes
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
Diffstat (limited to 'mysql-test/r/insert_select.result')
| -rw-r--r-- | mysql-test/r/insert_select.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index bb7d520dcab..94d33f8090b 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -87,8 +87,8 @@ reset master; create table t2(unique(a)) select a from t1; ERROR 23000: Duplicate entry '1' 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 +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 drop table t1; create table t1 (a int not null); create table t2 (a int not null); |