bk commit into 5.0 tree (mats:1.1864)

[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.1864 05/02/10 19:15:53 mats@stripped +2 -0
  Merge mysql.com:/home/bkroot/mysql-5.0
  into mysql.com:/home/bk/b7853-mysql-5.0

  mysql-test/r/mysqlbinlog.result
    1.11 05/02/10 19:15:51 mats@stripped +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.105 05/02/10 19:15:51 mats@stripped +0 -0
    Auto merged

# 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/RESYNC

--- 1.104/client/mysqlbinlog.cc	2005-02-08 23:49:31 +01:00
+++ 1.105/client/mysqlbinlog.cc	2005-02-10 19:15:51 +01:00
@@ -1130,15 +1130,15 @@
     }
     check_header(file, &description_event);
   }
-  else // reading from stdin; TODO: check that it works
+  else // reading from stdin;
   {
-    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, (my_off_t) 0,
 		      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 */
+      /* skip 'start_position' characters from stdin */
       byte buff[IO_SIZE];
       my_off_t length,tmp;
       for (length= start_position_mot ; length > 0 ; length-=tmp)
@@ -1151,8 +1151,6 @@
         }
       }
     }
-    file->pos_in_file= start_position_mot;
-    file->seek_not_done=0;
   }
 
   if (!description_event || !description_event->is_valid())

--- 1.10/mysql-test/r/mysqlbinlog.result	2005-02-03 16:21:56 +01:00
+++ 1.11/mysql-test/r/mysqlbinlog.result	2005-02-10 19:15:51 +01:00
@@ -102,4 +102,14 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values ("Alas");
+
+--- reading stdin --
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+use test;
+SET TIMESTAMP=1065204671;
+BEGIN;
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+use test;
+SET TIMESTAMP=1065204671;
+BEGIN;
 drop table t1, t2;