bk commit into 5.1 tree (hartmut:1.1957)

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut 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.1957 05/12/06 14:19:17 hartmut@stripped +1 -0
  Merge hholzgraefe@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/hartmut/projects/mysql/dev/5.1

  client/mysqlbinlog.cc
    1.124 05/12/06 14:19:02 hartmut@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:	hartmut
# Host:	host-n19-45.mysql.com
# Root:	/home/hartmut/projects/mysql/dev/5.1/RESYNC

--- 1.123/client/mysqlbinlog.cc	2005-12-04 19:55:14 +01:00
+++ 1.124/client/mysqlbinlog.cc	2005-12-06 14:19:02 +01:00
@@ -516,6 +516,9 @@
       start_datetime= 0;
       offset= 0; // print everything and protect against cycling rec_count
     }
+    if (server_id && (server_id != ev->server_id)) {
+      DBUG_RETURN(0);
+    }
     if (((my_time_t)(ev->when) >= stop_datetime)
         || (pos >= stop_position_mot))
     {
@@ -742,6 +745,11 @@
    (gptr*) &stop_position, (gptr*) &stop_position, 0, GET_ULL,
    REQUIRED_ARG, (ulonglong)(~(my_off_t)0), BIN_LOG_HEADER_SIZE,
    (ulonglong)(~(my_off_t)0), 0, 0, 0},
+  {"server-id", OPT_SERVER_ID,
+   "Only extract binlog entries created by a certain server id "
+   "passed on the command line.",
+   (gptr*) &server_id, (gptr*) &server_id, 0, GET_ULONG,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"to-last-log", 't', "Requires -R. Will not stop at the end of the \
 requested binlog but rather continue printing until the end of the last \
 binlog of the MySQL server. If you send the output to the same MySQL server, \