List:Commits« Previous MessageNext Message »
From:Sunny Bains Date:March 6 2013 5:39am
Subject:bzr push into mysql-trunk branch (Sunny.Bains:4249 to 4250) WL#6044
View as plain text  
 4250 Sunny Bains	2013-03-06
      WL#6044 - os_event_init() has to be called before all other initialisation
      because on Windows we need to setup the function pointers.

    modified:
      storage/innobase/srv/srv0srv.cc
 4249 Sunny Bains	2013-03-06 [merge]
      WL#6044 - Merge from mysql-trunk.

    added:
      mysql-test/include/index_merge_delete.inc
      mysql-test/include/index_merge_insert-and-replace.inc
      mysql-test/include/index_merge_intersect_dml.inc
      mysql-test/include/index_merge_multi_col_setup.inc
      mysql-test/include/index_merge_single_col_setup.inc
      mysql-test/include/index_merge_update.inc
      mysql-test/r/index_merge_delete.result
      mysql-test/r/index_merge_insert-and-replace.result
      mysql-test/r/index_merge_intersect_dml.result
      mysql-test/r/index_merge_update.result
      mysql-test/t/index_merge_delete.test
      mysql-test/t/index_merge_insert-and-replace.test
      mysql-test/t/index_merge_intersect_dml.test
      mysql-test/t/index_merge_update.test
    modified:
      libmysql/authentication_win/common.h
      libmysql/authentication_win/plugin_client.cc
      mysql-test/suite/innodb_fts/r/innodb-fts-basic.result
      mysql-test/suite/innodb_fts/t/innodb-fts-basic.test
      storage/innobase/buf/buf0buf.cc
      storage/innobase/fts/fts0ast.cc
      tests/mysql_client_test.c
=== modified file 'storage/innobase/srv/srv0srv.cc'
--- a/storage/innobase/srv/srv0srv.cc	revid:sunny.bains@stripped
+++ b/storage/innobase/srv/srv0srv.cc	revid:sunny.bains@stripped
@@ -992,12 +992,11 @@ void
 srv_general_init(void)
 /*==================*/
 {
+	os_event_init();
 	sync_check_init();
-
 	ut_mem_init();
 	/* Reset the system variables in the recovery module. */
 	recv_sys_var_init();
-	os_event_init();
 	os_thread_init();
 	mem_init(srv_mem_pool_size);
 	que_init();

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (Sunny.Bains:4249 to 4250) WL#6044Sunny Bains3 Apr