List:Commits« Previous MessageNext Message »
From:konstantin Date:November 11 2006 11:51am
Subject:bk commit into 5.0 tree (kostja:1.2300)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-11 14:51:19+03:00, kostja@stripped +10 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  bodhi.local:/opt/local/work/mysql-5.0-runtime
  MERGE: 1.2287.1.1

  configure.in@stripped, 2006-11-11 14:47:03+03:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.405.1.1

  include/my_time.h@stripped, 2006-11-11 14:47:04+03:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.12.1.1

  mysql-test/r/func_time.result@stripped, 2006-11-11 14:47:04+03:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.73.1.1

  mysql-test/r/rename.result@stripped, 2006-11-11 14:47:04+03:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.14.1.1

  mysql-test/t/func_time.test@stripped, 2006-11-11 14:47:04+03:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.60.1.1

  mysql-test/t/im_daemon_life_cycle.imtest@stripped, 2006-11-11 14:47:04+03:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.7.2.1

  mysql-test/t/rename.test@stripped, 2006-11-11 14:51:00+03:00, kostja@stripped +3 -0
    Use local (resolve a conflict)
    MERGE: 1.14.1.1

  sql-common/my_time.c@stripped, 2006-11-11 14:47:04+03:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.21.1.1

  sql/item_timefunc.cc@stripped, 2006-11-11 14:47:04+03:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.129.1.1

  sql/time.cc@stripped, 2006-11-11 14:47:04+03:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.61.1.1

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.0-runtime/RESYNC

--- 1.16/mysql-test/t/rename.test	2006-11-11 14:51:42 +03:00
+++ 1.17/mysql-test/t/rename.test	2006-11-11 14:51:42 +03:00
@@ -60,6 +60,9 @@ send RENAME TABLE t1 TO t2, t3 to t4;
 connection con2;
 show tables;
 UNLOCK TABLES;
+connection con1;
+reap;
+connection con2;
 
 # Wait for the the tables to be renamed
 # i.e the query below succeds
Thread
• bk commit into 5.0 tree (kostja:1.2300)konstantin11 Nov