Bug#18363910 SKIP MAIN.PLUGIN_LOAD AND MAIN.PLUGIN_LOAD_OPTIONS ON WINDOWS EMBEDDED

The tests plugin_load and plugin_load_options will pre-load the plugin
*before* the test is started, so the 'skip this on windows' logic is executed too late.

Plugin initialization fails because the embedded server is compiled without
performance schema, and the plugin is compiled with performance schema.
In this case, mysql_mutex_register has two different implementations,
breaking the "one-definition-rule". The trick of mapping PSI_server to
PSI_noop works on most platforms, but not windows.

Solution: remove the mutex registration code, the mutex was unused anyways.

Author: Tor Didriksen

mysql-test/t/disabled.def

@@ -16,5 +16,3 @@ archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this le
 ds_mrr-big @solaris      : Bug#14168107 2012-04-03 Hemant disabled new test added by Olav Sandstå,since this leads to timeout on Solaris on slow sparc servers
 mysql_embedded_client_test	: Bug#13964673 2012-04-16 amitbha since most of the test cases are failing
 mysql_client_test_embedded : Bug#16084066 2013-01-08 Disabled since this test is failing
-main.plugin_load  @windows : Bug#18363910 2014-02-07 Anitha Test crashing on windows after fix for bug#17772560
-main.plugin_load_option  @windows : Bug#18363910 2014-02-07 Anitha Test crashing on windows after fix for bug#17772560

storage/example/ha_example.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -104,40 +104,17 @@ static const char* example_system_database();
 static bool example_is_supported_system_table(const char *db,
                                       const char *table_name,
                                       bool is_sql_layer_system_table);
-#ifdef HAVE_PSI_INTERFACE
-static PSI_mutex_key ex_key_mutex_Example_share_mutex;
-
-static PSI_mutex_info all_example_mutexes[]=
-{
-  { &ex_key_mutex_Example_share_mutex, "Example_share::mutex", 0}
-};
-
-static void init_example_psi_keys()
-{
-  const char* category= "example";
-  int count;
-
-  count= array_elements(all_example_mutexes);
-  mysql_mutex_register(category, all_example_mutexes, count);
-}
-#endif
 
 Example_share::Example_share()
 {
   thr_lock_init(&lock);
-  mysql_mutex_init(ex_key_mutex_Example_share_mutex,
-                   &mutex, MY_MUTEX_INIT_FAST);
 }
 
 
 static int example_init_func(void *p)
 {
   DBUG_ENTER("example_init_func");
 
-#ifdef HAVE_PSI_INTERFACE
-  init_example_psi_keys();
-#endif
-
   example_hton= (handlerton *)p;
   example_hton->state=                     SHOW_OPTION_YES;
   example_hton->create=                    example_create_handler;

storage/example/ha_example.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -42,13 +42,11 @@
 */
 class Example_share : public Handler_share {
 public:
-  mysql_mutex_t mutex;
   THR_LOCK lock;
   Example_share();
   ~Example_share()
   {
     thr_lock_delete(&lock);
-    mysql_mutex_destroy(&mutex);
   }
 };