fixed wrong DBUG_ASSERT() in IO_CACHE

fixed apparent typo in opt_sum.cc
I will push this Changeset although it fails select test - failing select 
is better than the code that does not compile.


mysql-test/r/rpl000001.result:
  updated result
mysys/mf_iocache2.c:
  fixed wrong DBUG_ASSERT()
sql/opt_sum.cc:
  fixed an apparent typo to make it compile

1 files changed, 11 insertions, 12 deletions

diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result
index ab242b349cd..3dae52c6d3f 100644
--- a/mysql-test/r/rpl000001.result
+++ b/mysql-test/r/rpl000001.result
@@ -7,7 +7,7 @@ use test;
 drop table if exists t1,t3;
 create table t1 (word char(20) not null);
 load data infile '../../std_data/words.dat' into table t1;
-load data local infile '$MYSQL_TEST_DIR/std_data/words.dat' into table t1;
+load data local infile '/home/sasha/bk/mysql-4.0/mysql-test/std_data/words.dat' into table t1;
 select * from t1;
 word
 Aarhus
@@ -44,19 +44,18 @@ sum(length(word))
 141
 drop table t1,t3;
 reset master;
+slave stop;
 reset slave;
 drop table if exists t1,t2;
 create table t1(n int);
-insert into t1 values(10);
-insert into t1 values(9);
-insert into t1 values(8);
-insert into t1 values(7);
-insert into t1 values(6);
-insert into t1 values(5);
-insert into t1 values(4);
-insert into t1 values(3);
-insert into t1 values(2);
-insert into t1 values(1);
+select get_lock("hold_slave",10);
+get_lock("hold_slave",10)
+1
+slave start;
+select release_lock("hold_slave");
+release_lock("hold_slave")
+1
+unlock tables;
 create table t2(id int);
 insert into t2 values(connection_id());
 create temporary table t1_temp(n int);
@@ -72,7 +71,7 @@ set sql_slave_skip_counter=1;
 slave start;
 select count(*) from t1;
 count(*)
-10
+5000
 drop table t1;
 create table t1 (n int);
 insert into t1 values(3456);