Adding upstream version 1:10.11.6.upstream/1%10.11.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 71 insertions, 0 deletions

diff --git a/storage/myisammrg/myrg_static.c b/storage/myisammrg/myrg_static.c
new file mode 100644
index 00000000..36ec25cb
--- /dev/null
+++ b/storage/myisammrg/myrg_static.c
@@ -0,0 +1,71 @@
+/* Copyright (c) 2000, 2001, 2005, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Use is subject to license terms.
+
+   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
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+/*
+  Static variables for pisam library. All definied here for easy making of
+  a shared library
+*/
+
+#ifndef stdin
+#include "myrg_def.h"
+#endif
+
+LIST	*myrg_open_list=0;
+static const char *merge_insert_methods[] =
+{ "FIRST", "LAST", NullS };
+TYPELIB merge_insert_method= { array_elements(merge_insert_methods)-1,"",
+			       merge_insert_methods, 0};
+
+PSI_memory_key rg_key_memory_MYRG_INFO;
+PSI_memory_key rg_key_memory_children;
+
+#ifdef HAVE_PSI_INTERFACE
+PSI_mutex_key rg_key_mutex_MYRG_INFO_mutex;
+
+static PSI_mutex_info all_myisammrg_mutexes[]=
+{
+  { &rg_key_mutex_MYRG_INFO_mutex, "MYRG_INFO::mutex", 0}
+};
+
+PSI_file_key rg_key_file_MRG;
+
+static PSI_file_info all_myisammrg_files[]=
+{
+  { &rg_key_file_MRG, "MRG", 0}
+};
+
+static PSI_memory_info all_myisammrg_memory[]=
+{
+  { &rg_key_memory_MYRG_INFO, "MYRG_INFO", 0},
+  { &rg_key_memory_children, "children", 0}
+};
+
+void init_myisammrg_psi_keys()
+{
+  const char* category= "myisammrg";
+  int count;
+
+  count= array_elements(all_myisammrg_mutexes);
+  mysql_mutex_register(category, all_myisammrg_mutexes, count);
+
+  count= array_elements(all_myisammrg_files);
+  mysql_file_register(category, all_myisammrg_files, count);
+
+  count= array_elements(all_myisammrg_memory);
+  mysql_memory_register(category, all_myisammrg_memory, count);
+}
+#endif /* HAVE_PSI_INTERFACE */
+