Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1

into  janus.mylan:/usr/home/serg/Abk/mysql-maria


Makefile.am:
  Auto merged
configure.in:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_dbug.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
server-tools/instance-manager/CMakeLists.txt:
  Auto merged
server-tools/instance-manager/mysql_connection.cc:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  merged
sql/handler.h:
  merged
sql/mysql_priv.h:
  merged
sql/mysqld.cc:
  merged
sql/set_var.cc:
  merged
sql/sql_select.cc:
  merged
sql/sql_show.cc:
  merged
unittest/mysys/my_atomic-t.c:
  merged

server-tools/instance-manager/CMakeLists.txt

@@ -25,7 +25,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instanc
                             instance_options.cc listener.cc log.cc manager.cc messages.cc mysql_connection.cc
                             mysqlmanager.cc options.cc parse.cc parse_output.cc priv.cc protocol.cc
                             thread_registry.cc user_map.cc IMService.cpp WindowsService.cpp
-                            user_management_commands.cc
+                            user_management_commands.cc ../../mysys/my_rnd.c
                             ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c
                             ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c
                             ../../libmysql/errmsg.c)

server-tools/instance-manager/listener.cc

@@ -17,12 +17,12 @@
 #pragma implementation
 #endif
 
-#include "listener.h"
-
 #include <my_global.h>
 #include <mysql.h>
-#include <violite.h>
+#include <my_sys.h>
+#include "listener.h"
 
+#include <violite.h>
 #include <sys/stat.h>
 #ifndef __WIN__
 #include <sys/un.h>

server-tools/instance-manager/mysql_connection.cc

@@ -17,13 +17,12 @@
 #pragma implementation
 #endif
 
-#include "mysql_connection.h"
-
-#include <m_string.h>
-#include <m_string.h>
 #include <my_global.h>
 #include <mysql.h>
 #include <my_sys.h>
+#include "mysql_connection.h"
+
+#include <m_string.h>
 #include <violite.h>
 
 #include "command.h"
@@ -88,7 +87,7 @@ bool Mysql_connection::init()
   {
     ulong seed1= (ulong) &rand_st + rand();
     ulong seed2= (ulong) rand() + (ulong) time(0);
-    randominit(&rand_st, seed1, seed2);
+    my_rnd_init(&rand_st, seed1, seed2);
   }
 
   /* Fill scramble - server's random message used for handshake */

server-tools/instance-manager/mysql_connection.h

@@ -17,7 +17,6 @@
 #define INCLUDES_MYSQL_INSTANCE_MANAGER_MYSQL_CONNECTION_H
 
 #include "thread_registry.h"
-#include <mysql_com.h>
 
 #if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
 #pragma interface
@@ -55,7 +54,7 @@ private:
   Thread_registry *thread_registry;
   User_map *user_map;
   NET net;
-  struct rand_struct rand_st;
+  struct my_rnd_struct rand_st;
   char scramble[SCRAMBLE_LENGTH + 1];
   uint status;
   ulong client_capabilities;