bk commit into 4.0 tree

[sasha]

Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-01-31 16:17:24-07:00, sasha@stripped
  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
    1.15 02/01/31 16:17:23 sasha@stripped +11 -12
    updated result

  mysys/mf_iocache2.c
    1.19 02/01/31 16:17:23 sasha@stripped +13 -1
    fixed wrong DBUG_ASSERT()

  sql/opt_sum.cc
    1.15 02/01/31 16:17:23 sasha@stripped +1 -1
    fixed an apparent typo to make it compile

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-4.0

--- 1.14/sql/opt_sum.cc	Wed Jan 30 19:36:58 2002
+++ 1.15/sql/opt_sum.cc	Thu Jan 31 16:17:23 2002
@@ -299,7 +299,7 @@
   uint idx=0;
 
   /* Check if some key has field as first key part */
-  if ((field->key_start & field->table->keys_in_use_for_query) &&A
+  if ((field->key_start & field->table->keys_in_use_for_query) &&
       (! cond || ! (cond->used_tables() & table->map)))
   {
     for (key_map key=field->key_start ; !(key & 1) ; idx++)

--- 1.18/mysys/mf_iocache2.c	Thu Jan 31 11:02:11 2002
+++ 1.19/mysys/mf_iocache2.c	Thu Jan 31 16:17:23 2002
@@ -41,8 +41,20 @@
   /* save the value of my_tell in res so we can see it when studying
      coredump
   */
-  DBUG_ASSERT(info->end_of_file - (info->append_read_pos-info->write_buffer)
+#ifndef DBUG_OFF
+  /* make sure EOF is where we think it is. Note that we cannot just use
+     my_tell() because we have a reader thread that could have left the
+     file offset in a non-EOF location
+     */
+  {
+   volatile my_off_t save_pos;
+   save_pos = my_tell(info->file,MYF(0));
+   my_seek(info->file,(my_off_t)0,MY_SEEK_END,MYF(0));
+   DBUG_ASSERT(info->end_of_file - (info->append_read_pos-info->write_buffer)
 	      == (res=my_tell(info->file,MYF(0))));
+   my_seek(info->file,save_pos,MY_SEEK_SET,MYF(0));
+  }
+#endif  
   res = info->end_of_file + (info->write_pos-info->append_read_pos);
 #ifdef THREAD
   pthread_mutex_unlock(&info->append_buffer_lock);

--- 1.14/mysql-test/r/rpl000001.result	Mon Nov 26 17:33:10 2001
+++ 1.15/mysql-test/r/rpl000001.result	Thu Jan 31 16:17:23 2002
@@ -7,7 +7,7 @@
 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 @@
 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 @@
 slave start;
 select count(*) from t1;
 count(*)
-10
+5000
 drop table t1;
 create table t1 (n int);
 insert into t1 values(3456);