From: Magne Mahre
Date: March 1 2011 1:36pm
Subject: bzr commit into mysql-5.5 branch (magne.mahre:3361) Bug#11763065
List-Archive: http://lists.mysql.com/commits/132201
X-Bug: 11763065
Message-Id: <201103011336.p21DaqDf026198@dm-uk-02.uk.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1088288851928074402=="

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

#At file:///export/home/tmp/x/mysql-5.5/ based on revid:alexander.barkov@stripped

 3361 Magne Mahre	2011-03-01
      Post-push cleanup, for Bug#11763065 et al.

    modified:
      mysys/my_init.c
      mysys/my_thr_init.c
=== modified file 'mysys/my_init.c'
--- a/mysys/my_init.c	2011-03-01 12:03:31 +0000
+++ b/mysys/my_init.c	2011-03-01 13:36:47 +0000
@@ -55,17 +55,13 @@ MYSQL_FILE *mysql_stdin= NULL;
 static MYSQL_FILE instrumented_stdin;
 
 
-/*
-  Init my_sys functions and my_sys variabels
+/**
+  Initialize my_sys functions, resources and variables
 
-  SYNOPSIS
-    my_init()
-
-  RETURN
-    0  ok
-    1  Couldn't initialize environment
+  @return Initialization result
+    @retval 0 Success
+    @retval 1 Error. Couldn't initialize environment
 */
-
 my_bool my_init(void)
 {
   char *str;

=== modified file 'mysys/my_thr_init.c'
--- a/mysys/my_thr_init.c	2011-03-01 12:03:31 +0000
+++ b/mysys/my_thr_init.c	2011-03-01 13:36:47 +0000
@@ -231,11 +231,6 @@ my_bool my_thread_global_init(void)
   install_sigabrt_handler();
 #endif
 
-//  if (my_thread_init())
-//  {
-//    my_thread_global_end();			/* Clean up */
-//    return 1;
-//  }
   return 0;
 }
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magne.mahre@stripped
# target_branch: file:///export/home/tmp/x/mysql-5.5/
# testament_sha1: 5c57aa643f9f2cb9fe7101814658ce8ef973f8f0
# timestamp: 2011-03-01 14:36:51 +0100
# base_revision_id: alexander.barkov@stripped\
#   k4bscs7hb2diqa7k
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbxx0IEAAg7fgEAQWPf/91oi
SAC////wUAS4vaVSTodtTrzt0EpJqaNMTQPUzUyaNAAAADQJJSMGiTbSHqj9U03qmh6jTQAGjIBK
ENTRMaSMDCmp6gAaB5T0g0DJETajagD1PU0NA0BoAAGgSSJpoCMBBpG0U9MhqNEY0g2jHbdvy8lO
v06dhx56tefBOK3bHTFUiqHBzOqOlatnsEYK9x8yQqqqh1/PRKd7zdrltuq5xri8J1NFT708u+q+
Mnv3Yx2Kc+3m/Wb7yik7mRH7i3w4DFPAw2fBCCoHaFkGLV6vRBZQTDkH5JTAiHkIyN2Z4hH5WtgW
jwkyAuWRZVIbiiCFazUBfvgEgPOaFzQnnuS3vQEj1OpKfdIJBIHTNSyRVAtSxUJnL6uHjjNBIBtH
uPKxwheskNcUfonjNc7KUC4wDUQGvs01cXz49n6/H2CqJWThuAqNjBacjzJpShCcXMuBhwW4iUeJ
Qrab4KhiP7RtWSYETbttNM1wQRlBjIYrEaGfhvaIGsugp6ZSzK//jyAxLY4lof6Axu6kYF5eHGCl
YDboMliVI5mmzkKWERaoELJ6aNMkMeRduI8DcEFYQUvU56ECenBmmKnxfCDOAxY2P4MiQbGGrUGJ
Y45lhhkpkwFMQxIWrXYanlTF7A99nmYp/TkmUl16sLjhJi6MlaF9O5TQaZqZtYTaGuSJCsN41SWa
Li8q5hfhRHWGpXCjJGqAK6yUyIyt5rfwvJz5F7xg6ehzkPkmQT/YpHsyZveQcy6MzU1kh37MMORp
6QCAYDxbTBu6z+NvfQ9NYllwuxI3xSGZIiaIKwIEKp9ittyJOerU+g7dZxqvnt67+69R52OhmdiY
o31qk5gVCqoKOpGOB2eSkCsjMepnbrPDxczCXhYJXaKsCO5nF+ELzZgV8pweQiGEl8USmR8EFdOb
SsDita30/eBxO5vq0mGYSckMSWhQfToSdjQsoKipIzpJ2dUUo5urNPDPK2Vy3OzTE6o7KGgMYmhF
Blzg1s08kc9egXCLgoHAKU5KeIa6isUhiNxm5yooWouX0SLys0zLAbs8zIzGLxfY0HAqAOvBuht+
Y0gorVUdR5wVIK4JiMpkxnu/kNjeoimIbEOpFi+4vnpvQzlgKBxIOUpqOacMwExrIGy1DQMVchxy
ImCnMjs2wIorcHQ46GoSYG6TJbIE2hWckKkBt5/R/aYbTxRCpHLTJ8DHMd5JkBwLmPQzEVK9U+Sn
MVJlGDRQygCg+Zhf+zPLw+gykYIuTuVWQHAzEcwSIGekpBEnwE5SFnIo0V6GyF2BYMYfIgQCAscG
sheoTk2SkZY9Hg4SokCZiwDCTWDi2ZZgp6VHMWJ0MtD8/efNlYNe3h1MSJLJRBU4wPg0PYizy9Dx
xmB7HIrDpEq8jzZmueGDVotHOrgYemcv7kyrEiSibQlMbDQLOhaldLUzoR47ihRBQdQqwSJ8Ze9X
nBpnZkl+nkPTzGIVIxMi81DiwcUjwPY8TaTrQZHEY+YGxSpUmCcqiuQUf4LuSKcKEheOOhAg


--===============1088288851928074402==--