bk commit into 5.0 tree (tulin:1.1962)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of ndbdev. When ndbdev 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.1962 05/09/11 00:38:48 tulin@stripped +3 -0
  corrected some test cases

  mysql-test/t/rpl_row_EE_err.test
    1.3 05/09/11 00:37:55 tulin@stripped +1 -1
    corrected some test cases

  mysql-test/t/ps_grant.test
    1.8 05/09/11 00:37:55 tulin@stripped +2 -2
    corrected some test cases

  mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test
    1.2 05/09/11 00:37:55 tulin@stripped +2 -2
    corrected some test cases

# 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:	tulin
# Host:	dl145c.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.0-wl1012

--- 1.7/mysql-test/t/ps_grant.test	Thu Aug 11 02:31:41 2005
+++ 1.8/mysql-test/t/ps_grant.test	Sun Sep 11 00:37:55 2005
@@ -133,9 +133,9 @@
 # This test must be the last one, otherwise it may produce extra
 # rows in the processlist under high load.
 # Tested here simply so it is not tested with embedded server
---disable_query_log;
+--disable_query_log
 sleep 4;
---enable_query_log;
+--enable_query_log
 prepare stmt4 from ' show full processlist ';
 --replace_column 1 number 6 time 3 localhost
 execute stmt4;

--- 1.1/mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test	Wed Aug 31 08:01:39 2005
+++ 1.2/mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test	Sun Sep 11 00:37:55 2005
@@ -9,7 +9,7 @@
 create table t1 (a int primary key);
 
 # generate an error that goes to the binlog
---error 1062;
+--error 1062
 insert into t1 values (1),(1);
 
 save_master_pos;
@@ -50,7 +50,7 @@
 kill @id;
 drop table t2,t3;
 connection master;
---error 0,1053;
+--error 0,1053
 reap;
 connection master1;
 --replace_column 2 # 5 #

--- 1.2/mysql-test/t/rpl_row_EE_err.test	Mon Aug 22 23:36:33 2005
+++ 1.3/mysql-test/t/rpl_row_EE_err.test	Sun Sep 11 00:37:55 2005
@@ -31,7 +31,7 @@
 insert into t1 values(2);
 set sql_log_bin=1;
 save_master_pos;
---error 1062;
+--error 1062
 insert into t1 values(1),(2);
 drop table t1;
 save_master_pos;