Commit 8a373fc3 authored by unknown's avatar unknown
Browse files

Merge pchardin@bk-internal.mysql.com:/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:
  Auto merged
parents 004d728a f3fd2ace

mysql-test/t/log_tables.test

+2 −0
Original line number Diff line number Diff line
@@ -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 @@ select "Mark that we woke up from TRUNCATE in the test" 


disconnect con2;

disconnect con1;

--enable_ps_protocol