From: Tor Didriksen
Date: November 1 2010 7:54am
Subject: bzr commit into mysql-trunk-bugfixing branch (tor.didriksen:3308) WL#5625
List-Archive: http://lists.mysql.com/commits/122394
Message-Id: <20101101075405.81A62376A@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3907774690455551418=="

--===============3907774690455551418==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/trunk-bugfixing/ based on revid:li-bing.song@stripped

 3308 Tor Didriksen	2010-11-01
      wL#5625: post-push fix, build broken on all DBG/gcc platforms.
     @ client/mysqlbinlog.cc
        Remove unused static function.

    modified:
      client/mysqlbinlog.cc
=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc	2010-10-29 15:57:09 +0000
+++ b/client/mysqlbinlog.cc	2010-11-01 07:53:58 +0000
@@ -632,45 +632,6 @@ static bool shall_skip_database(const ch
 
 
 /**
-  Prints the given event in base64 format.
-
-  The header is printed to the head cache and the body is printed to
-  the body cache of the print_event_info structure.  This allows all
-  base64 events corresponding to the same statement to be joined into
-  one BINLOG statement.
-
-  @param[in] ev Log_event to print.
-  @param[in,out] result_file FILE to which the output will be written.
-  @param[in,out] print_event_info Parameters and context state
-  determining how to print.
-
-  @retval ERROR_STOP An error occurred - the program should terminate.
-  @retval OK_CONTINUE No error, the program should continue.
-*/
-static Exit_status
-write_event_header_and_base64(Log_event *ev, FILE *result_file,
-                              PRINT_EVENT_INFO *print_event_info)
-{
-  IO_CACHE *head= &print_event_info->head_cache;
-  IO_CACHE *body= &print_event_info->body_cache;
-  DBUG_ENTER("write_event_header_and_base64");
-
-  /* Write header and base64 output to cache */
-  ev->print_header(head, print_event_info, FALSE);
-  ev->print_base64(body, print_event_info, FALSE);
-
-  /* Read data from cache and write to result file */
-  if (copy_event_cache_to_file_and_reinit(head, result_file) ||
-      copy_event_cache_to_file_and_reinit(body, result_file))
-  {
-    error("Error writing event to file.");
-    DBUG_RETURN(ERROR_STOP);
-  }
-  DBUG_RETURN(OK_CONTINUE);
-}
-
-
-/**
   Print the given event, and either delete it or delegate the deletion
   to someone else.
 


--===============3907774690455551418==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   1nsaf1zhr1i0wmmj
# target_branch: file:///export/home/didrik/repo/trunk-bugfixing/
# testament_sha1: d0df894eaf9171ee7c51aa27c77a144c50adeaf8
# timestamp: 2010-11-01 08:54:05 +0100
# base_revision_id: li-bing.song@stripped\
#   80nyv67ynh88rbq6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYhot24AAZFfgEAQWGf/91aE
FAC////wUAO9eAe7DoAA1GpkNRkaPUG1NMg9QB6hkeoGgwGgAAGgAAAAAEIpnkpmQgbUDJpoMQaD
Rpo0GqfpTCamgyHqZBoANANAACSRNAAEwgCZNDTSn6p6mTBPU1vvirgKZ55boSR1cTGAMRcJek0U
tKySKuI8KZRHC4qQUVbyw0Za7LZocEaiQ0gk4VNAmOVlm4xHMHaV2qMQM8I038Uy2rK3KPC1Zvwh
+tVf4RNBMlrSc9YfM+cKJdJBb21Ll72JkEEC0GVvIcgZSLfwofEox4RqUac2UPjWwVSKYBBAyCmJ
yFyNkssSB8Ub9k93j/U135mj9a+MsR6W2GXD4TqtWbTvsxZSi/kwtQmEaHOajP9WlhpKMNbpJX8q
IMK34zyG8pcq6rs1YTix3uljljzWCaRqLpmL2waJNsUpO897TG1QRuDULbfN4mdHNa/C8VGaudCZ
xbidFr9oXz000OpVWXEse+2JuCvdBhjUftdVZXuVqxUvTPAwgKH1WWMoTxlEj1EqCaIUHwM1JjmB
ScAoSBqTHBOJgbCgJhMMcL7j4mt0gaQtWKAU6ukr1NDC6wiyCLIfcjLC2BQQNSBSNKCFYDGNRIpM
hXRuuMD1bT7d8YJMp5AY/H5pItPrQfW07B43RDLuzbM+O3cfHuB3VNIDw977LIoVzIzPJzo9XPot
5hc3CiPOPipVUjK1R3wbNaLcGXwis5nHuj6htkkZgKapEhoRW7h2NW60z86s2oVE8yfEpR3WGyxL
ge0qD+rqe7CJ4WhnVEl5CxcqaThsKURAaKqEyZ80CUXzsclZzvL7d4Tkls6tMnRJlyzx9ZZuE+tT
BIna8k3IW2rxvIEROfvrub2OO0cPsZ3REQXMvFou2tZ+VEic8MlT12itPNaxTnHerntV2+g/vgk+
ckeeilA8seCIzZEFs9a/xkfzhlHpOy2B22VkWD0e6Zy+N+tuaxXlr02g/rGB80cAsUTPev57dER6
MWAMnJx5/CbZfgjzquSMFJOUHss0o8BXySEv35r2okmZixOcMk3WeKAOicJluUsIkWilEOZPcvC4
EiqvQ0+QKqVHbasZD66JfQDBUG9yanX6tOFWtmB5B8bYVR5X9qF4dNSijWyWnoJhwKX7KCKeVpId
fQB0wap4VQhBlqdzFYfaPK8CxzYtTuBpyxplz5tJyRSWthEG5MU5Xl7A5vgeNXKbY1Q3Gc8rS0Z/
ekKgfI5V4bEcpE0dj5Npe2KuhBfdZBX08xeLu7RrhbxYqwXZfK5otV26ek7Cq9//F3JFOFCQiGi3
bg==


--===============3907774690455551418==--