From: Tor Didriksen
Date: September 9 2010 1:56pm
Subject: bzr push into mysql-5.5-bugfixing branch (tor.didriksen:3203 to 3204)
List-Archive: http://lists.mysql.com/commits/117888
Message-Id: <20100909135618.C586629D0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8277974803357673177=="

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

 3204 Tor Didriksen	2010-09-09
      fix typo in previous patch

    modified:
      mysys/my_sync.c
 3203 Vasil Dimov	2010-09-09
      Fix compiler warnings about unused parameters:
      
      mysys/my_sync.c: In function 'my_sync_dir':
      mysys/my_sync.c:103:29: error: unused parameter 'dir_name'
      mysys/my_sync.c:103:43: error: unused parameter 'my_flags'
      mysys/my_sync.c: In function 'my_sync_dir_by_file':
      mysys/my_sync.c:144:37: error: unused parameter 'file_name'
      mysys/my_sync.c:144:52: error: unused parameter 'my_flags'

    modified:
      mysys/my_sync.c
=== modified file 'mysys/my_sync.c'
--- a/mysys/my_sync.c	2010-09-09 13:15:48 +0000
+++ b/mysys/my_sync.c	2010-09-09 13:55:37 +0000
@@ -152,6 +152,7 @@ int my_sync_dir_by_file(const char *file
   size_t dir_name_length;
   dirname_part(dir_name, file_name, &dir_name_length);
   return my_sync_dir(dir_name, my_flags);
+}
 #else /* NEED_EXPLICIT_SYNC_DIR */
 int my_sync_dir_by_file(const char *file_name __attribute__((unused)),
 			myf my_flags __attribute__((unused)))


--===============8277974803357673177==
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\
#   1ockmcb5n37mqyhu
# target_branch: file:///export/home/didrik/repo/5.5-bugfixing/
# testament_sha1: 958c7176e5ae4090cc900ca38e07dff09f558e7d
# timestamp: 2010-09-09 15:56:18 +0200
# base_revision_id: vasil.dimov@stripped\
#   df4vgmucy6scie3i
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdJcpSEAAV1fgAAQUGP/91YA
BAC////yUANVbwSa5Oe3nCUhR6mnqGmjJtDUBoAGjQAkkQjU/Qp+jTUaI0ND1PUANACSSNopmqeR
lB6TE0yNGgAGgyUQ9NI0GT1PU9T0QZGINNAAlEJNoaGip+E00aaZU8ggNGEJ/zenL8a6cSdzQAws
dKdD56y/tsZmPbyX1RUxDWPZ7beXf70fG1XuJYUOVJYynHuFqE0QqEiLRCa4GKewlj6CcrL4Wrak
TS5BfKMKuFIsJu4FDxDkhvgYcUlxXr8D4hXBhFQjBVhNQlhWPGlBWa4iOLmBl22D2unJXvi6IWCi
Lq5Pwf6eJUC+kC1mUayie1TA9BJhRiiGZQX3KTpBQcV+zD4OHY1wJeNd8xQFOM7QHX5olhoJ7nAv
wOMAeaUS4qMKmCyGig0lGBTsKQuh5FoXj16a1uEWkmFDqCsE4mKszEzecLpNZpk4XDHGnYNxhpXO
iMSNJtEkKoJA57yATMQ0aS6fPZK3NVTSTQjoYck722UsmEuqhez3QHgmdqyYPJpVhxMeGVjXm9tv
t4/wRSexkx921aqQdQ6buOqZb9JA5MsoZkfLfHhEKsitobWWNoeheGAxaztoc7h953aiaNbwtHbP
LpPXoHhLk3JTeBtMfYSS3N1dJu3bwm/QTkjnSMOYMc5V9eULldUnS30rHZHaGNqJmKEqBdxyQTRH
eWDBLjWV1nJWTPDbAxjk6FKrzX1YHKw2LIAVlaKSE0t2iTZORINRcxA14AfHdGSE+Et18K6qWDD9
3gZEGrpDsadIQBy3buYmNKh8Crv8p8ckRvnSCpM4eBWGaOHBifwKvb353unDihtAb5zuiepcHBom
oJiDQewPDpEQU609ZdaEQxS4UJaMxftjUEYnYLcHvsT4NM+hNUk2rcrXCtiTogywILLpicBY8TJI
1NMPKJy3pckhgoqQV83ALCbTcGbEQpgCu7cbMSoC8RrBeI3IS4oSWwkUT6wJe3cCZLmvkcFcf0Sx
tCXsBVopCIYgzadI8ftoKsJ2jq1GzzZvEve63YeFGzjAiRGdpALAqZYw0RTjwB9RjxqWUSKLg1Le
GSJZF3T614M2pSWYYpxZ1k1WeZNzb/i7kinChIaS5SkI


--===============8277974803357673177==--