database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge sgluhov@work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.upd


sql/log_event.cc:
  Auto merged
This commit is contained in:
unknown
2003-01-17 16:40:54 +04:00
parent ee0f0a81da b66cf8516e
commit ee49ffd563
4 changed files with 142 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/rpl_temporary.result
View File

@@ -22,7 +22,7 @@ f
7
show binlog events;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.000001 4 Start 1 4 Server ver: 4.1.0-alpha-debug-log, Binlog ver: 3
master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3
master-bin.000001 79 Query 1 79 use `test`; create table t1(f int)
master-bin.000001 136 Query 1 136 use `test`; create table t2(f int)
master-bin.000001 193 Query 1 193 use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10)

3
mysql-test/t/rpl_temporary.test
View File

@@ -3,6 +3,8 @@ source include/master-slave.inc;
connect (con1,localhost,root,,);
connect (con2,localhost,root,,);
let $VERSION=`select version()`;
--disable_warnings
drop table if exists t1,t2;
--enable_warnings
@@ -38,6 +40,7 @@ drop temporary table t3;
select * from t2;
--replace_result $VERSION VERSION
show binlog events;
drop table t1, t2;