From 5a1314a85fb1932b4435d5bc692c3d8d194317ab Mon Sep 17 00:00:00 2001
From: Magne Mahre <magne.mahre@oracle.com>
Date: Tue, 1 Mar 2011 14:36:47 +0100
Subject: [PATCH] Post-push cleanup, for Bug#11763065 et al.

---
 mysys/my_init.c     | 14 +++++---------
 mysys/my_thr_init.c |  5 -----
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/mysys/my_init.c b/mysys/my_init.c
index 5534dc07209..4963ce9b577 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -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;
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c
index 1482ff28975..28f6412ed5b 100644
--- a/mysys/my_thr_init.c
+++ b/mysys/my_thr_init.c
@@ -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;
 }