From 72e7f011b29998d8a3e15eb5b381ef962af5fe5b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 5 Apr 2019 10:30:58 +0300
Subject: Upgrade to 8.0.15

---
 mysql/mysql/psi/mysql_table.h | 142 ------------------------------------------
 1 file changed, 142 deletions(-)
 delete mode 100644 mysql/mysql/psi/mysql_table.h

(limited to 'mysql/mysql/psi/mysql_table.h')

diff --git a/mysql/mysql/psi/mysql_table.h b/mysql/mysql/psi/mysql_table.h
deleted file mode 100644
index 00f7566..0000000
--- a/mysql/mysql/psi/mysql_table.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright (c) 2010, 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
-  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,
-  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
-
-#ifndef MYSQL_TABLE_H
-#define MYSQL_TABLE_H
-
-/**
-  @file mysql/psi/mysql_table.h
-  Instrumentation helpers for table io.
-*/
-
-#include "mysql/psi/psi.h"
-
-#ifndef PSI_TABLE_CALL
-#define PSI_TABLE_CALL(M) PSI_DYNAMIC_CALL(M)
-#endif
-
-/**
-  @defgroup Table_instrumentation Table Instrumentation
-  @ingroup Instrumentation_interface
-  @{
-*/
-
-/**
-  @def MYSQL_TABLE_WAIT_VARIABLES
-  Instrumentation helper for table waits.
-  This instrumentation declares local variables.
-  Do not use a ';' after this macro
-  @param LOCKER the locker
-  @param STATE the locker state
-  @sa MYSQL_START_TABLE_IO_WAIT.
-  @sa MYSQL_END_TABLE_IO_WAIT.
-  @sa MYSQL_START_TABLE_LOCK_WAIT.
-  @sa MYSQL_END_TABLE_LOCK_WAIT.
-*/
-#ifdef HAVE_PSI_TABLE_INTERFACE
-  #define MYSQL_TABLE_WAIT_VARIABLES(LOCKER, STATE) \
-    struct PSI_table_locker* LOCKER; \
-    PSI_table_locker_state STATE;
-#else
-  #define MYSQL_TABLE_WAIT_VARIABLES(LOCKER, STATE)
-#endif
-
-/**
-  @def MYSQL_START_TABLE_LOCK_WAIT
-  Instrumentation helper for table lock waits.
-  This instrumentation marks the start of a wait event.
-  @param LOCKER the locker
-  @param STATE the locker state
-  @param PSI the instrumented table
-  @param OP the table operation to be performed
-  @param FLAGS per table operation flags.
-  @sa MYSQL_END_TABLE_LOCK_WAIT.
-*/
-#ifdef HAVE_PSI_TABLE_INTERFACE
-  #define MYSQL_START_TABLE_LOCK_WAIT(LOCKER, STATE, PSI, OP, FLAGS) \
-    LOCKER= inline_mysql_start_table_lock_wait(STATE, PSI, \
-                                               OP, FLAGS, __FILE__, __LINE__)
-#else
-  #define MYSQL_START_TABLE_LOCK_WAIT(LOCKER, STATE, PSI, OP, FLAGS) \
-    do {} while (0)
-#endif
-
-/**
-  @def MYSQL_END_TABLE_LOCK_WAIT
-  Instrumentation helper for table lock waits.
-  This instrumentation marks the end of a wait event.
-  @param LOCKER the locker
-  @sa MYSQL_START_TABLE_LOCK_WAIT.
-*/
-#ifdef HAVE_PSI_TABLE_INTERFACE
-  #define MYSQL_END_TABLE_LOCK_WAIT(LOCKER) \
-    inline_mysql_end_table_lock_wait(LOCKER)
-#else
-  #define MYSQL_END_TABLE_LOCK_WAIT(LOCKER) \
-    do {} while (0)
-#endif
-
-#ifdef HAVE_PSI_TABLE_INTERFACE
-  #define MYSQL_UNLOCK_TABLE(T) \
-    inline_mysql_unlock_table(T)
-#else
-  #define MYSQL_UNLOCK_TABLE(T) \
-    do {} while (0)
-#endif
-
-#ifdef HAVE_PSI_TABLE_INTERFACE
-/**
-  Instrumentation calls for MYSQL_START_TABLE_LOCK_WAIT.
-  @sa MYSQL_END_TABLE_LOCK_WAIT.
-*/
-static inline struct PSI_table_locker *
-inline_mysql_start_table_lock_wait(PSI_table_locker_state *state,
-                                   struct PSI_table *psi,
-                                   enum PSI_table_lock_operation op,
-                                   ulong flags, const char *src_file, int src_line)
-{
-  if (psi != NULL)
-  {
-    struct PSI_table_locker *locker;
-    locker= PSI_TABLE_CALL(start_table_lock_wait)
-      (state, psi, op, flags, src_file, src_line);
-    return locker;
-  }
-  return NULL;
-}
-
-/**
-  Instrumentation calls for MYSQL_END_TABLE_LOCK_WAIT.
-  @sa MYSQL_START_TABLE_LOCK_WAIT.
-*/
-static inline void
-inline_mysql_end_table_lock_wait(struct PSI_table_locker *locker)
-{
-  if (locker != NULL)
-    PSI_TABLE_CALL(end_table_lock_wait)(locker);
-}
-
-static inline void
-inline_mysql_unlock_table(struct PSI_table *table)
-{
-  if (table != NULL)
-    PSI_TABLE_CALL(unlock_table)(table);
-}
-#endif
-
-/** @} (end of group Table_instrumentation) */
-
-#endif
-
-- 
cgit v1.1