5.3 merge

2 files changed, 0 insertions, 157 deletions

diff --git a/include/mysql/innodb_priv.h b/include/mysql/innodb_priv.h
deleted file mode 100644
index 5406c292b18..00000000000
--- a/include/mysql/innodb_priv.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (c) 2010, 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
-   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef INNODB_PRIV_INCLUDED
-#define INNODB_PRIV_INCLUDED
-
-/** @file Declaring server-internal functions that are used by InnoDB. */
-
-#include <sql_priv.h>
-
-class THD;
-
-int get_quote_char_for_identifier(THD *thd, const char *name, uint length);
-bool schema_table_store_record(THD *thd, TABLE *table);
-void localtime_to_TIME(MYSQL_TIME *to, struct tm *from);
-bool check_global_access(THD *thd, ulong want_access);
-uint strconvert(CHARSET_INFO *from_cs, const char *from,
-                CHARSET_INFO *to_cs, char *to, uint to_length,
-                uint *errors);
-void sql_print_error(const char *format, ...);
-
-
-
-#endif /* INNODB_PRIV_INCLUDED */
diff --git a/include/mysql/thread_pool_priv.h b/include/mysql/thread_pool_priv.h
deleted file mode 100644
index 4060cf51733..00000000000
--- a/include/mysql/thread_pool_priv.h
+++ /dev/null
@@ -1,121 +0,0 @@
-#error don't use
-/*
-  Copyright (c) 2010, 2011, 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
-  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-1301  USA
-*/
-
-#ifndef THREAD_POOL_PRIV_INCLUDED
-#define THREAD_POOL_PRIV_INCLUDED
-
-/*
-  The thread pool requires access to some MySQL server error codes, this is
-  accessed from mysqld_error.h.
-  We need access to the struct that defines the thread pool plugin interface
-  which is accessed through scheduler.h.
-  All accesses to THD variables and functions are defined in this header file.
-  A thread pool can also use DEBUG_SYNC and must thus include
-  debug_sync.h
-  To handle definitions of Information Schema plugins it is also required
-  to include sql_profile.h and table.h.
-*/
-#include <mysqld_error.h> /* To get ER_ERROR_ON_READ */
-#define MYSQL_SERVER 1
-#include <scheduler.h>
-#include <debug_sync.h>
-#include <sql_profile.h>
-#include <table.h>
-
-/* Needed to get access to scheduler variables */
-void* thd_get_scheduler_data(THD *thd);
-void thd_set_scheduler_data(THD *thd, void *data);
-PSI_thread* thd_get_psi(THD *thd);
-void thd_set_psi(THD *thd, PSI_thread *psi);
-
-/* Interface to THD variables and functions */
-void thd_set_killed(THD *thd);
-void thd_clear_errors(THD *thd);
-void thd_set_thread_stack(THD *thd, char *stack_start);
-void thd_lock_thread_count(THD *thd);
-void thd_unlock_thread_count(THD *thd);
-void thd_close_connection(THD *thd);
-THD *thd_get_current_thd();
-void thd_lock_data(THD *thd);
-void thd_unlock_data(THD *thd);
-bool thd_is_transaction_active(THD *thd);
-int thd_connection_has_data(THD *thd);
-void thd_set_net_read_write(THD *thd, uint val);
-void thd_set_mysys_var(THD *thd, st_my_thread_var *mysys_var);
-my_socket thd_get_fd(THD *thd);
-
-/* Print to the MySQL error log */
-void sql_print_error(const char *format, ...);
-
-/* Store a table record */
-bool schema_table_store_record(THD *thd, TABLE *table);
-
-/*
-  The thread pool must be able to execute statements using the connection
-  state in THD object. This is the main objective of the thread pool to
-  schedule the start of these commands.
-*/
-bool do_command(THD *thd);
-
-/*
-  The thread pool requires an interface to the connection logic in the
-  MySQL Server since the thread pool will maintain the event logic on
-  the TCP connection of the MySQL Server. Thus new connections, dropped
-  connections will be discovered by the thread pool and it needs to
-  ensure that the proper MySQL Server logic attached to these events is
-  executed.
-*/
-/* Initialise a new connection handler thread */
-bool init_new_connection_handler_thread();
-/* Set up connection thread before use as execution thread */
-bool setup_connection_thread_globals(THD *thd);
-/* Prepare connection as part of connection set-up */
-bool thd_prepare_connection(THD *thd);
-/* Release auditing before executing statement */
-void mysql_audit_release(THD *thd);
-/* Check if connection is still alive */
-bool thd_is_connection_alive(THD *thd);
-/* Close connection with possible error code */
-void close_connection(THD *thd, uint errcode);
-/* End the connection before closing it */
-void end_connection(THD *thd);
-/* Cleanup the THD object */
-void thd_cleanup(THD *thd);
-/* Decrement connection counter */
-void dec_connection_count();
-/* Destroy THD object */
-void delete_thd(THD *thd);
-
-/*
-  thread_created is maintained by thread pool when activated since
-  user threads are created by the thread pool (and also special
-  threads to maintain the thread pool). This is done through
-  inc_thread_created.
-
-  max_connections is needed to calculate the maximum number of threads
-  that is allowed to be started by the thread pool. The method
-  get_max_connections() gets reference to this variable.
-
-  connection_attrib is the thread attributes for connection threads,
-  the method get_connection_attrib provides a reference to these
-  attributes.
-*/
-void inc_thread_created(void);
-ulong get_max_connections(void);
-pthread_attr_t *get_connection_attrib(void);
-#endif