List:Internals« Previous MessageNext Message »
From:sasha Date:June 6 2002 2:16am
Subject:bk commit into 3.23 tree
View as plain text  
Below is the list of changes that have just been commited into a local
3.23. repository of sasha. When sasha does a push, they will be
propogaged to the main repository and within 24 hours after the push into
the public repository. For information on how to access
the public repository see
http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-06-05 20:16:44-06:00, sasha@stripped
  spurious binlog error code logging on temp table auto-drop fixed
  added a new replication test

  mysql-test/t/rpl_alter.test
    1.1 02/06/05 20:16:44 sasha@stripped +21 -0

  mysql-test/r/rpl_alter.result
    1.1 02/06/05 20:16:43 sasha@stripped +4 -0

  mysql-test/t/rpl_alter.test
    1.0 02/06/05 20:16:44 sasha@stripped +0 -0
    BitKeeper file /reiser-data/mysql/mysql-test/t/rpl_alter.test

  mysql-test/r/rpl_alter.result
    1.0 02/06/05 20:16:43 sasha@stripped +0 -0
    BitKeeper file /reiser-data/mysql/mysql-test/r/rpl_alter.result

  sql/sql_base.cc
    1.93 02/06/05 20:16:43 sasha@stripped +1 -0
    f

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql

--- 1.92/sql/sql_base.cc	Fri Mar 22 05:03:42 2002
+++ 1.93/sql/sql_base.cc	Wed Jun  5 20:16:43 2002
@@ -546,6 +546,7 @@
     *--end = 0;					// Remove last ','
     thd->query_length = (uint)(end-query);
     Query_log_event qinfo(thd, query);
+    qinfo.error_code=0;
     mysql_bin_log.write(&qinfo);
     thd->query_length = save_query_len;
   }
--- New file ---
+++ mysql-test/r/rpl_alter.result	02/06/05 20:16:43
n	m
1	2
n
45

--- New file ---
+++ mysql-test/t/rpl_alter.test	02/06/05 20:16:44
source include/master-slave.inc;
connection master;
use test;
drop database if exists d1;
create database d1;
create table d1.t1 ( n int);
alter table d1.t1 add m int;
insert into d1.t1 values (1,2);
create table d1.t2 (n int);
insert into d1.t2 values (45);
rename table d1.t2 to d1.t3, d1.t1 to d1.t2;
save_master_pos;
connection slave;
sync_with_master;
select * from d1.t2;
select * from d1.t3;
connection master;
drop database d1;
save_master_pos;
connection slave;
sync_with_master;

Thread
bk commit into 3.23 treesasha6 Jun