bzr commit into mysql-trunk branch (magne.mahre:3714)

[Magne Mahre]

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

 3714 Magne Mahre	2011-03-01 [merge]
      Merge from mysql-5.5.  No conflicts

    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:05:37 +0000
+++ b/mysys/my_init.c	2011-03-01 13:39:58 +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:05:37 +0000
+++ b/mysys/my_thr_init.c	2011-03-01 13:39:58 +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;
 }
 

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).