bk commit into 5.0 tree (mats:1.1816)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.0 repository of mats. When mats 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1816 05/02/01 12:02:02 mats@stripped +2 -0
  Changed so that mysqlbinlog now reads from stdin if the file to read is supplied as '-'.

  BitKeeper/etc/logging_ok
    1.279 05/02/01 11:57:29 mats@stripped +1 -0
    Logging to logging@stripped accepted

  client/mysqlbinlog.cc
    1.103 05/02/01 11:57:20 mats@stripped +1 -18
    Reading from stdin instead of stdout (which is what 'result_file' was set to). Removed manual read of file using init_io_cache's ability to go directly to a position instead.

# 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:	mats
# Host:	romeo.kindahl.net
# Root:	/home/bk/b7853-mysql-5.0

--- 1.102/client/mysqlbinlog.cc	2005-01-26 09:54:05 +01:00
+++ 1.103/client/mysqlbinlog.cc	2005-02-01 11:57:20 +01:00
@@ -1123,27 +1123,10 @@
   }
   else // reading from stdin; TODO: check that it works
   {
-    if (init_io_cache(file, fileno(result_file), 0, READ_CACHE, (my_off_t) 0,
+    if (init_io_cache(file, fileno(stdin), 0, READ_CACHE, start_position_mot,
 		      0, MYF(MY_WME | MY_NABP | MY_DONT_CHECK_FILESIZE)))
       return 1;
     check_header(file, &description_event);
-    if (start_position)
-    {
-      /* skip 'start_position' characters from stdout */
-      byte buff[IO_SIZE];
-      my_off_t length,tmp;
-      for (length= start_position_mot ; length > 0 ; length-=tmp)
-      {
-	tmp=min(length,sizeof(buff));
-	if (my_b_read(file, buff, (uint) tmp))
-        {
-          error= 1;
-          goto end;
-        }
-      }
-    }
-    file->pos_in_file= start_position_mot;
-    file->seek_not_done=0;
   }
 
   if (!description_event || !description_event->is_valid())

--- 1.278/BitKeeper/etc/logging_ok	2005-01-28 19:28:13 +01:00
+++ 1.279/BitKeeper/etc/logging_ok	2005-02-01 11:57:29 +01:00
@@ -116,6 +116,7 @@
 marty@stripped
 marty@shark.
 mats@stripped
+mats@stripped
 matt@booty.(none)
 matt@stripped
 matthias@stripped