bk commit into 5.1 tree (petr:1.2256)

[Petr Chardin]

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.2256 06/03/29 15:37:42 petr@stripped +1 -0
  fix test in --ps-protocol mode

  mysql-test/t/csv.test
    1.10 06/03/29 15:37:36 petr@stripped +8 -1
    fix test. In --ps-protocol mode warnings are eaten by the test suite.
    Disable ps-protocol mode for the statements, which throw the warnings
    we look for.

# 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:	owlet.
# Root:	/home/cps/mysql/devel/5.1-repair-csv

--- 1.9/mysql-test/t/csv.test	2006-03-29 06:28:50 +04:00
+++ 1.10/mysql-test/t/csv.test	2006-03-29 15:37:36 +04:00
@@ -1407,8 +1407,13 @@
 
 CREATE TABLE test_repair_table2 ( val integer ) ENGINE = CSV;
 --exec rm $MYSQLTEST_VARDIR/master-data/test/test_repair_table2.CSM
-# should give a warning and perform autorepair
+
+# Should give a warning and perform autorepair. We also disable ps-protocol
+# here, as mysql-test eats up warnings in ps-protocol mode
+
+--disable_ps_protocol
 SELECT * from test_repair_table2;
+--enable_ps_protocol
 # this should work ok, as the table is already repaired
 SELECT * from test_repair_table2;
 # check that the metafile appeared again. chop the path to it
@@ -1435,7 +1440,9 @@
 ) ENGINE = CSV;
 
 --exec rm $MYSQLTEST_VARDIR/master-data/test/test_repair_table4.CSM
+--disable_ps_protocol
 SELECT * FROM test_repair_table4;
+--enable_ps_protocol
 SELECT * FROM test_repair_table4;
 CHECK TABLE test_repair_table4;