From: Date: January 23 2006 3:28pm
Subject: bk commit into 5.1 tree (petr:1.2067)
List-Archive: http://lists.mysql.com/commits/1503
Message-Id: <20060123142842.694F05D535@outpost.site>

Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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
  1.2067 06/01/23 17:28:37 petr@stripped +1 -0
  Merge pchardin@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug

  mysql-test/t/log_tables.test
    1.3 06/01/23 17:28:33 petr@stripped +0 -0
    Auto merged

# 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:	petr
# Host:	outpost.site
# Root:	/home/cps/mysql/trees/5.1/5.1-virgin-no-debug/RESYNC

--- 1.2/mysql-test/t/log_tables.test	2006-01-23 10:58:08 +03:00
+++ 1.3/mysql-test/t/log_tables.test	2006-01-23 17:28:33 +03:00
@@ -7,6 +7,7 @@
 # check that CSV engine was compiled in
 --source include/have_csv.inc
 
+--disable_ps_protocol
 use mysql;
 
 #
@@ -145,4 +146,5 @@
 
 disconnect con2;
 disconnect con1;
+--enable_ps_protocol