bzr commit into mysql-6.0-telco-6.4 branch (tomas.ulin:2823)

[Tomas Ulin]

#At file:///home/tomas/mysql_src/mysql-6.0-telco-6.4/

 2823 Tomas Ulin	2009-01-29
      post merge fixes
modified:
  include/config-win.h
  mysql-test/suite/ndb/r/ndb_restore_undolog.result
  sql/mysqld.cc

=== modified file 'include/config-win.h'
--- a/include/config-win.h	2009-01-28 09:55:02 +0000
+++ b/include/config-win.h	2009-01-29 15:53:38 +0000
@@ -470,6 +470,7 @@ inline ulonglong double2ulonglong(double
 #ifndef EMBEDDED_LIBRARY
 #define HAVE_LIBEVENT 1
 #define HAVE_POOL_OF_THREADS 1
+#endif
 
 /* Windows doesn't define ENOTSUP, define it as the same as Solaris */
 #ifndef ENOTSUP

=== modified file 'mysql-test/suite/ndb/r/ndb_restore_undolog.result'
--- a/mysql-test/suite/ndb/r/ndb_restore_undolog.result	2008-12-15 12:34:21 +0000
+++ b/mysql-test/suite/ndb/r/ndb_restore_undolog.result	2009-01-29 15:53:38 +0000
@@ -114,8 +114,8 @@ t_pk	t_test	t_date	t_datetime	t_timestam
 2	1	1998-01-01	2006-08-10 10:11:12	2002-10-29 16:51:06	19:38:34	2155
 SELECT t_pk,t_test,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num ORDER by t_pk;
 t_pk	t_test	hex(t_bit)	t_tinyint	t_bool	t_smallint	t_mediumint	t_int	t_bigint	t_float	t_double	t_decimal
-1	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
-2	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
+1	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e20	1e150	331.0000000000000000
+2	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e20	1e150	331.0000000000000000
 SELECT t_pk,t_test,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1 ORDER by t_pk;
 t_pk	t_test	t_char	t_varchar	hex(t_binary)	hex(t_varbinary)
 1	1	abcdefghijklmn	abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn	612020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	4100
@@ -276,8 +276,8 @@ t_pk	t_test	t_date	t_datetime	t_timestam
 2	1	1998-01-01	2006-08-10 10:11:12	2002-10-29 16:51:06	19:38:34	2155
 SELECT t_pk,t_test,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num ORDER by t_pk;
 t_pk	t_test	hex(t_bit)	t_tinyint	t_bool	t_smallint	t_mediumint	t_int	t_bigint	t_float	t_double	t_decimal
-1	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
-2	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
+1	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e20	1e150	331.0000000000000000
+2	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e20	1e150	331.0000000000000000
 SELECT t_pk,t_test,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1 ORDER by t_pk;
 t_pk	t_test	t_char	t_varchar	hex(t_binary)	hex(t_varbinary)
 1	1	abcdefghijklmn	abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn	612020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	4100

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-01-28 12:46:07 +0000
+++ b/sql/mysqld.cc	2009-01-29 15:53:38 +0000
@@ -1718,7 +1718,6 @@ static void network_init(void)
 #ifdef HAVE_SYS_UN_H
   struct sockaddr_un	UNIXaddr;
 #endif
-  int	arg;
   int   ret;
   uint  waited;
   uint  this_wait;