From: Alexander Nozdrin
Date: December 24 2009 7:10am
Subject: bzr commit into mysql-5.5-trunk branch (alik:2932) Bug#37408 Bug#49898
List-Archive: http://lists.mysql.com/commits/95622
X-Bug: 37408,49898
Message-Id: <20091224071010.F375F7FD27@quad>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_EpDcC2oNLyQ8sW+yHk4ZWA)"

--Boundary_(ID_EpDcC2oNLyQ8sW+yHk4ZWA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///mnt/raid/alik/MySQL/bzr/00.builds/mysql-trunk/ based on revid:alik@stripped

 2932 Alexander Nozdrin	2009-12-24
      Postfix for Bug#37408 (fix for Bug#49898).

    modified:
      storage/myisam/mi_static.c
=== modified file 'storage/myisam/mi_static.c'
--- a/storage/myisam/mi_static.c	2009-12-17 11:45:13 +0000
+++ b/storage/myisam/mi_static.c	2009-12-24 07:10:05 +0000
@@ -41,7 +41,6 @@ my_off_t myisam_max_temp_length= MAX_FIL
 ulong    myisam_bulk_insert_tree_size=8192*1024;
 ulong    myisam_data_pointer_size=4;
 ulonglong    myisam_mmap_size= SIZE_T_MAX, myisam_mmap_used= 0;
-pthread_mutex_t  THR_LOCK_myisam_mmap;
 
 static int always_valid(const char *filename __attribute__((unused)))
 {


--Boundary_(ID_EpDcC2oNLyQ8sW+yHk4ZWA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/alik@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/alik@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alik@stripped
# target_branch: file:///mnt/raid/alik/MySQL/bzr/00.builds/mysql-\
#   trunk/
# testament_sha1: 6fa0774b1b0a53c950ce43989c476f8efbd2e78c
# timestamp: 2009-12-24 10:10:10 +0300
# base_revision_id: alik@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUQJN0AAAX5fgEAQWWP//3IB
QAC////wUAONT1t3dXSqNnvCSUaCDCPUwmVPTaNKeE1G9JPUB6g1Sepkz0mkemo2oaYTExDEBoya
CSJppVP009FNJs1QzIanpAYgBiDRKNHpG1PUNMgPRD1NGTBNGjICShNCYjanpqjZJptJ6jQaGgNA
aJ6NplxH63JhlmaqmyFxnZFboJa2yt0az66mZiLufl0l39bUG/St5/XzPxc8Gq1mPFha8+WXOU93
NR5bm+AnfKFIyPOCsNBW4RTOx87LzzTqFLrWqHe+dXJGoa273ROEiyd26G39pkk4ig52MOk+5KlB
ELnIIqSQdfoscQqza5UUFiHDSYm4ysInbS+yniYEcoYqvhDKiBwHVHLSMU5PChIctQwRWowaK4mz
sDotoN0xBtM16sFM1P2Ox9P7OmOowPkKC5LRegr6yc5DYkOZWGtzU6T6FZuVpKWZcD1bRrptlhap
LNRUUGctNZgbbxoxx9ioz6FVCBgr+cg9NWV6bqifpXE0g4WGHUjvmyCuIWGSGpg4SEsoQ8Y4bJpR
lgpQSHHLmRhu1KZuIqMnGMhy1ewWoWCtNR5hWT0geEPcuyObC8MV82mkOlHuxFE0Cx8nP1DFASNB
DM5kD64Bj/ch2zsspSfD741O5dpxZQ2hIbDecDuqtJ91w4oNqPNnYuIEz46iqXB83akXypFmcunI
tKzErJhTDjtr65bg0uUlQRJXk9gwj4Pp43NK0jJqjvtwOewfumT5FBULQK86DqYh5wyyJ18XHIzy
cD8FmGltA5D7Sbfi82QdUyKmLymflYFpQ9OhlA1SKJ+paTItmHExIO4rPbZuLOW9KXQ9G7E7N5BK
flHYacTWDcTGaI6bSoqjvW6FNRtrXoURNwHeBYCPYIzPf4C3bi2bUBxwAurJrGiiLA0KThEgfjSp
g/NqRv6mE016RHYmPivQd8TZLuJeJwq8ZyTWkMomC84ZowZ0EGmS2Y5BGyGUPZ8tlQKMDGJEhuQy
lgXrrR69goeX37Vh1FGZgrnaWUbYSnPlb2KICvqKYhuZQI39cC4mfx3bGVMLcdS6abQqQxDp3GbM
4e0hixQBj11ljJUJ6zUh1fyQ2M/lc4wvIBVUOtkUzz0rIecU9FQVMHsVzSjwOf3N+ZInzNcaalo9
HARys77QgFlBYpUmLgWFgcJcJ1hCDeUZ6iSSQ0YNiwxpJVA2P4u5IpwoSCIEm6AA


--Boundary_(ID_EpDcC2oNLyQ8sW+yHk4ZWA)--