diff options
Diffstat (limited to 'storage/innobase/handler')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4618 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.h | 156 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 1224 | ||||
| -rw-r--r-- | storage/innobase/handler/i_s.cc | 1578 | ||||
| -rw-r--r-- | storage/innobase/handler/i_s.h | 37 | ||||
| -rw-r--r-- | storage/innobase/handler/mysql_addons.cc | 42 |
6 files changed, 6033 insertions, 1622 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 9b6c2cf9895..57d4d8bf16e 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -1,21 +1,53 @@ -/* Copyright (C) 2000-2005 MySQL AB & Innobase Oy +/***************************************************************************** + +Copyright (c) 2000, 2009, MySQL AB & Innobase Oy. All Rights Reserved. +Copyright (c) 2008, 2009 Google Inc. + +Portions of this file contain modifications contributed and copyrighted by +Google, Inc. Those modifications are gratefully acknowledged and are described +briefly in the InnoDB documentation. The contributions by Google are +incorporated with their permission, and subject to the conditions contained in +the file COPYING.Google. + +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 + +*****************************************************************************/ +/*********************************************************************** + +Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 2009, Percona Inc. - 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. +Portions of this file contain modifications contributed and copyrighted +by Percona Inc.. Those modifications are +gratefully acknowledged and are described briefly in the InnoDB +documentation. The contributions by Percona Inc. are incorporated with +their permission, and subject to the conditions contained in the file +COPYING.Percona. - 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. +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. - 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 */ +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. -/* This file defines the InnoDB handler: the interface between MySQL and InnoDB -NOTE: You can only use noninlined InnoDB functions in this file, because we -have disabled the InnoDB inlining in this file. */ +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 + +***********************************************************************/ /* TODO list for the InnoDB handler in 5.0: - Remove the flag trx->active_trans and look at trx->conc_state @@ -30,16 +62,62 @@ have disabled the InnoDB inlining in this file. */ #endif #include <mysql_priv.h> -#include <mysqld_error.h> #include <m_ctype.h> -#include <hash.h> -#include <myisampack.h> #include <mysys_err.h> -#include <my_sys.h> -#include "ha_innodb.h" #include <mysql/plugin.h> +/** @file ha_innodb.cc */ + +/* Include necessary InnoDB headers */ +extern "C" { +#include "univ.i" +#include "buf0lru.h" +#include "btr0sea.h" +#include "os0file.h" +#include "os0thread.h" +#include "srv0start.h" +#include "srv0srv.h" +#include "trx0roll.h" +#include "trx0trx.h" +#include "trx0sys.h" +#include "mtr0mtr.h" +#include "row0ins.h" +#include "row0mysql.h" +#include "row0sel.h" +#include "row0upd.h" +#include "log0log.h" +#include "lock0lock.h" +#include "dict0crea.h" +#include "btr0cur.h" +#include "btr0btr.h" +#include "fsp0fsp.h" +#include "sync0sync.h" +#include "fil0fil.h" +#include "trx0xa.h" +#include "row0merge.h" +#include "thr0loc.h" +#include "dict0boot.h" +#include "ha_prototypes.h" +#include "ut0mem.h" +#include "ibuf0ibuf.h" +} + +#include "ha_innodb.h" +#include "i_s.h" + +#ifndef MYSQL_SERVER +# ifndef MYSQL_PLUGIN_IMPORT +# define MYSQL_PLUGIN_IMPORT /* nothing */ +# endif /* MYSQL_PLUGIN_IMPORT */ + +#if MYSQL_VERSION_ID < 50124 +/* this is defined in mysql_priv.h inside #ifdef MYSQL_SERVER +but we need it here */ +bool check_global_access(THD *thd, ulong want_access); +#endif /* MYSQL_VERSION_ID < 50124 */ +#endif /* MYSQL_SERVER */ + /** to protect innobase_open_files */ static pthread_mutex_t innobase_share_mutex; /** to force correct commit order in binlog */ @@ -51,64 +129,50 @@ static pthread_mutex_t commit_cond_m; static pthread_mutex_t analyze_mutex; static bool innodb_inited = 0; -/* - This needs to exist until the query cache callback is removed - or learns to pass hton. -*/ -static handlerton *innodb_hton_ptr; - #define INSIDE_HA_INNOBASE_CC -/* Include necessary InnoDB headers */ -extern "C" { -#include "../storage/innobase/include/univ.i" -#include "../storage/innobase/include/os0file.h" -#include "../storage/innobase/include/os0thread.h" -#include "../storage/innobase/include/srv0start.h" -#include "../storage/innobase/include/srv0srv.h" -#include "../storage/innobase/include/trx0roll.h" -#include "../storage/innobase/include/trx0trx.h" -#include "../storage/innobase/include/trx0sys.h" -#include "../storage/innobase/include/mtr0mtr.h" -#include "../storage/innobase/include/row0ins.h" -#include "../storage/innobase/include/row0mysql.h" -#include "../storage/innobase/include/row0sel.h" -#include "../storage/innobase/include/row0upd.h" -#include "../storage/innobase/include/log0log.h" -#include "../storage/innobase/include/lock0lock.h" -#include "../storage/innobase/include/dict0crea.h" -#include "../storage/innobase/include/btr0cur.h" -#include "../storage/innobase/include/btr0btr.h" -#include "../storage/innobase/include/fsp0fsp.h" -#include "../storage/innobase/include/sync0sync.h" -#include "../storage/innobase/include/fil0fil.h" -#include "../storage/innobase/include/trx0xa.h" -#include "../storage/innobase/include/thr0loc.h" -#include "../storage/innobase/include/ha_prototypes.h" -} +/* In the Windows plugin, the return value of current_thd is +undefined. Map it to NULL. */ + +#define EQ_CURRENT_THD(thd) ((thd) == current_thd) + + +static struct handlerton* innodb_hton_ptr; static const long AUTOINC_OLD_STYLE_LOCKING = 0; static const long AUTOINC_NEW_STYLE_LOCKING = 1; static const long AUTOINC_NO_LOCKING = 2; static long innobase_mirrored_log_groups, innobase_log_files_in_group, - innobase_log_buffer_size, innobase_buffer_pool_awe_mem_mb, + innobase_log_buffer_size, innobase_additional_mem_pool_size, innobase_file_io_threads, - innobase_lock_wait_timeout, innobase_force_recovery, - innobase_open_files, innobase_autoinc_lock_mode; + innobase_force_recovery, innobase_open_files, + innobase_autoinc_lock_mode; static ulong innobase_commit_concurrency = 0; +static ulong innobase_read_io_threads; +static ulong innobase_write_io_threads; static long long innobase_buffer_pool_size, innobase_log_file_size; +/** Percentage of the buffer pool to reserve for 'old' blocks. +Connected to buf_LRU_old_ratio. */ +static uint innobase_old_blocks_pct; + /* The default values for the following char* start-up parameters are determined in innobase_init below: */ static char* innobase_data_home_dir = NULL; static char* innobase_data_file_path = NULL; static char* innobase_log_group_home_dir = NULL; -/* The following has a misleading name: starting from 4.0.5, this also -affects Windows: */ -static char* innobase_unix_file_flush_method = NULL; +static char* innobase_file_format_name = NULL; +static char* innobase_change_buffering = NULL; + +/* Note: This variable can be set to on/off and any of the supported +file formats in the configuration file, but can only be set to any +of the supported file formats during runtime. */ +static char* innobase_file_format_check = NULL; + +static char* innobase_file_flush_method = NULL; /* Below we have boolean-valued start-up parameters, and their default values */ @@ -120,15 +184,15 @@ static char* innobase_log_arch_dir = NULL; #endif /* UNIV_LOG_ARCHIVE */ static my_bool innobase_use_doublewrite = TRUE; static my_bool innobase_use_checksums = TRUE; -static my_bool innobase_file_per_table = FALSE; static my_bool innobase_locks_unsafe_for_binlog = FALSE; static my_bool innobase_rollback_on_timeout = FALSE; static my_bool innobase_create_status_file = FALSE; static my_bool innobase_stats_on_metadata = TRUE; -static my_bool innobase_adaptive_hash_index = TRUE; static char* internal_innobase_data_file_path = NULL; +static char* innodb_version_str = (char*) INNODB_VERSION_STR; + /* The following counter is used to convey information to InnoDB about server activity: in selects it is not sensible to call srv_active_wake_master_thread after each fetch or search, we only do @@ -137,14 +201,18 @@ it every INNOBASE_WAKE_INTERVAL'th step. */ #define INNOBASE_WAKE_INTERVAL 32 static ulong innobase_active_counter = 0; -static HASH innobase_open_tables; +static hash_table_t* innobase_open_tables; #ifdef __NETWARE__ /* some special cleanup for NetWare */ bool nw_panic = FALSE; #endif -static uchar* innobase_get_key(INNOBASE_SHARE *share, size_t *length, - my_bool not_used __attribute__((unused))); +/** Allowed values of innodb_change_buffering */ +static const char* innobase_change_buffering_values[IBUF_USE_COUNT] = { + "none", /* IBUF_USE_NONE */ + "inserts" /* IBUF_USE_INSERT */ +}; + static INNOBASE_SHARE *get_share(const char *table_name); static void free_share(INNOBASE_SHARE *share); static int innobase_close_connection(handlerton *hton, THD* thd); @@ -159,23 +227,6 @@ static handler *innobase_create_handler(handlerton *hton, TABLE_SHARE *table, MEM_ROOT *mem_root); -/*********************************************************************** -This function checks each index name for a table against reserved -system default primary index name 'GEN_CLUST_INDEX'. If a name matches, -this function pushes an error message to the client, and returns true. */ -static -bool -innobase_index_name_is_reserved( -/*============================*/ - /* out: true if index name matches a - reserved name */ - const trx_t* trx, /* in: InnoDB transaction handle */ - const TABLE* form, /* in: information on table - columns and indexes */ - const char* norm_name); /* in: table name */ - -static const char innobase_hton_name[]= "InnoDB"; - /* "GEN_CLUST_INDEX" is the name reserved for Innodb default system primary index. */ static const char innobase_index_reserve_name[]= "GEN_CLUST_INDEX"; @@ -194,20 +245,56 @@ void innobase_commit_concurrency_init_default(void); /*==========================================*/ -/***************************************************************** -Check for a valid value of innobase_commit_concurrency. */ +/************************************************************//** +Validate the file format name and return its corresponding id. +@return valid file format id */ +static +uint +innobase_file_format_name_lookup( +/*=============================*/ + const char* format_name); /*!< in: pointer to file format + name */ +/************************************************************//** +Validate the file format check config parameters, as a side effect it +sets the srv_check_file_format_at_startup variable. +@return true if one of "on" or "off" */ +static +bool +innobase_file_format_check_on_off( +/*==============================*/ + const char* format_check); /*!< in: parameter value */ +/************************************************************//** +Validate the file format check config parameters, as a side effect it +sets the srv_check_file_format_at_startup variable. +@return the format_id if valid config value, otherwise, return -1 */ +static +int +innobase_file_format_validate_and_set( +/*================================*/ + const char* format_check); /*!< in: parameter value */ +/****************************************************************//** +Return alter table flags supported in an InnoDB database. */ +static +uint +innobase_alter_table_flags( +/*=======================*/ + uint flags); + +static const char innobase_hton_name[]= "InnoDB"; + +/*************************************************************//** +Check for a valid value of innobase_commit_concurrency. +@return 0 for valid innodb_commit_concurrency */ static int innobase_commit_concurrency_validate( /*=================================*/ - /* out: 0 for valid - innodb_commit_concurrency */ - THD* thd, /* in: thread handle */ - struct st_mysql_sys_var* var, /* in: pointer to system + THD* thd, /*!< in: thread handle */ + struct st_mysql_sys_var* var, /*!< in: pointer to system variable */ - void* save, /* out: immediate result + void* save, /*!< out: immediate result for update function */ - struct st_mysql_value* value) /* in: incoming string */ + struct st_mysql_value* value) /*!< in: incoming string */ { long long intbuf; ulong commit_concurrency; @@ -237,6 +324,15 @@ static MYSQL_THDVAR_BOOL(table_locks, PLUGIN_VAR_OPCMDARG, /* check_func */ NULL, /* update_func */ NULL, /* default */ TRUE); +static MYSQL_THDVAR_BOOL(strict_mode, PLUGIN_VAR_OPCMDARG, + "Use strict mode when evaluating create options.", + NULL, NULL, FALSE); + +static MYSQL_THDVAR_ULONG(lock_wait_timeout, PLUGIN_VAR_RQCMDARG, + "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.", + NULL, NULL, 50, 1, 1024 * 1024 * 1024, 0); + + static handler *innobase_create_handler(handlerton *hton, TABLE_SHARE *table, MEM_ROOT *mem_root) @@ -244,62 +340,64 @@ static handler *innobase_create_handler(handlerton *hton, return new (mem_root) ha_innobase(hton, table); } -/*********************************************************************** -This function is used to prepare X/Open XA distributed transaction */ +/*******************************************************************//** +This function is used to prepare an X/Open XA distributed transaction. +@return 0 or error number */ static int innobase_xa_prepare( /*================*/ - /* out: 0 or error number */ - handlerton* hton, - THD* thd, /* in: handle to the MySQL thread of the user - whose XA transaction should be prepared */ - bool all); /* in: TRUE - commit transaction - FALSE - the current SQL statement ended */ -/*********************************************************************** -This function is used to recover X/Open XA distributed transactions */ + handlerton* hton, /*!< in: InnoDB handlerton */ + THD* thd, /*!< in: handle to the MySQL thread of + the user whose XA transaction should + be prepared */ + bool all); /*!< in: TRUE - commit transaction + FALSE - the current SQL statement + ended */ +/*******************************************************************//** +This function is used to recover X/Open XA distributed transactions. +@return number of prepared transactions stored in xid_list */ static int innobase_xa_recover( /*================*/ - /* out: number of prepared transactions - stored in xid_list */ - handlerton* hton, - XID* xid_list, /* in/out: prepared transactions */ - uint len); /* in: number of slots in xid_list */ -/*********************************************************************** + handlerton* hton, /*!< in: InnoDB handlerton */ + XID* xid_list,/*!< in/out: prepared transactions */ + uint len); /*!< in: number of slots in xid_list */ +/*******************************************************************//** This function is used to commit one X/Open XA distributed transaction -which is in the prepared state */ +which is in the prepared state +@return 0 or error number */ static int innobase_commit_by_xid( /*===================*/ - /* out: 0 or error number */ handlerton* hton, - XID* xid); /* in: X/Open XA transaction identification */ -/*********************************************************************** + XID* xid); /*!< in: X/Open XA transaction identification */ +/*******************************************************************//** This function is used to rollback one X/Open XA distributed transaction -which is in the prepared state */ +which is in the prepared state +@return 0 or error number */ static int innobase_rollback_by_xid( /*=====================*/ - /* out: 0 or error number */ - handlerton* hton, - XID *xid); /* in: X/Open XA transaction identification */ -/*********************************************************************** + handlerton* hton, /*!< in: InnoDB handlerton */ + XID* xid); /*!< in: X/Open XA transaction + identification */ +/*******************************************************************//** Create a consistent view for a cursor based on current transaction which is created if the corresponding MySQL thread still lacks one. This consistent view is then used inside of MySQL when accessing records -using a cursor. */ +using a cursor. +@return pointer to cursor view or NULL */ static void* innobase_create_cursor_view( /*========================*/ - /* out: pointer to cursor view or NULL */ - handlerton* hton, /* in: innobase hton */ - THD* thd); /* in: user thread handle */ -/*********************************************************************** + handlerton* hton, /*!< in: innobase hton */ + THD* thd); /*!< in: user thread handle */ +/*******************************************************************//** Set the given consistent cursor view to a transaction which is created if the corresponding MySQL thread still lacks one. If the given consistent cursor view is NULL global read view of a transaction is @@ -309,9 +407,9 @@ void innobase_set_cursor_view( /*=====================*/ handlerton* hton, - THD* thd, /* in: user thread handle */ - void* curview);/* in: Consistent cursor view to be set */ -/*********************************************************************** + THD* thd, /*!< in: user thread handle */ + void* curview);/*!< in: Consistent cursor view to be set */ +/*******************************************************************//** Close the given consistent cursor view of a transaction and restore global read view to a transaction read view. Transaction is created if the corresponding MySQL thread still lacks one. */ @@ -320,71 +418,70 @@ void innobase_close_cursor_view( /*=======================*/ handlerton* hton, - THD* thd, /* in: user thread handle */ - void* curview);/* in: Consistent read view to be closed */ -/********************************************************************* + THD* thd, /*!< in: user thread handle */ + void* curview);/*!< in: Consistent read view to be closed */ +/*****************************************************************//** Removes all tables in the named database inside InnoDB. */ static void innobase_drop_database( /*===================*/ - /* out: error number */ - handlerton* hton, /* in: handlerton of Innodb */ - char* path); /* in: database path; inside InnoDB the name + handlerton* hton, /*!< in: handlerton of Innodb */ + char* path); /*!< in: database path; inside InnoDB the name of the last directory in the path is used as the database name: for example, in 'mysql/data/test' the database name is 'test' */ -/*********************************************************************** +/*******************************************************************//** Closes an InnoDB database. */ static int innobase_end(handlerton *hton, ha_panic_function type); -/********************************************************************* +/*****************************************************************//** Creates an InnoDB transaction struct for the thd if it does not yet have one. Starts a new InnoDB transaction if a transaction is not yet started. And assigns a new snapshot for a consistent read if the transaction does not yet -have one. */ +have one. +@return 0 */ static int innobase_start_trx_and_assign_read_view( /*====================================*/ - /* out: 0 */ - handlerton* hton, /* in: Innodb handlerton */ - THD* thd); /* in: MySQL thread handle of the user for whom + handlerton* hton, /*!< in: Innodb handlerton */ + THD* thd); /*!< in: MySQL thread handle of the user for whom the transaction should be committed */ -/******************************************************************** +/****************************************************************//** Flushes InnoDB logs to disk and makes a checkpoint. Really, a commit flushes -the logs, and the name of this function should be innobase_checkpoint. */ +the logs, and the name of this function should be innobase_checkpoint. +@return TRUE if error */ static bool innobase_flush_logs( /*================*/ - /* out: TRUE if error */ - handlerton* hton); /* in: InnoDB handlerton */ + handlerton* hton); /*!< in: InnoDB handlerton */ -/**************************************************************************** +/************************************************************************//** Implements the SHOW INNODB STATUS command. Sends the output of the InnoDB Monitor to the client. */ static bool innodb_show_status( /*===============*/ - handlerton* hton, /* in: the innodb handlerton */ - THD* thd, /* in: the MySQL query thread of the caller */ + handlerton* hton, /*!< in: the innodb handlerton */ + THD* thd, /*!< in: the MySQL query thread of the caller */ stat_print_fn *stat_print); static bool innobase_show_status(handlerton *hton, THD* thd, stat_print_fn* stat_print, enum ha_stat_type stat_type); -/********************************************************************* +/*****************************************************************//** Commits a transaction in an InnoDB database. */ static void innobase_commit_low( /*================*/ - trx_t* trx); /* in: transaction handle */ + trx_t* trx); /*!< in: transaction handle */ static SHOW_VAR innodb_status_variables[]= { {"buffer_pool_pages_data", @@ -403,10 +500,10 @@ static SHOW_VAR innodb_status_variables[]= { (char*) &export_vars.innodb_buffer_pool_pages_misc, SHOW_LONG}, {"buffer_pool_pages_total", (char*) &export_vars.innodb_buffer_pool_pages_total, SHOW_LONG}, - {"buffer_pool_read_ahead_rnd", - (char*) &export_vars.innodb_buffer_pool_read_ahead_rnd, SHOW_LONG}, - {"buffer_pool_read_ahead_seq", - (char*) &export_vars.innodb_buffer_pool_read_ahead_seq, SHOW_LONG}, + {"buffer_pool_read_ahead", + (char*) &export_vars.innodb_buffer_pool_read_ahead, SHOW_LONG}, + {"buffer_pool_read_ahead_evicted", + (char*) &export_vars.innodb_buffer_pool_read_ahead_evicted, SHOW_LONG}, {"buffer_pool_read_requests", (char*) &export_vars.innodb_buffer_pool_read_requests, SHOW_LONG}, {"buffer_pool_reads", @@ -435,6 +532,8 @@ static SHOW_VAR innodb_status_variables[]= { (char*) &export_vars.innodb_dblwr_pages_written, SHOW_LONG}, {"dblwr_writes", (char*) &export_vars.innodb_dblwr_writes, SHOW_LONG}, + {"have_atomic_builtins", + (char*) &export_vars.innodb_have_atomic_builtins, SHOW_BOOL}, {"log_waits", (char*) &export_vars.innodb_log_waits, SHOW_LONG}, {"log_write_requests", @@ -480,30 +579,30 @@ static SHOW_VAR innodb_status_variables[]= { /* General functions */ -/********************************************************************** +/******************************************************************//** Returns true if the thread is the replication thread on the slave server. Used in srv_conc_enter_innodb() to determine if the thread should be allowed to enter InnoDB - the replication thread is treated differently than other threads. Also used in -srv_conc_force_exit_innodb(). */ -extern "C" +srv_conc_force_exit_innodb(). +@return true if thd is the replication thread */ +extern "C" UNIV_INTERN ibool thd_is_replication_slave_thread( /*============================*/ - /* out: true if thd is the replication thread */ - void* thd) /* in: thread handle (THD*) */ + void* thd) /*!< in: thread handle (THD*) */ { return((ibool) thd_slave_thread((THD*) thd)); } -/********************************************************************** +/******************************************************************//** Save some CPU by testing the value of srv_thread_concurrency in inline functions. */ -inline +static inline void innodb_srv_conc_enter_innodb( /*=========================*/ - trx_t* trx) /* in: transaction handle */ + trx_t* trx) /*!< in: transaction handle */ { if (UNIV_LIKELY(!srv_thread_concurrency)) { @@ -513,14 +612,14 @@ innodb_srv_conc_enter_innodb( srv_conc_enter_innodb(trx); } -/********************************************************************** +/******************************************************************//** Save some CPU by testing the value of srv_thread_concurrency in inline functions. */ -inline +static inline void innodb_srv_conc_exit_innodb( /*========================*/ - trx_t* trx) /* in: transaction handle */ + trx_t* trx) /*!< in: transaction handle */ { if (UNIV_LIKELY(!trx->declared_to_be_inside_innodb)) { @@ -530,16 +629,16 @@ innodb_srv_conc_exit_innodb( srv_conc_exit_innodb(trx); } -/********************************************************************** +/******************************************************************//** Releases possible search latch and InnoDB thread FIFO ticket. These should be released at each SQL statement end, and also when mysqld passes the control to the client. It does no harm to release these also in the middle of an SQL statement. */ -inline +static inline void innobase_release_stat_resources( /*============================*/ - trx_t* trx) /* in: transaction object */ + trx_t* trx) /*!< in: transaction object */ { if (trx->has_search_latch) { trx_search_latch_release_if_reserved(trx); @@ -552,57 +651,85 @@ innobase_release_stat_resources( } } -/********************************************************************** +/******************************************************************//** Returns true if the transaction this thread is processing has edited non-transactional tables. Used by the deadlock detector when deciding which transaction to rollback in case of a deadlock - we try to avoid -rolling back transactions that have edited non-transactional tables. */ -extern "C" +rolling back transactions that have edited non-transactional tables. +@return true if non-transactional tables have been edited */ +extern "C" UNIV_INTERN ibool thd_has_edited_nontrans_tables( /*===========================*/ - /* out: true if non-transactional tables have - been edited */ - void* thd) /* in: thread handle (THD*) */ + void* thd) /*!< in: thread handle (THD*) */ { return((ibool) thd_non_transactional_update((THD*) thd)); } -/********************************************************************** -Returns true if the thread is executing a SELECT statement. */ -extern "C" +/******************************************************************//** +Returns true if the thread is executing a SELECT statement. +@return true if thd is executing SELECT */ +extern "C" UNIV_INTERN ibool thd_is_select( /*==========*/ - /* out: true if thd is executing SELECT */ - const void* thd) /* in: thread handle (THD*) */ + const void* thd) /*!< in: thread handle (THD*) */ { return(thd_sql_command((const THD*) thd) == SQLCOM_SELECT); } -/************************************************************************ -Obtain the InnoDB transaction of a MySQL thread. */ -inline +/******************************************************************//** +Returns true if the thread supports XA, +global value of innodb_supports_xa if thd is NULL. +@return true if thd has XA support */ +extern "C" UNIV_INTERN +ibool +thd_supports_xa( +/*============*/ + void* thd) /*!< in: thread handle (THD*), or NULL to query + the global innodb_supports_xa */ +{ + return(THDVAR((THD*) thd, support_xa)); +} + +/******************************************************************//** +Returns the lock wait timeout for the current connection. +@return the lock wait timeout, in seconds */ +extern "C" UNIV_INTERN +ulong +thd_lock_wait_timeout( +/*==================*/ + void* thd) /*!< in: thread handle (THD*), or NULL to query + the global innodb_lock_wait_timeout */ +{ + /* According to <mysql/plugin.h>, passing thd == NULL + returns the global value of the session variable. */ + return(THDVAR((THD*) thd, lock_wait_timeout)); +} + +/********************************************************************//** +Obtain the InnoDB transaction of a MySQL thread. +@return reference to transaction pointer */ +static inline trx_t*& thd_to_trx( /*=======*/ - /* out: reference to transaction pointer */ - THD* thd) /* in: MySQL thread */ + THD* thd) /*!< in: MySQL thread */ { return(*(trx_t**) thd_ha_data(thd, innodb_hton_ptr)); } -/************************************************************************ +/********************************************************************//** Call this function when mysqld passes control to the client. That is to avoid deadlocks on the adaptive hash S-latch possibly held by thd. For more -documentation, see handler.cc. */ +documentation, see handler.cc. +@return 0 */ static int innobase_release_temporary_latches( /*===============================*/ - /* out: 0 */ - handlerton* hton, /* in: handlerton */ - THD* thd) /* in: MySQL thread */ + handlerton* hton, /*!< in: handlerton */ + THD* thd) /*!< in: MySQL thread */ { trx_t* trx; @@ -610,7 +737,7 @@ innobase_release_temporary_latches( if (!innodb_inited) { - return 0; + return(0); } trx = thd_to_trx(thd); @@ -618,15 +745,15 @@ innobase_release_temporary_latches( if (trx) { innobase_release_stat_resources(trx); } - return 0; + return(0); } -/************************************************************************ +/********************************************************************//** Increments innobase_active_counter and every INNOBASE_WAKE_INTERVALth time calls srv_active_wake_master_thread. This function should be used when a single database operation may introduce a small need for server utility activity, like checkpointing. */ -inline +static inline void innobase_active_small(void) /*=======================*/ @@ -638,24 +765,31 @@ innobase_active_small(void) } } -/************************************************************************ +/********************************************************************//** Converts an InnoDB error code to a MySQL error code and also tells to MySQL about a possible transaction rollback inside InnoDB caused by a lock wait -timeout or a deadlock. */ -static +timeout or a deadlock. +@return MySQL error code */ +extern "C" UNIV_INTERN int convert_error_code_to_mysql( /*========================*/ - /* out: MySQL error code */ - int error, /* in: InnoDB error code */ - THD* thd) /* in: user thread handle or NULL */ + int error, /*!< in: InnoDB error code */ + ulint flags, /*!< in: InnoDB table flags, or 0 */ + THD* thd) /*!< in: user thread handle or NULL */ { - if (error == DB_SUCCESS) { - + switch (error) { + case DB_SUCCESS: return(0); - } else if (error == (int) DB_DUPLICATE_KEY) { + case DB_INTERRUPTED: + my_error(ER_QUERY_INTERRUPTED, MYF(0)); + /* fall through */ + case DB_ERROR: + default: + return(-1); /* unspecified error */ + case DB_DUPLICATE_KEY: /* Be cautious with returning this error, since mysql could re-enter the storage layer to get duplicated key info, the operation requires a @@ -664,19 +798,16 @@ convert_error_code_to_mysql( handling stage. */ return(HA_ERR_FOUND_DUPP_KEY); - } else if (error == (int) DB_FOREIGN_DUPLICATE_KEY) { - + case DB_FOREIGN_DUPLICATE_KEY: return(HA_ERR_FOREIGN_DUPLICATE_KEY); - } else if (error == (int) DB_RECORD_NOT_FOUND) { + case DB_MISSING_HISTORY: + return(HA_ERR_TABLE_DEF_CHANGED); + case DB_RECORD_NOT_FOUND: return(HA_ERR_NO_ACTIVE_RECORD); - } else if (error == (int) DB_ERROR) { - - return(-1); /* unspecified error */ - - } else if (error == (int) DB_DEADLOCK) { + case DB_DEADLOCK: /* Since we rolled back the whole transaction, we must tell it also to MySQL so that MySQL knows to empty the cached binlog for this transaction */ @@ -686,8 +817,8 @@ convert_error_code_to_mysql( } return(HA_ERR_LOCK_DEADLOCK); - } else if (error == (int) DB_LOCK_WAIT_TIMEOUT) { + case DB_LOCK_WAIT_TIMEOUT: /* Starting from 5.0.13, we let MySQL just roll back the latest SQL statement in a lock wait timeout. Previously, we rolled back the whole transaction. */ @@ -699,105 +830,98 @@ convert_error_code_to_mysql( return(HA_ERR_LOCK_WAIT_TIMEOUT); - } else if (error == (int) DB_NO_REFERENCED_ROW) { - + case DB_NO_REFERENCED_ROW: return(HA_ERR_NO_REFERENCED_ROW); - } else if (error == (int) DB_ROW_IS_REFERENCED) { - + case DB_ROW_IS_REFERENCED: return(HA_ERR_ROW_IS_REFERENCED); - } else if (error == (int) DB_CANNOT_ADD_CONSTRAINT) { - + case DB_CANNOT_ADD_CONSTRAINT: return(HA_ERR_CANNOT_ADD_FOREIGN); - } else if (error == (int) DB_CANNOT_DROP_CONSTRAINT) { + case DB_CANNOT_DROP_CONSTRAINT: return(HA_ERR_ROW_IS_REFERENCED); /* TODO: This is a bit misleading, a new MySQL error code should be introduced */ - } else if (error == (int) DB_COL_APPEARS_TWICE_IN_INDEX) { + case DB_COL_APPEARS_TWICE_IN_INDEX: + case DB_CORRUPTION: return(HA_ERR_CRASHED); - } else if (error == (int) DB_OUT_OF_FILE_SPACE) { - + case DB_OUT_OF_FILE_SPACE: return(HA_ERR_RECORD_FILE_FULL); - } else if (error == (int) DB_TABLE_IS_BEING_USED) { - + case DB_TABLE_IS_BEING_USED: return(HA_ERR_WRONG_COMMAND); - } else if (error == (int) DB_TABLE_NOT_FOUND) { - + case DB_TABLE_NOT_FOUND: return(HA_ERR_NO_SUCH_TABLE); - } else if (error == (int) DB_TOO_BIG_RECORD) { - + case DB_TOO_BIG_RECORD: + my_error(ER_TOO_BIG_ROWSIZE, MYF(0), + page_get_free_space_of_empty(flags + & DICT_TF_COMPACT) / 2); return(HA_ERR_TO_BIG_ROW); - } else if (error == (int) DB_CORRUPTION) { - - return(HA_ERR_CRASHED); - } else if (error == (int) DB_NO_SAVEPOINT) { - + case DB_NO_SAVEPOINT: return(HA_ERR_NO_SAVEPOINT); - } else if (error == (int) DB_LOCK_TABLE_FULL) { - /* Since we rolled back the whole transaction, we must - tell it also to MySQL so that MySQL knows to empty the - cached binlog for this transaction */ + + case DB_LOCK_TABLE_FULL: + /* Since we rolled back the whole transaction, we must + tell it also to MySQL so that MySQL knows to empty the + cached binlog for this transaction */ if (thd) { thd_mark_transaction_to_rollback(thd, TRUE); } - return(HA_ERR_LOCK_TABLE_FULL); - } else if (error == DB_TOO_MANY_CONCURRENT_TRXS) { - - return(HA_ERR_TOO_MANY_CONCURRENT_TRXS); + return(HA_ERR_LOCK_TABLE_FULL); - } else if (error == DB_UNSUPPORTED) { + case DB_PRIMARY_KEY_IS_NULL: + return(ER_PRIMARY_CANT_HAVE_NULL); + case DB_TOO_MANY_CONCURRENT_TRXS: + /* New error code HA_ERR_TOO_MANY_CONCURRENT_TRXS is only + available in 5.1.38 and later, but the plugin should still + work with previous versions of MySQL. */ +#ifdef HA_ERR_TOO_MANY_CONCURRENT_TRXS + return(HA_ERR_TOO_MANY_CONCURRENT_TRXS); +#else /* HA_ERR_TOO_MANY_CONCURRENT_TRXS */ + return(HA_ERR_RECORD_FILE_FULL); +#endif /* HA_ERR_TOO_MANY_CONCURRENT_TRXS */ + case DB_UNSUPPORTED: return(HA_ERR_UNSUPPORTED); - } else { - return(-1); // Unknown error - } + } } -/***************************************************************** -Prints info of a THD object (== user session thread) to the given file. -NOTE that /mysql/innobase/trx/trx0trx.c must contain the prototype for -this function! */ -extern "C" +/*************************************************************//** +Prints info of a THD object (== user session thread) to the given file. */ +extern "C" UNIV_INTERN void innobase_mysql_print_thd( /*=====================*/ - FILE* f, /* in: output stream */ - void* input_thd, /* in: pointer to a MySQL THD object */ - uint max_query_len) /* in: max query length to print, or 0 to + FILE* f, /*!< in: output stream */ + void* thd, /*!< in: pointer to a MySQL THD object */ + uint max_query_len) /*!< in: max query length to print, or 0 to use the default max length */ { - THD* thd; char buffer[1024]; - thd = (THD*) input_thd; - fputs(thd_security_context(thd, buffer, sizeof(buffer), + fputs(thd_security_context((THD*) thd, buffer, sizeof buffer, max_query_len), f); putc('\n', f); } -/********************************************************************** -Get the variable length bounds of the given character set. - -NOTE that the exact prototype of this function has to be in -/innobase/include/data0type.ic! */ -extern "C" +/******************************************************************//** +Get the variable length bounds of the given character set. */ +extern "C" UNIV_INTERN void innobase_get_cset_width( /*====================*/ - ulint cset, /* in: MySQL charset-collation code */ - ulint* mbminlen, /* out: minimum length of a char (in bytes) */ - ulint* mbmaxlen) /* out: maximum length of a char (in bytes) */ + ulint cset, /*!< in: MySQL charset-collation code */ + ulint* mbminlen, /*!< out: minimum length of a char (in bytes) */ + ulint* mbmaxlen) /*!< out: maximum length of a char (in bytes) */ { CHARSET_INFO* cs; ut_ad(cset < 256); @@ -809,8 +933,9 @@ innobase_get_cset_width( *mbminlen = cs->mbminlen; *mbmaxlen = cs->mbmaxlen; } else { - if (current_thd - && (thd_sql_command(current_thd) == SQLCOM_DROP_TABLE)) { + THD* thd = current_thd; + + if (thd && thd_sql_command(thd) == SQLCOM_DROP_TABLE) { /* Fix bug#46256: allow tables to be dropped if the collation is not found, but issue a warning. */ @@ -829,85 +954,70 @@ innobase_get_cset_width( } } -/********************************************************************** -Converts an identifier to a table name. - -NOTE that the exact prototype of this function has to be in -/innobase/dict/dict0dict.c! */ -extern "C" +/******************************************************************//** +Converts an identifier to a table name. */ +extern "C" UNIV_INTERN void innobase_convert_from_table_id( /*===========================*/ - char* to, /* out: converted identifier */ - const char* from, /* in: identifier to convert */ - ulint len) /* in: length of 'to', in bytes */ + struct charset_info_st* cs, /*!< in: the 'from' character set */ + char* to, /*!< out: converted identifier */ + const char* from, /*!< in: identifier to convert */ + ulint len) /*!< in: length of 'to', in bytes */ { uint errors; - strconvert(thd_charset(current_thd), from, - &my_charset_filename, to, (uint) len, &errors); + strconvert(cs, from, &my_charset_filename, to, (uint) len, &errors); } -/********************************************************************** -Converts an identifier to UTF-8. - -NOTE that the exact prototype of this function has to be in -/innobase/dict/dict0dict.c! */ -extern "C" +/******************************************************************//** +Converts an identifier to UTF-8. */ +extern "C" UNIV_INTERN void innobase_convert_from_id( /*=====================*/ - char* to, /* out: converted identifier */ - const char* from, /* in: identifier to convert */ - ulint len) /* in: length of 'to', in bytes */ + struct charset_info_st* cs, /*!< in: the 'from' character set */ + char* to, /*!< out: converted identifier */ + const char* from, /*!< in: identifier to convert */ + ulint len) /*!< in: length of 'to', in bytes */ { uint errors; - strconvert(thd_charset(current_thd), from, - system_charset_info, to, (uint) len, &errors); + strconvert(cs, from, system_charset_info, to, (uint) len, &errors); } -/********************************************************************** +/******************************************************************//** Compares NUL-terminated UTF-8 strings case insensitively. - -NOTE that the exact prototype of this function has to be in -/innobase/dict/dict0dict.c! */ -extern "C" +@return 0 if a=b, <0 if a<b, >1 if a>b */ +extern "C" UNIV_INTERN int innobase_strcasecmp( /*================*/ - /* out: 0 if a=b, <0 if a<b, >1 if a>b */ - const char* a, /* in: first string to compare */ - const char* b) /* in: second string to compare */ + const char* a, /*!< in: first string to compare */ + const char* b) /*!< in: second string to compare */ { return(my_strcasecmp(system_charset_info, a, b)); } -/********************************************************************** -Makes all characters in a NUL-terminated UTF-8 string lower case. - -NOTE that the exact prototype of this function has to be in -/innobase/dict/dict0dict.c! */ -extern "C" +/******************************************************************//** +Makes all characters in a NUL-terminated UTF-8 string lower case. */ +extern "C" UNIV_INTERN void innobase_casedn_str( /*================*/ - char* a) /* in/out: string to put in lower case */ + char* a) /*!< in/out: string to put in lower case */ { my_casedn_str(system_charset_info, a); } -/************************************************************************** +/**********************************************************************//** Determines the connection character set. - -NOTE that the exact prototype of this function has to be in -/innobase/dict/dict0dict.c! */ -extern "C" +@return connection character set */ +extern "C" UNIV_INTERN struct charset_info_st* innobase_get_charset( /*=================*/ - /* out: connection character set */ - void* mysql_thd) /* in: MySQL thread handle */ + void* mysql_thd) /*!< in: MySQL thread handle */ { return(thd_charset((THD*) mysql_thd)); } @@ -925,7 +1035,7 @@ _dosmaperr( /*********************************************************************//** Creates a temporary file. @return temporary file descriptor, or < 0 on error */ -extern "C" +extern "C" UNIV_INTERN int innobase_mysql_tmpfile(void) /*========================*/ @@ -1006,13 +1116,13 @@ innobase_mysql_tmpfile(void) DBUG_RETURN(fd); } #else -/************************************************************************* -Creates a temporary file. */ -extern "C" +/*********************************************************************//** +Creates a temporary file. +@return temporary file descriptor, or < 0 on error */ +extern "C" UNIV_INTERN int innobase_mysql_tmpfile(void) /*========================*/ - /* out: temporary file descriptor, or < 0 on error */ { int fd2 = -1; File fd = mysql_tmpfile("ib"); @@ -1025,7 +1135,29 @@ innobase_mysql_tmpfile(void) will be passed to fdopen(), it will be closed by invoking fclose(), which in turn will invoke close() instead of my_close(). */ + +#ifdef _WIN32 + /* Note that on Windows, the integer returned by mysql_tmpfile + has no relation to C runtime file descriptor. Here, we need + to call my_get_osfhandle to get the HANDLE and then convert it + to C runtime filedescriptor. */ + { + HANDLE hFile = my_get_osfhandle(fd); + HANDLE hDup; + BOOL bOK = + DuplicateHandle(GetCurrentProcess(), hFile, GetCurrentProcess(), + &hDup, 0, FALSE, DUPLICATE_SAME_ACCESS); + if(bOK) { + fd2 = _open_osfhandle((intptr_t)hDup,0); + } + else { + my_osmaperr(GetLastError()); + fd2 = -1; + } + } +#else fd2 = dup(fd); +#endif if (fd2 < 0) { DBUG_PRINT("error",("Got error %d on dup",fd2)); my_errno=errno; @@ -1037,29 +1169,69 @@ innobase_mysql_tmpfile(void) } return(fd2); } -#endif +#endif /* defined (__WIN__) && defined (MYSQL_DYNAMIC_PLUGIN) */ -/************************************************************************* -Wrapper around MySQL's copy_and_convert function, see it for -documentation. */ -extern "C" +/*********************************************************************//** +Wrapper around MySQL's copy_and_convert function. +@return number of bytes copied to 'to' */ +extern "C" UNIV_INTERN ulint innobase_convert_string( /*====================*/ - void* to, - ulint to_length, - CHARSET_INFO* to_cs, - const void* from, - ulint from_length, - CHARSET_INFO* from_cs, - uint* errors) + void* to, /*!< out: converted string */ + ulint to_length, /*!< in: number of bytes reserved + for the converted string */ + CHARSET_INFO* to_cs, /*!< in: character set to convert to */ + const void* from, /*!< in: string to convert */ + ulint from_length, /*!< in: number of bytes to convert */ + CHARSET_INFO* from_cs, /*!< in: character set to convert from */ + uint* errors) /*!< out: number of errors encountered + during the conversion */ { return(copy_and_convert((char*)to, (uint32) to_length, to_cs, (const char*)from, (uint32) from_length, from_cs, errors)); } -/************************************************************************* +/*******************************************************************//** +Formats the raw data in "data" (in InnoDB on-disk format) that is of +type DATA_(CHAR|VARCHAR|MYSQL|VARMYSQL) using "charset_coll" and writes +the result to "buf". The result is converted to "system_charset_info". +Not more than "buf_size" bytes are written to "buf". +The result is always NUL-terminated (provided buf_size > 0) and the +number of bytes that were written to "buf" is returned (including the +terminating NUL). +@return number of bytes that were written */ +extern "C" UNIV_INTERN +ulint +innobase_raw_format( +/*================*/ + const char* data, /*!< in: raw data */ + ulint data_len, /*!< in: raw data length + in bytes */ + ulint charset_coll, /*!< in: charset collation */ + char* buf, /*!< out: output buffer */ + ulint buf_size) /*!< in: output buffer size + in bytes */ +{ + /* XXX we use a hard limit instead of allocating + but_size bytes from the heap */ + CHARSET_INFO* data_cs; + char buf_tmp[8192]; + ulint buf_tmp_used; + uint num_errors; + + data_cs = all_charsets[charset_coll]; + + buf_tmp_used = innobase_convert_string(buf_tmp, sizeof(buf_tmp), + system_charset_info, + data, data_len, data_cs, + &num_errors); + + return(ut_str_sql_format(buf_tmp, buf_tmp_used, buf, buf_size)); +} + +/*********************************************************************//** Compute the next autoinc value. For MySQL replication the autoincrement values can be partitioned among @@ -1075,16 +1247,16 @@ values we want to reserve for multi-value inserts e.g., innobase_next_autoinc() will be called with increment set to n * 3 where autoinc_lock_mode != TRADITIONAL because we want -to reserve 3 values for the multi-value INSERT above. */ +to reserve 3 values for the multi-value INSERT above. +@return the next value */ static ulonglong innobase_next_autoinc( /*==================*/ - /* out: the next value */ - ulonglong current, /* in: Current value */ - ulonglong increment, /* in: increment current by */ - ulonglong offset, /* in: AUTOINC offset */ - ulonglong max_value) /* in: max value for type */ + ulonglong current, /*!< in: Current value */ + ulonglong increment, /*!< in: increment current by */ + ulonglong offset, /*!< in: AUTOINC offset */ + ulonglong max_value) /*!< in: max value for type */ { ulonglong next_value; @@ -1107,7 +1279,7 @@ innobase_next_autoinc( } else { next_value = current + increment; } - } else { + } else if (max_value > current) { if (current > offset) { next_value = ((current - offset) / increment) + 1; } else { @@ -1133,6 +1305,8 @@ innobase_next_autoinc( next_value += offset; } } + } else { + next_value = max_value; } ut_a(next_value <= max_value); @@ -1140,58 +1314,84 @@ innobase_next_autoinc( return(next_value); } -/************************************************************************* +/*********************************************************************//** +Initializes some fields in an InnoDB transaction object. */ +static +void +innobase_trx_init( +/*==============*/ + THD* thd, /*!< in: user thread handle */ + trx_t* trx) /*!< in/out: InnoDB transaction handle */ +{ + DBUG_ENTER("innobase_trx_init"); + DBUG_ASSERT(EQ_CURRENT_THD(thd)); + DBUG_ASSERT(thd == trx->mysql_thd); + + trx->check_foreigns = !thd_test_options( + thd, OPTION_NO_FOREIGN_KEY_CHECKS); + + trx->check_unique_secondary = !thd_test_options( + thd, OPTION_RELAXED_UNIQUE_CHECKS); + + DBUG_VOID_RETURN; +} + +/*********************************************************************//** +Allocates an InnoDB transaction for a MySQL handler object. +@return InnoDB transaction handle */ +extern "C" UNIV_INTERN +trx_t* +innobase_trx_allocate( +/*==================*/ + THD* thd) /*!< in: user thread handle */ +{ + trx_t* trx; + + DBUG_ENTER("innobase_trx_allocate"); + DBUG_ASSERT(thd != NULL); + DBUG_ASSERT(EQ_CURRENT_THD(thd)); + + trx = trx_allocate_for_mysql(); + + trx->mysql_thd = thd; + trx->mysql_query_str = thd_query(thd); + + innobase_trx_init(thd, trx); + + DBUG_RETURN(trx); +} + +/*********************************************************************//** Gets the InnoDB transaction handle for a MySQL handler object, creates an InnoDB transaction struct if the corresponding MySQL thread struct still -lacks one. */ +lacks one. +@return InnoDB transaction handle */ static trx_t* check_trx_exists( /*=============*/ - /* out: InnoDB transaction handle */ - THD* thd) /* in: user thread handle */ + THD* thd) /*!< in: user thread handle */ { trx_t*& trx = thd_to_trx(thd); - ut_ad(thd == current_thd); + ut_ad(EQ_CURRENT_THD(thd)); if (trx == NULL) { - DBUG_ASSERT(thd != NULL); - trx = trx_allocate_for_mysql(); - - trx->mysql_thd = thd; - trx->mysql_query_str = thd_query(thd); - - /* Update the info whether we should skip XA steps that eat - CPU time */ - trx->support_xa = THDVAR(thd, support_xa); - } else { - if (trx->magic_n != TRX_MAGIC_N) { - mem_analyze_corruption(trx); - - ut_error; - } - } - - if (thd_test_options(thd, OPTION_NO_FOREIGN_KEY_CHECKS)) { - trx->check_foreigns = FALSE; - } else { - trx->check_foreigns = TRUE; + trx = innobase_trx_allocate(thd); + } else if (UNIV_UNLIKELY(trx->magic_n != TRX_MAGIC_N)) { + mem_analyze_corruption(trx); + ut_error; } - if (thd_test_options(thd, OPTION_RELAXED_UNIQUE_CHECKS)) { - trx->check_unique_secondary = FALSE; - } else { - trx->check_unique_secondary = TRUE; - } + innobase_trx_init(thd, trx); return(trx); } -/************************************************************************* +/*********************************************************************//** Construct ha_innobase handler. */ - +UNIV_INTERN ha_innobase::ha_innobase(handlerton *hton, TABLE_SHARE *table_arg) :handler(hton, table_arg), int_table_flags(HA_REC_NOT_IN_SEQ | @@ -1207,16 +1407,22 @@ ha_innobase::ha_innobase(handlerton *hton, TABLE_SHARE *table_arg) num_write_row(0) {} -/************************************************************************* +/*********************************************************************//** +Destruct ha_innobase handler. */ +UNIV_INTERN +ha_innobase::~ha_innobase() +{ +} + +/*********************************************************************//** Updates the user_thd field in a handle and also allocates a new InnoDB transaction handle if needed, and updates the transaction fields in the prebuilt struct. */ -inline -int +UNIV_INTERN inline +void ha_innobase::update_thd( /*====================*/ - /* out: 0 or error code */ - THD* thd) /* in: thd to use the handle */ + THD* thd) /*!< in: thd to use the handle */ { trx_t* trx; @@ -1228,39 +1434,52 @@ ha_innobase::update_thd( } user_thd = thd; +} - return(0); +/*********************************************************************//** +Updates the user_thd field in a handle and also allocates a new InnoDB +transaction handle if needed, and updates the transaction fields in the +prebuilt struct. */ +UNIV_INTERN +void +ha_innobase::update_thd() +/*=====================*/ +{ + THD* thd = ha_thd(); + ut_ad(EQ_CURRENT_THD(thd)); + update_thd(thd); } -/************************************************************************* +/*********************************************************************//** Registers that InnoDB takes part in an SQL statement, so that MySQL knows to roll back the statement if the statement results in an error. This MUST be called for every SQL statement that may be rolled back by MySQL. Calling this several times to register the same statement is allowed, too. */ -inline +static inline void innobase_register_stmt( /*===================*/ - handlerton* hton, /* in: Innobase hton */ - THD* thd) /* in: MySQL thd (connection) object */ + handlerton* hton, /*!< in: Innobase hton */ + THD* thd) /*!< in: MySQL thd (connection) object */ { + DBUG_ASSERT(hton == innodb_hton_ptr); /* Register the statement */ trans_register_ha(thd, FALSE, hton); } -/************************************************************************* +/*********************************************************************//** Registers an InnoDB transaction in MySQL, so that the MySQL XA code knows to call the InnoDB prepare and commit, or rollback for the transaction. This MUST be called for every transaction for which the user may call commit or rollback. Calling this several times to register the same transaction is allowed, too. This function also registers the current SQL statement. */ -inline +static inline void innobase_register_trx_and_stmt( /*===========================*/ - handlerton *hton, /* in: Innobase handlerton */ - THD* thd) /* in: MySQL thd (connection) object */ + handlerton *hton, /*!< in: Innobase handlerton */ + THD* thd) /*!< in: MySQL thd (connection) object */ { /* NOTE that actually innobase_register_stmt() registers also the transaction in the AUTOCOMMIT=1 mode. */ @@ -1317,7 +1536,7 @@ AUTOCOMMIT==0 or we are inside BEGIN ... COMMIT. Thus transactions no longer put restrictions on the use of the query cache. */ -/********************************************************************** +/******************************************************************//** The MySQL query cache uses this to check from InnoDB if the query cache at the moment is allowed to operate on an InnoDB table. The SQL query must be a non-locking SELECT. @@ -1334,24 +1553,23 @@ at the start of a SELECT processing. Then the calling thread cannot be holding any InnoDB semaphores. The calling thread is holding the query cache mutex, and this function will reserver the InnoDB kernel mutex. Thus, the 'rank' in sync0sync.h of the MySQL query cache mutex is above -the InnoDB kernel mutex. */ +the InnoDB kernel mutex. +@return TRUE if permitted, FALSE if not; note that the value FALSE +does not mean we should invalidate the query cache: invalidation is +called explicitly */ static my_bool innobase_query_caching_of_table_permitted( /*======================================*/ - /* out: TRUE if permitted, FALSE if not; - note that the value FALSE does not mean - we should invalidate the query cache: - invalidation is called explicitly */ - THD* thd, /* in: thd of the user who is trying to + THD* thd, /*!< in: thd of the user who is trying to store a result to the query cache or retrieve it */ - char* full_name, /* in: concatenation of database name, - the null character '\0', and the table + char* full_name, /*!< in: concatenation of database name, + the null character NUL, and the table name */ - uint full_name_len, /* in: length of the full name, i.e. + uint full_name_len, /*!< in: length of the full name, i.e. len(dbname) + len(tablename) + 1 */ - ulonglong *unused) /* unused for this engine */ + ulonglong *unused) /*!< unused for this engine */ { ibool is_autocommit; trx_t* trx; @@ -1373,9 +1591,9 @@ innobase_query_caching_of_table_permitted( "search, latch though calling " "innobase_query_caching_of_table_permitted."); - mutex_enter_noninline(&kernel_mutex); + mutex_enter(&kernel_mutex); trx_print(stderr, trx, 1024); - mutex_exit_noninline(&kernel_mutex); + mutex_exit(&kernel_mutex); } innobase_release_stat_resources(trx); @@ -1441,21 +1659,21 @@ innobase_query_caching_of_table_permitted( return((my_bool)FALSE); } -/********************************************************************* -Invalidates the MySQL query cache for the table. -NOTE that the exact prototype of this function has to be in -/innobase/row/row0ins.c! */ -extern "C" +/*****************************************************************//** +Invalidates the MySQL query cache for the table. */ +extern "C" UNIV_INTERN void innobase_invalidate_query_cache( /*============================*/ - trx_t* trx, /* in: transaction which modifies the table */ - char* full_name, /* in: concatenation of database name, null - char '\0', table name, null char'\0'; - NOTE that in Windows this is always - in LOWER CASE! */ - ulint full_name_len) /* in: full name length where also the null - chars count */ + trx_t* trx, /*!< in: transaction which + modifies the table */ + const char* full_name, /*!< in: concatenation of + database name, null char NUL, + table name, null char NUL; + NOTE that in Windows this is + always in LOWER CASE! */ + ulint full_name_len) /*!< in: full name length where + also the null chars count */ { /* Note that the sync0sync.h rank of the query cache mutex is just above the InnoDB kernel mutex. The caller of this function must not @@ -1464,7 +1682,7 @@ innobase_invalidate_query_cache( /* Argument TRUE below means we are using transactions */ #ifdef HAVE_QUERY_CACHE mysql_query_cache_invalidate4((THD*) trx->mysql_thd, - (const char*) full_name, + full_name, (uint32) full_name_len, TRUE); #endif @@ -1572,7 +1790,7 @@ no_quote: Convert a table or index name to the MySQL system_charset_info (UTF-8) and quote it if needed. @return pointer to the end of buf */ -extern "C" +extern "C" UNIV_INTERN char* innobase_convert_name( /*==================*/ @@ -1604,6 +1822,17 @@ innobase_convert_name( - (slash - id) - 1, thd, TRUE); } + } else if (UNIV_UNLIKELY(*id == TEMP_INDEX_PREFIX)) { + /* Temporary index name (smart ALTER TABLE) */ + const char temp_index_suffix[]= "--temporary--"; + + s = innobase_convert_identifier(buf, buflen, id + 1, idlen - 1, + thd, FALSE); + if (s - buf + (sizeof temp_index_suffix - 1) < buflen) { + memcpy(s, temp_index_suffix, + sizeof temp_index_suffix - 1); + s += sizeof temp_index_suffix - 1; + } } else { no_db_name: s = innobase_convert_identifier(buf, buflen, id, idlen, @@ -1614,38 +1843,38 @@ no_db_name: } -/************************************************************************** -Determines if the currently running transaction has been interrupted. */ -extern "C" +/**********************************************************************//** +Determines if the currently running transaction has been interrupted. +@return TRUE if interrupted */ +extern "C" UNIV_INTERN ibool trx_is_interrupted( /*===============*/ - /* out: TRUE if interrupted */ - trx_t* trx) /* in: transaction */ + trx_t* trx) /*!< in: transaction */ { return(trx && trx->mysql_thd && thd_killed((THD*) trx->mysql_thd)); } -/****************************************************************** +/**************************************************************//** Resets some fields of a prebuilt struct. The template is used in fast retrieval of just those column values MySQL needs in its processing. */ static void reset_template( /*===========*/ - row_prebuilt_t* prebuilt) /* in/out: prebuilt struct */ + row_prebuilt_t* prebuilt) /*!< in/out: prebuilt struct */ { prebuilt->keep_other_fields_on_keyread = 0; prebuilt->read_just_key = 0; } -/********************************************************************* +/*****************************************************************//** Call this when you have opened a new table handle in HANDLER, before you call index_read_idx() etc. Actually, we can let the cursor stay open even over a transaction commit! Then you should call this before every operation, fetch next etc. This function inits the necessary things even after a transaction commit. */ - +UNIV_INTERN void ha_innobase::init_table_handle_for_HANDLER(void) /*============================================*/ @@ -1664,7 +1893,7 @@ ha_innobase::init_table_handle_for_HANDLER(void) /* If the transaction is not started yet, start it */ - trx_start_if_not_started_noninline(prebuilt->trx); + trx_start_if_not_started(prebuilt->trx); /* Assign a read view if the transaction does not have it yet */ @@ -1701,19 +1930,20 @@ ha_innobase::init_table_handle_for_HANDLER(void) reset_template(prebuilt); } -/************************************************************************* -Opens an InnoDB database. */ +/*********************************************************************//** +Opens an InnoDB database. +@return 0 on success, error code on failure */ static int innobase_init( /*==========*/ - /* out: 0 on success, error code on failure */ - void *p) /* in: InnoDB handlerton */ + void *p) /*!< in: InnoDB handlerton */ { - static char current_dir[3]; /* Set if using current lib */ + static char current_dir[3]; /*!< Set if using current lib */ int err; bool ret; char *default_path; + uint format_id; DBUG_ENTER("innobase_init"); handlerton *innobase_hton= (handlerton *)p; @@ -1743,6 +1973,7 @@ innobase_init( innobase_hton->show_status=innobase_show_status; innobase_hton->flags=HTON_NO_FLAGS; innobase_hton->release_temporary_latches=innobase_release_temporary_latches; + innobase_hton->alter_table_flags = innobase_alter_table_flags; ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)MYSQL_TYPE_VARCHAR); @@ -1836,16 +2067,12 @@ innobase_init( MYF(MY_FAE)); ret = (bool) srv_parse_data_file_paths_and_sizes( - internal_innobase_data_file_path, - &srv_data_file_names, - &srv_data_file_sizes, - &srv_data_file_is_raw_partition, - &srv_n_data_files, - &srv_auto_extend_last_data_file, - &srv_last_file_size_max); + internal_innobase_data_file_path); if (ret == FALSE) { sql_print_error( "InnoDB: syntax error in innodb_data_file_path"); +mem_free_and_error: + srv_free_paths_and_sizes(); my_free(internal_innobase_data_file_path, MYF(MY_ALLOW_ZERO_PTR)); goto error; @@ -1870,21 +2097,96 @@ innobase_init( #endif /* UNIG_LOG_ARCHIVE */ ret = (bool) - srv_parse_log_group_home_dirs(innobase_log_group_home_dir, - &srv_log_group_home_dirs); + srv_parse_log_group_home_dirs(innobase_log_group_home_dir); if (ret == FALSE || innobase_mirrored_log_groups != 1) { sql_print_error("syntax error in innodb_log_group_home_dir, or a " "wrong number of mirrored log groups"); - my_free(internal_innobase_data_file_path, - MYF(MY_ALLOW_ZERO_PTR)); - goto error; + goto mem_free_and_error; + } + + /* Validate the file format by animal name */ + if (innobase_file_format_name != NULL) { + + format_id = innobase_file_format_name_lookup( + innobase_file_format_name); + + if (format_id > DICT_TF_FORMAT_MAX) { + + sql_print_error("InnoDB: wrong innodb_file_format."); + + goto mem_free_and_error; + } + } else { + /* Set it to the default file format id. Though this + should never happen. */ + format_id = 0; + } + + srv_file_format = format_id; + + /* Given the type of innobase_file_format_name we have little + choice but to cast away the constness from the returned name. + innobase_file_format_name is used in the MySQL set variable + interface and so can't be const. */ + + innobase_file_format_name = + (char*) trx_sys_file_format_id_to_name(format_id); + + /* Process innobase_file_format_check variable */ + ut_a(innobase_file_format_check != NULL); + + /* As a side effect it will set srv_check_file_format_at_startup + on valid input. First we check for "on"/"off". */ + if (!innobase_file_format_check_on_off(innobase_file_format_check)) { + + /* Did the user specify a format name that we support ? + As a side effect it will update the variable + srv_check_file_format_at_startup */ + if (innobase_file_format_validate_and_set( + innobase_file_format_check) < 0) { + + sql_print_error("InnoDB: invalid " + "innodb_file_format_check value: " + "should be either 'on' or 'off' or " + "any value up to %s or its " + "equivalent numeric id", + trx_sys_file_format_id_to_name( + DICT_TF_FORMAT_MAX)); + + goto mem_free_and_error; + } } + if (innobase_change_buffering) { + ulint use; + + for (use = 0; + use < UT_ARR_SIZE(innobase_change_buffering_values); + use++) { + if (!innobase_strcasecmp( + innobase_change_buffering, + innobase_change_buffering_values[use])) { + ibuf_use = (ibuf_use_t) use; + goto innobase_change_buffering_inited_ok; + } + } + + sql_print_error("InnoDB: invalid value " + "innodb_file_format_check=%s", + innobase_change_buffering); + goto mem_free_and_error; + } + +innobase_change_buffering_inited_ok: + ut_a((ulint) ibuf_use < UT_ARR_SIZE(innobase_change_buffering_values)); + innobase_change_buffering = (char*) + innobase_change_buffering_values[ibuf_use]; + /* --------------------------------------------------*/ - srv_file_flush_method_str = innobase_unix_file_flush_method; + srv_file_flush_method_str = innobase_file_flush_method; srv_n_log_groups = (ulint) innobase_mirrored_log_groups; srv_n_log_files = (ulint) innobase_log_files_in_group; @@ -1895,28 +2197,14 @@ innobase_init( #endif /* UNIV_LOG_ARCHIVE */ srv_log_buffer_size = (ulint) innobase_log_buffer_size; - /* We set srv_pool_size here in units of 1 kB. InnoDB internally - changes the value so that it becomes the number of database pages. */ - - if (innobase_buffer_pool_awe_mem_mb == 0) { - srv_pool_size = (ulint)(innobase_buffer_pool_size / 1024); - } else { - srv_use_awe = TRUE; - srv_pool_size = (ulint) - (1024 * innobase_buffer_pool_awe_mem_mb); - srv_awe_window_size = (ulint) innobase_buffer_pool_size; - - /* Note that what the user specified as - innodb_buffer_pool_size is actually the AWE memory window - size in this case, and the real buffer pool size is - determined by .._awe_mem_mb. */ - } + srv_buf_pool_size = (ulint) innobase_buffer_pool_size; srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size; srv_n_file_io_threads = (ulint) innobase_file_io_threads; + srv_n_read_io_threads = (ulint) innobase_read_io_threads; + srv_n_write_io_threads = (ulint) innobase_write_io_threads; - srv_lock_wait_timeout = (ulint) innobase_lock_wait_timeout; srv_force_recovery = (ulint) innobase_force_recovery; srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite; @@ -1929,15 +2217,11 @@ innobase_init( row_rollback_on_timeout = (ibool) innobase_rollback_on_timeout; - srv_file_per_table = (ibool) innobase_file_per_table; srv_locks_unsafe_for_binlog = (ibool) innobase_locks_unsafe_for_binlog; srv_max_n_open_files = (ulint) innobase_open_files; srv_innodb_status = (ibool) innobase_create_status_file; - srv_use_adaptive_hash_indexes = - (ibool) innobase_adaptive_hash_index; - srv_print_verbose_log = mysqld_embedded ? 0 : 1; /* Store the default charset-collation number of this MySQL @@ -1954,9 +2238,11 @@ innobase_init( and consequently we do not need to know the ordering internally in InnoDB. */ - ut_a(0 == strcmp((char*)my_charset_latin1.name, - (char*)"latin1_swedish_ci")); - memcpy(srv_latin1_ordering, my_charset_latin1.sort_order, 256); + ut_a(0 == strcmp(my_charset_latin1.name, "latin1_swedish_ci")); + srv_latin1_ordering = my_charset_latin1.sort_order; + + innobase_old_blocks_pct = buf_LRU_old_ratio_update( + innobase_old_blocks_pct, FALSE); innobase_commit_concurrency_init_default(); @@ -1966,18 +2252,13 @@ innobase_init( modules, we check at run time that the size is the same in these compilation modules. */ - srv_sizeof_trx_t_in_ha_innodb_cc = sizeof(trx_t); - err = innobase_start_or_create_for_mysql(); if (err != DB_SUCCESS) { - my_free(internal_innobase_data_file_path, - MYF(MY_ALLOW_ZERO_PTR)); - goto error; + goto mem_free_and_error; } - (void) hash_init(&innobase_open_tables,system_charset_info, 32, 0, 0, - (hash_get_key) innobase_get_key, 0, 0); + innobase_open_tables = hash_create(200); pthread_mutex_init(&innobase_share_mutex, MY_MUTEX_INIT_FAST); pthread_mutex_init(&prepare_commit_mutex, MY_MUTEX_INIT_FAST); pthread_mutex_init(&commit_threads_m, MY_MUTEX_INIT_FAST); @@ -1985,23 +2266,36 @@ innobase_init( pthread_mutex_init(&analyze_mutex, MY_MUTEX_INIT_FAST); pthread_cond_init(&commit_cond, NULL); innodb_inited= 1; +#ifdef MYSQL_DYNAMIC_PLUGIN + if (innobase_hton != p) { + innobase_hton = reinterpret_cast<handlerton*>(p); + *innobase_hton = *innodb_hton_ptr; + } +#endif /* MYSQL_DYNAMIC_PLUGIN */ + + /* Get the current high water mark format. */ + innobase_file_format_check = (char*) trx_sys_file_format_max_get(); DBUG_RETURN(FALSE); error: DBUG_RETURN(TRUE); } -/*********************************************************************** -Closes an InnoDB database. */ +/*******************************************************************//** +Closes an InnoDB database. +@return TRUE if error */ static int -innobase_end(handlerton *hton, ha_panic_function type) -/*==============*/ - /* out: TRUE if error */ +innobase_end( +/*=========*/ + handlerton* hton, /*!< in/out: InnoDB handlerton */ + ha_panic_function type __attribute__((unused))) + /*!< in: ha_panic() parameter */ { int err= 0; DBUG_ENTER("innobase_end"); + DBUG_ASSERT(hton == innodb_hton_ptr); #ifdef __NETWARE__ /* some special cleanup for NetWare */ if (nw_panic) { @@ -2012,10 +2306,12 @@ innobase_end(handlerton *hton, ha_panic_function type) srv_fast_shutdown = (ulint) innobase_fast_shutdown; innodb_inited = 0; + hash_table_free(innobase_open_tables); + innobase_open_tables = NULL; if (innobase_shutdown_for_mysql() != DB_SUCCESS) { err = 1; } - hash_free(&innobase_open_tables); + srv_free_paths_and_sizes(); my_free(internal_innobase_data_file_path, MYF(MY_ALLOW_ZERO_PTR)); pthread_mutex_destroy(&innobase_share_mutex); @@ -2029,31 +2325,48 @@ innobase_end(handlerton *hton, ha_panic_function type) DBUG_RETURN(err); } -/******************************************************************** +/****************************************************************//** Flushes InnoDB logs to disk and makes a checkpoint. Really, a commit flushes -the logs, and the name of this function should be innobase_checkpoint. */ +the logs, and the name of this function should be innobase_checkpoint. +@return TRUE if error */ static bool -innobase_flush_logs(handlerton *hton) -/*=====================*/ - /* out: TRUE if error */ +innobase_flush_logs( +/*================*/ + handlerton* hton) /*!< in/out: InnoDB handlerton */ { bool result = 0; DBUG_ENTER("innobase_flush_logs"); + DBUG_ASSERT(hton == innodb_hton_ptr); log_buffer_flush_to_disk(); DBUG_RETURN(result); } -/********************************************************************* +/****************************************************************//** +Return alter table flags supported in an InnoDB database. */ +static +uint +innobase_alter_table_flags( +/*=======================*/ + uint flags) +{ + return(HA_ONLINE_ADD_INDEX_NO_WRITES + | HA_ONLINE_DROP_INDEX_NO_WRITES + | HA_ONLINE_ADD_UNIQUE_INDEX_NO_WRITES + | HA_ONLINE_DROP_UNIQUE_INDEX_NO_WRITES + | HA_ONLINE_ADD_PK_INDEX_NO_WRITES); +} + +/*****************************************************************//** Commits a transaction in an InnoDB database. */ static void innobase_commit_low( /*================*/ - trx_t* trx) /* in: transaction handle */ + trx_t* trx) /*!< in: transaction handle */ { if (trx->conc_state == TRX_NOT_STARTED) { @@ -2063,23 +2376,24 @@ innobase_commit_low( trx_commit_for_mysql(trx); } -/********************************************************************* +/*****************************************************************//** Creates an InnoDB transaction struct for the thd if it does not yet have one. Starts a new InnoDB transaction if a transaction is not yet started. And assigns a new snapshot for a consistent read if the transaction does not yet -have one. */ +have one. +@return 0 */ static int innobase_start_trx_and_assign_read_view( /*====================================*/ - /* out: 0 */ - handlerton *hton, /* in: Innodb handlerton */ - THD* thd) /* in: MySQL thread handle of the user for whom + handlerton *hton, /*!< in: Innodb handlerton */ + THD* thd) /*!< in: MySQL thread handle of the user for whom the transaction should be committed */ { trx_t* trx; DBUG_ENTER("innobase_start_trx_and_assign_read_view"); + DBUG_ASSERT(hton == innodb_hton_ptr); /* Create a new trx struct for thd, if it does not yet have one */ @@ -2093,7 +2407,7 @@ innobase_start_trx_and_assign_read_view( /* If the transaction is not started yet, start it */ - trx_start_if_not_started_noninline(trx); + trx_start_if_not_started(trx); /* Assign a read view if the transaction does not have it yet */ @@ -2102,37 +2416,35 @@ innobase_start_trx_and_assign_read_view( /* Set the MySQL flag to mark that there is an active transaction */ if (trx->active_trans == 0) { - innobase_register_trx_and_stmt(hton, current_thd); + innobase_register_trx_and_stmt(hton, thd); trx->active_trans = 1; } DBUG_RETURN(0); } -/********************************************************************* +/*****************************************************************//** Commits a transaction in an InnoDB database or marks an SQL statement -ended. */ +ended. +@return 0 */ static int innobase_commit( /*============*/ - /* out: 0 */ - handlerton *hton, /* in: Innodb handlerton */ - THD* thd, /* in: MySQL thread handle of the user for whom + handlerton *hton, /*!< in: Innodb handlerton */ + THD* thd, /*!< in: MySQL thread handle of the user for whom the transaction should be committed */ - bool all) /* in: TRUE - commit transaction + bool all) /*!< in: TRUE - commit transaction FALSE - the current SQL statement ended */ { trx_t* trx; DBUG_ENTER("innobase_commit"); + DBUG_ASSERT(hton == innodb_hton_ptr); DBUG_PRINT("trans", ("ending transaction")); trx = check_trx_exists(thd); - /* Update the info whether we should skip XA steps that eat CPU time */ - trx->support_xa = THDVAR(thd, support_xa); - /* Since we will reserve the kernel mutex, we have to release the search system latch first to obey the latching order. */ @@ -2187,10 +2499,28 @@ retry: } } + /* The following calls to read the MySQL binary log + file name and the position return consistent results: + 1) Other InnoDB transactions cannot intervene between + these calls as we are holding prepare_commit_mutex. + 2) Binary logging of other engines is not relevant + to InnoDB as all InnoDB requires is that committing + InnoDB transactions appear in the same order in the + MySQL binary log as they appear in InnoDB logs. + 3) A MySQL log file rotation cannot happen because + MySQL protects against this by having a counter of + transactions in prepared state and it only allows + a rotation when the counter drops to zero. See + LOCK_prep_xids and COND_prep_xids in log.cc. */ trx->mysql_log_file_name = mysql_bin_log_file_name(); - trx->mysql_log_offset = (ib_longlong) mysql_bin_log_file_pos(); + trx->mysql_log_offset = (ib_int64_t) mysql_bin_log_file_pos(); + /* Don't do write + flush right now. For group commit + to work we want to do the flush after releasing the + prepare_commit_mutex. */ + trx->flush_log_later = TRUE; innobase_commit_low(trx); + trx->flush_log_later = FALSE; if (innobase_commit_concurrency > 0) { pthread_mutex_lock(&commit_cond_m); @@ -2204,6 +2534,8 @@ retry: pthread_mutex_unlock(&prepare_commit_mutex); } + /* Now do a write + flush of logs. */ + trx_commit_complete_for_mysql(trx); trx->active_trans = 0; } else { @@ -2237,30 +2569,28 @@ retry: DBUG_RETURN(0); } -/********************************************************************* -Rolls back a transaction or the latest SQL statement. */ +/*****************************************************************//** +Rolls back a transaction or the latest SQL statement. +@return 0 or error number */ static int innobase_rollback( /*==============*/ - /* out: 0 or error number */ - handlerton *hton, /* in: Innodb handlerton */ - THD* thd, /* in: handle to the MySQL thread of the user + handlerton *hton, /*!< in: Innodb handlerton */ + THD* thd, /*!< in: handle to the MySQL thread of the user whose transaction should be rolled back */ - bool all) /* in: TRUE - commit transaction + bool all) /*!< in: TRUE - commit transaction FALSE - the current SQL statement ended */ { int error = 0; trx_t* trx; DBUG_ENTER("innobase_rollback"); + DBUG_ASSERT(hton == innodb_hton_ptr); DBUG_PRINT("trans", ("aborting transaction")); trx = check_trx_exists(thd); - /* Update the info whether we should skip XA steps that eat CPU time */ - trx->support_xa = THDVAR(thd, support_xa); - /* Release a possible FIFO ticket and search latch. Since we will reserve the kernel mutex, we have to release the search system latch first to obey the latching order. */ @@ -2284,17 +2614,17 @@ innobase_rollback( error = trx_rollback_last_sql_stat_for_mysql(trx); } - DBUG_RETURN(convert_error_code_to_mysql(error, NULL)); + DBUG_RETURN(convert_error_code_to_mysql(error, 0, NULL)); } -/********************************************************************* -Rolls back a transaction */ +/*****************************************************************//** +Rolls back a transaction +@return 0 or error number */ static int innobase_rollback_trx( /*==================*/ - /* out: 0 or error number */ - trx_t* trx) /* in: transaction */ + trx_t* trx) /*!< in: transaction */ { int error = 0; @@ -2315,28 +2645,29 @@ innobase_rollback_trx( error = trx_rollback_for_mysql(trx); - DBUG_RETURN(convert_error_code_to_mysql(error, NULL)); + DBUG_RETURN(convert_error_code_to_mysql(error, 0, NULL)); } -/********************************************************************* -Rolls back a transaction to a savepoint. */ +/*****************************************************************//** +Rolls back a transaction to a savepoint. +@return 0 if success, HA_ERR_NO_SAVEPOINT if no savepoint with the +given name */ static int innobase_rollback_to_savepoint( /*===========================*/ - /* out: 0 if success, HA_ERR_NO_SAVEPOINT if - no savepoint with the given name */ - handlerton *hton, /* in: Innodb handlerton */ - THD* thd, /* in: handle to the MySQL thread of the user + handlerton *hton, /*!< in: Innodb handlerton */ + THD* thd, /*!< in: handle to the MySQL thread of the user whose transaction should be rolled back */ - void* savepoint) /* in: savepoint data */ + void* savepoint) /*!< in: savepoint data */ { - ib_longlong mysql_binlog_cache_pos; + ib_int64_t mysql_binlog_cache_pos; int error = 0; trx_t* trx; char name[64]; DBUG_ENTER("innobase_rollback_to_savepoint"); + DBUG_ASSERT(hton == innodb_hton_ptr); trx = check_trx_exists(thd); @@ -2352,27 +2683,28 @@ innobase_rollback_to_savepoint( error = (int) trx_rollback_to_savepoint_for_mysql(trx, name, &mysql_binlog_cache_pos); - DBUG_RETURN(convert_error_code_to_mysql(error, NULL)); + DBUG_RETURN(convert_error_code_to_mysql(error, 0, NULL)); } -/********************************************************************* -Release transaction savepoint name. */ +/*****************************************************************//** +Release transaction savepoint name. +@return 0 if success, HA_ERR_NO_SAVEPOINT if no savepoint with the +given name */ static int innobase_release_savepoint( /*=======================*/ - /* out: 0 if success, HA_ERR_NO_SAVEPOINT if - no savepoint with the given name */ - handlerton* hton, /* in: handlerton for Innodb */ - THD* thd, /* in: handle to the MySQL thread of the user + handlerton* hton, /*!< in: handlerton for Innodb */ + THD* thd, /*!< in: handle to the MySQL thread of the user whose transaction should be rolled back */ - void* savepoint) /* in: savepoint data */ + void* savepoint) /*!< in: savepoint data */ { int error = 0; trx_t* trx; char name[64]; DBUG_ENTER("innobase_release_savepoint"); + DBUG_ASSERT(hton == innodb_hton_ptr); trx = check_trx_exists(thd); @@ -2382,24 +2714,25 @@ innobase_release_savepoint( error = (int) trx_release_savepoint_for_mysql(trx, name); - DBUG_RETURN(convert_error_code_to_mysql(error, NULL)); + DBUG_RETURN(convert_error_code_to_mysql(error, 0, NULL)); } -/********************************************************************* -Sets a transaction savepoint. */ +/*****************************************************************//** +Sets a transaction savepoint. +@return always 0, that is, always succeeds */ static int innobase_savepoint( /*===============*/ - /* out: always 0, that is, always succeeds */ - handlerton* hton, /* in: handle to the Innodb handlerton */ - THD* thd, /* in: handle to the MySQL thread */ - void* savepoint) /* in: savepoint data */ + handlerton* hton, /*!< in: handle to the Innodb handlerton */ + THD* thd, /*!< in: handle to the MySQL thread */ + void* savepoint) /*!< in: savepoint data */ { int error = 0; trx_t* trx; DBUG_ENTER("innobase_savepoint"); + DBUG_ASSERT(hton == innodb_hton_ptr); /* In the autocommit mode there is no sense to set a savepoint @@ -2426,20 +2759,20 @@ innobase_savepoint( char name[64]; longlong2str((ulint)savepoint,name,36); - error = (int) trx_savepoint_for_mysql(trx, name, (ib_longlong)0); + error = (int) trx_savepoint_for_mysql(trx, name, (ib_int64_t)0); - DBUG_RETURN(convert_error_code_to_mysql(error, NULL)); + DBUG_RETURN(convert_error_code_to_mysql(error, 0, NULL)); } -/********************************************************************* -Frees a possible InnoDB trx object associated with the current THD. */ +/*****************************************************************//** +Frees a possible InnoDB trx object associated with the current THD. +@return 0 or error number */ static int innobase_close_connection( /*======================*/ - /* out: 0 or error number */ - handlerton* hton, /* in: innobase handlerton */ - THD* thd) /* in: handle to the MySQL thread of the user + handlerton* hton, /*!< in: innobase handlerton */ + THD* thd) /*!< in: handle to the MySQL thread of the user whose resources should be free'd */ { trx_t* trx; @@ -2476,23 +2809,41 @@ innobase_close_connection( } -/***************************************************************************** +/*************************************************************************//** ** InnoDB database tables *****************************************************************************/ -/******************************************************************** -Get the record format from the data dictionary. */ +/****************************************************************//** +Get the record format from the data dictionary. +@return one of ROW_TYPE_REDUNDANT, ROW_TYPE_COMPACT, +ROW_TYPE_COMPRESSED, ROW_TYPE_DYNAMIC */ +UNIV_INTERN enum row_type ha_innobase::get_row_type() const /*=============================*/ - /* out: ROW_TYPE_REDUNDANT or ROW_TYPE_COMPACT */ { if (prebuilt && prebuilt->table) { - if (dict_table_is_comp_noninline(prebuilt->table)) { - return(ROW_TYPE_COMPACT); - } else { + const ulint flags = prebuilt->table->flags; + + if (UNIV_UNLIKELY(!flags)) { return(ROW_TYPE_REDUNDANT); } + + ut_ad(flags & DICT_TF_COMPACT); + + switch (flags & DICT_TF_FORMAT_MASK) { + case DICT_TF_FORMAT_51 << DICT_TF_FORMAT_SHIFT: + return(ROW_TYPE_COMPACT); + case DICT_TF_FORMAT_ZIP << DICT_TF_FORMAT_SHIFT: + if (flags & DICT_TF_ZSSIZE_MASK) { + return(ROW_TYPE_COMPRESSED); + } else { + return(ROW_TYPE_DYNAMIC); + } +#if DICT_TF_FORMAT_ZIP != DICT_TF_FORMAT_MAX +# error "DICT_TF_FORMAT_ZIP != DICT_TF_FORMAT_MAX" +#endif + } } ut_ad(0); return(ROW_TYPE_NOT_USED); @@ -2500,36 +2851,137 @@ ha_innobase::get_row_type() const -/******************************************************************** -Get the table flags to use for the statement. */ +/****************************************************************//** +Get the table flags to use for the statement. +@return table flags */ +UNIV_INTERN handler::Table_flags ha_innobase::table_flags() const +/*============================*/ { /* Need to use tx_isolation here since table flags is (also) called before prebuilt is inited. */ - ulong const tx_isolation = thd_tx_isolation(current_thd); + ulong const tx_isolation = thd_tx_isolation(ha_thd()); if (tx_isolation <= ISO_READ_COMMITTED) return int_table_flags; return int_table_flags | HA_BINLOG_STMT_CAPABLE; } -/******************************************************************** +/****************************************************************//** Gives the file extension of an InnoDB single-table tablespace. */ static const char* ha_innobase_exts[] = { ".ibd", NullS }; +/****************************************************************//** +Returns the table type (storage engine name). +@return table type */ +UNIV_INTERN +const char* +ha_innobase::table_type() const +/*===========================*/ +{ + return(innobase_hton_name); +} + +/****************************************************************//** +Returns the index type. */ +UNIV_INTERN +const char* +ha_innobase::index_type( +/*====================*/ + uint) + /*!< out: index type */ +{ + return("BTREE"); +} + +/****************************************************************//** +Returns the table file name extension. +@return file extension string */ +UNIV_INTERN const char** ha_innobase::bas_ext() const /*========================*/ - /* out: file extension string */ { - return ha_innobase_exts; + return(ha_innobase_exts); +} + +/****************************************************************//** +Returns the operations supported for indexes. +@return flags of supported operations */ +UNIV_INTERN +ulong +ha_innobase::index_flags( +/*=====================*/ + uint, + uint, + bool) +const +{ + return(HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER + | HA_READ_RANGE | HA_KEYREAD_ONLY); } +/****************************************************************//** +Returns the maximum number of keys. +@return MAX_KEY */ +UNIV_INTERN +uint +ha_innobase::max_supported_keys() const +/*===================================*/ +{ + return(MAX_KEY); +} + +/****************************************************************//** +Returns the maximum key length. +@return maximum supported key length, in bytes */ +UNIV_INTERN +uint +ha_innobase::max_supported_key_length() const +/*=========================================*/ +{ + /* An InnoDB page must store >= 2 keys; a secondary key record + must also contain the primary key value: max key length is + therefore set to slightly less than 1 / 4 of page size which + is 16 kB; but currently MySQL does not work with keys whose + size is > MAX_KEY_LENGTH */ + return(3500); +} + +/****************************************************************//** +Returns the key map of keys that are usable for scanning. +@return key_map_full */ +UNIV_INTERN +const key_map* +ha_innobase::keys_to_use_for_scanning() +{ + return(&key_map_full); +} + +/****************************************************************//** +Determines if table caching is supported. +@return HA_CACHE_TBL_ASKTRANSACT */ +UNIV_INTERN +uint8 +ha_innobase::table_cache_type() +{ + return(HA_CACHE_TBL_ASKTRANSACT); +} + +/****************************************************************//** +Determines if the primary key is clustered index. +@return true */ +UNIV_INTERN +bool +ha_innobase::primary_key_is_clustered() +{ + return(true); +} -/********************************************************************* +/*****************************************************************//** Normalizes a table name string. A normalized name consists of the database name catenated to '/' and table name. An example: test/mytable. On Windows normalization puts both the database name and the @@ -2538,9 +2990,9 @@ static void normalize_table_name( /*=================*/ - char* norm_name, /* out: normalized name as a + char* norm_name, /*!< out: normalized name as a null-terminated string */ - const char* name) /* in: table name string */ + const char* name) /*!< in: table name string */ { char* name_ptr; char* db_ptr; @@ -2575,164 +3027,73 @@ normalize_table_name( #endif } -/************************************************************************ -Get the upper limit of the MySQL integral and floating-point type. */ -static -ulonglong -innobase_get_int_col_max_value( -/*===========================*/ - /* out: maximum allowed value for the field */ - const Field* field) /* in: MySQL field */ -{ - ulonglong max_value = 0; - - switch(field->key_type()) { - /* TINY */ - case HA_KEYTYPE_BINARY: - max_value = 0xFFULL; - break; - case HA_KEYTYPE_INT8: - max_value = 0x7FULL; - break; - /* SHORT */ - case HA_KEYTYPE_USHORT_INT: - max_value = 0xFFFFULL; - break; - case HA_KEYTYPE_SHORT_INT: - max_value = 0x7FFFULL; - break; - /* MEDIUM */ - case HA_KEYTYPE_UINT24: - max_value = 0xFFFFFFULL; - break; - case HA_KEYTYPE_INT24: - max_value = 0x7FFFFFULL; - break; - /* LONG */ - case HA_KEYTYPE_ULONG_INT: - max_value = 0xFFFFFFFFULL; - break; - case HA_KEYTYPE_LONG_INT: - max_value = 0x7FFFFFFFULL; - break; - /* BIG */ - case HA_KEYTYPE_ULONGLONG: - max_value = 0xFFFFFFFFFFFFFFFFULL; - break; - case HA_KEYTYPE_LONGLONG: - max_value = 0x7FFFFFFFFFFFFFFFULL; - break; - case HA_KEYTYPE_FLOAT: - /* We use the maximum as per IEEE754-2008 standard, 2^24 */ - max_value = 0x1000000ULL; - break; - case HA_KEYTYPE_DOUBLE: - /* We use the maximum as per IEEE754-2008 standard, 2^53 */ - max_value = 0x20000000000000ULL; - break; - default: - ut_error; - } - - return(max_value); -} - -/************************************************************************ +/********************************************************************//** Set the autoinc column max value. This should only be called once from -ha_innobase::open(). Therefore there's no need for a covering lock. */ - -void +ha_innobase::open(). Therefore there's no need for a covering lock. +@return DB_SUCCESS or error code */ +UNIV_INTERN +ulint ha_innobase::innobase_initialize_autoinc() /*======================================*/ { + dict_index_t* index; ulonglong auto_inc; - const Field* field = table->found_next_number_field; + const char* col_name; + ulint error; - if (field != NULL) { - auto_inc = innobase_get_int_col_max_value(field); - } else { - /* We have no idea what's been passed in to us as the - autoinc column. We set it to the MAX_INT of our table - autoinc type. */ - auto_inc = 0xFFFFFFFFFFFFFFFFULL; + col_name = table->found_next_number_field->field_name; + index = innobase_get_index(table->s->next_number_index); - ut_print_timestamp(stderr); - fprintf(stderr, " InnoDB: Unable to determine the AUTOINC " - "column name\n"); - } + /* Execute SELECT MAX(col_name) FROM TABLE; */ + error = row_search_max_autoinc(index, col_name, &auto_inc); - if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) { - /* If the recovery level is set so high that writes - are disabled we force the AUTOINC counter to the MAX - value effectively disabling writes to the table. - Secondly, we avoid reading the table in case the read - results in failure due to a corrupted table/index. - - We will not return an error to the client, so that the - tables can be dumped with minimal hassle. If an error - were returned in this case, the first attempt to read - the table would fail and subsequent SELECTs would succeed. */ - } else if (field == NULL) { - my_error(ER_AUTOINC_READ_FAILED, MYF(0)); - } else { - dict_index_t* index; - const char* col_name; - ulonglong read_auto_inc; - ulint err; + switch (error) { + case DB_SUCCESS: - update_thd(ha_thd()); - col_name = field->field_name; - index = innobase_get_index(table->s->next_number_index); + /* At the this stage we don't know the increment + or the offset, so use default inrement of 1. */ + ++auto_inc; + break; - /* Execute SELECT MAX(col_name) FROM TABLE; */ - err = row_search_max_autoinc(index, col_name, &read_auto_inc); + case DB_RECORD_NOT_FOUND: + ut_print_timestamp(stderr); + fprintf(stderr, " InnoDB: MySQL and InnoDB data " + "dictionaries are out of sync.\n" + "InnoDB: Unable to find the AUTOINC column %s in the " + "InnoDB table %s.\n" + "InnoDB: We set the next AUTOINC column value to the " + "maximum possible value,\n" + "InnoDB: in effect disabling the AUTOINC next value " + "generation.\n" + "InnoDB: You can either set the next AUTOINC value " + "explicitly using ALTER TABLE\n" + "InnoDB: or fix the data dictionary by recreating " + "the table.\n", + col_name, index->table->name); - switch (err) { - case DB_SUCCESS: - /* At the this stage we do not know the increment - or the offset, so use a default increment of 1. */ - auto_inc = read_auto_inc + 1; - break; + auto_inc = 0xFFFFFFFFFFFFFFFFULL; + break; - case DB_RECORD_NOT_FOUND: - ut_print_timestamp(stderr); - fprintf(stderr, " InnoDB: MySQL and InnoDB data " - "dictionaries are out of sync.\n" - "InnoDB: Unable to find the AUTOINC column " - "%s in the InnoDB table %s.\n" - "InnoDB: We set the next AUTOINC column " - "value to the maximum possible value,\n" - "InnoDB: in effect disabling the AUTOINC " - "next value generation.\n" - "InnoDB: You can either set the next " - "AUTOINC value explicitly using ALTER TABLE\n" - "InnoDB: or fix the data dictionary by " - "recreating the table.\n", - col_name, index->table->name); - - my_error(ER_AUTOINC_READ_FAILED, MYF(0)); - break; - default: - /* row_search_max_autoinc() should only return - one of DB_SUCCESS or DB_RECORD_NOT_FOUND. */ - ut_error; - } + default: + return(error); } dict_table_autoinc_initialize(prebuilt->table, auto_inc); + + return(DB_SUCCESS); } -/********************************************************************* +/*****************************************************************//** Creates and opens a handle to a table which already exists in an InnoDB -database. */ - +database. +@return 1 if error, 0 if success */ +UNIV_INTERN int ha_innobase::open( /*==============*/ - /* out: 1 if error, 0 if success */ - const char* name, /* in: table name */ - int mode, /* in: not used */ - uint test_if_locked) /* in: not used */ + const char* name, /*!< in: table name */ + int mode, /*!< in: not used */ + uint test_if_locked) /*!< in: not used */ { dict_table_t* ib_table; char norm_name[1000]; @@ -2799,7 +3160,7 @@ retry: if (is_part) { sql_print_error("Failed to open table %s after " - "%lu attemtps.\n", norm_name, + "%lu attempts.\n", norm_name, retries); } @@ -2815,7 +3176,7 @@ retry: "or, the table contains indexes that this " "version of the engine\n" "doesn't support.\n" - "See http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html\n" + "See " REFMAN "innodb-troubleshooting.html\n" "how you can resolve the problem.\n", norm_name); free_share(share); @@ -2831,14 +3192,14 @@ retry: "Have you deleted the .ibd file from the " "database directory under\nthe MySQL datadir, " "or have you used DISCARD TABLESPACE?\n" - "See http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html\n" + "See " REFMAN "innodb-troubleshooting.html\n" "how you can resolve the problem.\n", norm_name); free_share(share); my_free(upd_buff, MYF(0)); my_errno = ENOENT; - dict_table_decrement_handle_count(ib_table); + dict_table_decrement_handle_count(ib_table, FALSE); DBUG_RETURN(HA_ERR_NO_SUCH_TABLE); } @@ -2907,16 +3268,27 @@ retry: } } - stats.block_size = 16 * 1024; /* Index block size in InnoDB: used by MySQL - in query optimization */ + /* Index block size in InnoDB: used by MySQL in query optimization */ + stats.block_size = 16 * 1024; /* Init table lock structure */ thr_lock_data_init(&share->lock,&lock,(void*) 0); + if (prebuilt->table) { + /* We update the highest file format in the system table + space, if this table has higher file format setting. */ + + trx_sys_file_format_max_upgrade( + (const char**) &innobase_file_format_check, + dict_table_get_format(prebuilt->table)); + } + info(HA_STATUS_NO_LOCK | HA_STATUS_VARIABLE | HA_STATUS_CONST); /* Only if the table has an AUTOINC column. */ if (prebuilt->table != NULL && table->found_next_number_field != NULL) { + ulint error; + dict_table_autoinc_lock(prebuilt->table); /* Since a table can already be "open" in InnoDB's internal @@ -2925,7 +3297,8 @@ retry: autoinc value from a previous MySQL open. */ if (dict_table_autoinc_read(prebuilt->table) == 0) { - innobase_initialize_autoinc(); + error = innobase_initialize_autoinc(); + ut_a(error == DB_SUCCESS); } dict_table_autoinc_unlock(prebuilt->table); @@ -2934,30 +3307,31 @@ retry: DBUG_RETURN(0); } +UNIV_INTERN uint ha_innobase::max_supported_key_part_length() const { return(DICT_MAX_INDEX_COL_LEN - 1); } -/********************************************************************** -Closes a handle to an InnoDB table. */ - +/******************************************************************//** +Closes a handle to an InnoDB table. +@return 0 */ +UNIV_INTERN int ha_innobase::close(void) /*====================*/ - /* out: 0 */ { THD* thd; DBUG_ENTER("ha_innobase::close"); - thd = current_thd; // avoid calling current_thd twice, it may be slow + thd = ha_thd(); if (thd != NULL) { innobase_release_temporary_latches(ht, thd); } - row_prebuilt_free(prebuilt); + row_prebuilt_free(prebuilt, FALSE); my_free(upd_buff, MYF(0)); free_share(share); @@ -2972,30 +3346,30 @@ ha_innobase::close(void) /* The following accessor functions should really be inside MySQL code! */ -/****************************************************************** -Gets field offset for a field in a table. */ -inline +/**************************************************************//** +Gets field offset for a field in a table. +@return offset */ +static inline uint get_field_offset( /*=============*/ - /* out: offset */ - TABLE* table, /* in: MySQL table object */ - Field* field) /* in: MySQL field object */ + TABLE* table, /*!< in: MySQL table object */ + Field* field) /*!< in: MySQL field object */ { return((uint) (field->ptr - table->record[0])); } -/****************************************************************** +/**************************************************************//** Checks if a field in a record is SQL NULL. Uses the record format -information in table to track the null bit in record. */ +information in table to track the null bit in record. +@return 1 if NULL, 0 otherwise */ static inline uint field_in_record_is_null( /*====================*/ - /* out: 1 if NULL, 0 otherwise */ - TABLE* table, /* in: MySQL table object */ - Field* field, /* in: MySQL field object */ - char* record) /* in: a row in MySQL format */ + TABLE* table, /*!< in: MySQL table object */ + Field* field, /*!< in: MySQL field object */ + char* record) /*!< in: a row in MySQL format */ { int null_offset; @@ -3015,16 +3389,16 @@ field_in_record_is_null( return(0); } -/****************************************************************** +/**************************************************************//** Sets a field in a record to SQL NULL. Uses the record format information in table to track the null bit in record. */ -inline +static inline void set_field_in_record_to_null( /*========================*/ - TABLE* table, /* in: MySQL table object */ - Field* field, /* in: MySQL field object */ - char* record) /* in: a row in MySQL format */ + TABLE* table, /*!< in: MySQL table object */ + Field* field, /*!< in: MySQL field object */ + char* record) /*!< in: a row in MySQL format */ { int null_offset; @@ -3034,25 +3408,23 @@ set_field_in_record_to_null( record[null_offset] = record[null_offset] | field->null_bit; } -extern "C" { -/***************************************************************** +/*************************************************************//** InnoDB uses this function to compare two data fields for which the data type is such that we must use MySQL code to compare them. NOTE that the prototype of this function is in rem0cmp.c in InnoDB source code! If you change this -function, remember to update the prototype there! */ - +function, remember to update the prototype there! +@return 1, 0, -1, if a is greater, equal, less than b, respectively */ +extern "C" UNIV_INTERN int innobase_mysql_cmp( /*===============*/ - /* out: 1, 0, -1, if a is greater, - equal, less than b, respectively */ - int mysql_type, /* in: MySQL type */ - uint charset_number, /* in: number of the charset */ - unsigned char* a, /* in: data field */ - unsigned int a_length, /* in: data field length, + int mysql_type, /*!< in: MySQL type */ + uint charset_number, /*!< in: number of the charset */ + const unsigned char* a, /*!< in: data field */ + unsigned int a_length, /*!< in: data field length, not UNIV_SQL_NULL */ - unsigned char* b, /* in: data field */ - unsigned int b_length) /* in: data field length, + const unsigned char* b, /*!< in: data field */ + unsigned int b_length) /*!< in: data field length, not UNIV_SQL_NULL */ { CHARSET_INFO* charset; @@ -3111,27 +3483,30 @@ innobase_mysql_cmp( return(0); } default: - assert(0); + ut_error; } return(0); } -} -/****************************************************************** +/**************************************************************//** Converts a MySQL type to an InnoDB type. Note that this function returns the 'mtype' of InnoDB. InnoDB differentiates between MySQL's old <= 4.1 -VARCHAR and the new true VARCHAR in >= 5.0.3 by the 'prtype'. */ -inline +VARCHAR and the new true VARCHAR in >= 5.0.3 by the 'prtype'. +@return DATA_BINARY, DATA_VARCHAR, ... */ +extern "C" UNIV_INTERN ulint get_innobase_type_from_mysql_type( /*==============================*/ - /* out: DATA_BINARY, DATA_VARCHAR, ... */ - ulint* unsigned_flag, /* out: DATA_UNSIGNED if an 'unsigned type'; - at least ENUM and SET, and unsigned integer - types are 'unsigned types' */ - Field* field) /* in: MySQL field */ + ulint* unsigned_flag, /*!< out: DATA_UNSIGNED if an + 'unsigned type'; + at least ENUM and SET, + and unsigned integer + types are 'unsigned types' */ + const void* f) /*!< in: MySQL Field */ { + const class Field* field = reinterpret_cast<const class Field*>(f); + /* The following asserts try to check that the MySQL type code fits in 8 bits: this is used in ibuf and also when DATA_NOT_NULL is ORed to the type */ @@ -3215,21 +3590,21 @@ get_innobase_type_from_mysql_type( case MYSQL_TYPE_LONG_BLOB: return(DATA_BLOB); default: - assert(0); + ut_error; } return(0); } -/*********************************************************************** +/*******************************************************************//** Writes an unsigned integer value < 64k to 2 bytes, in the little-endian storage format. */ -inline +static inline void innobase_write_to_2_little_endian( /*==============================*/ - byte* buf, /* in: where to store */ - ulint val) /* in: value to write, must be < 64k */ + byte* buf, /*!< in: where to store */ + ulint val) /*!< in: value to write, must be < 64k */ { ut_a(val < 256 * 256); @@ -3237,31 +3612,31 @@ innobase_write_to_2_little_endian( buf[1] = (byte)(val / 256); } -/*********************************************************************** +/*******************************************************************//** Reads an unsigned integer value < 64k from 2 bytes, in the little-endian -storage format. */ -inline +storage format. +@return value */ +static inline uint innobase_read_from_2_little_endian( /*===============================*/ - /* out: value */ - const uchar* buf) /* in: from where to read */ + const uchar* buf) /*!< in: from where to read */ { return (uint) ((ulint)(buf[0]) + 256 * ((ulint)(buf[1]))); } -/*********************************************************************** -Stores a key value for a row to a buffer. */ - +/*******************************************************************//** +Stores a key value for a row to a buffer. +@return key value length as stored in buff */ +UNIV_INTERN uint ha_innobase::store_key_val_for_row( /*===============================*/ - /* out: key value length as stored in buff */ - uint keynr, /* in: key number */ - char* buff, /* in/out: buffer for the key value (in MySQL + uint keynr, /*!< in: key number */ + char* buff, /*!< in/out: buffer for the key value (in MySQL format) */ - uint buff_len,/* in: buffer length */ - const uchar* record)/* in: row in MySQL format */ + uint buff_len,/*!< in: buffer length */ + const uchar* record)/*!< in: row in MySQL format */ { KEY* key_info = table->key_info + keynr; KEY_PART_INFO* key_part = key_info->key_part; @@ -3319,13 +3694,13 @@ ha_innobase::store_key_val_for_row( if (mysql_type == MYSQL_TYPE_VARCHAR) { /* >= 5.0.3 true VARCHAR */ - ulint lenlen; - ulint len; - byte* data; - ulint key_len; - ulint true_len; + ulint lenlen; + ulint len; + const byte* data; + ulint key_len; + ulint true_len; CHARSET_INFO* cs; - int error=0; + int error=0; key_len = key_part->length; @@ -3394,7 +3769,7 @@ ha_innobase::store_key_val_for_row( ulint true_len; int error=0; ulint blob_len; - byte* blob_data; + const byte* blob_data; ut_a(key_part->key_part_flag & HA_PART_KEY_SEG); @@ -3527,19 +3902,19 @@ ha_innobase::store_key_val_for_row( DBUG_RETURN((uint)(buff - buff_start)); } -/****************************************************************** +/**************************************************************//** Builds a 'template' to the prebuilt struct. The template is used in fast retrieval of just those column values MySQL needs in its processing. */ static void build_template( /*===========*/ - row_prebuilt_t* prebuilt, /* in/out: prebuilt struct */ - THD* thd, /* in: current user thread, used + row_prebuilt_t* prebuilt, /*!< in/out: prebuilt struct */ + THD* thd, /*!< in: current user thread, used only if templ_type is ROW_MYSQL_REC_FIELDS */ - TABLE* table, /* in: MySQL table */ - uint templ_type) /* in: ROW_MYSQL_WHOLE_ROW or + TABLE* table, /*!< in: MySQL table */ + uint templ_type) /*!< in: ROW_MYSQL_WHOLE_ROW or ROW_MYSQL_REC_FIELDS */ { dict_index_t* index; @@ -3594,7 +3969,7 @@ build_template( } } - clust_index = dict_table_get_first_index_noninline(prebuilt->table); + clust_index = dict_table_get_first_index(prebuilt->table); if (templ_type == ROW_MYSQL_REC_FIELDS) { index = prebuilt->index; @@ -3614,8 +3989,7 @@ build_template( if (!prebuilt->mysql_template) { prebuilt->mysql_template = (mysql_row_templ_t*) - mem_alloc_noninline( - n_fields * sizeof(mysql_row_templ_t)); + mem_alloc(n_fields * sizeof(mysql_row_templ_t)); } prebuilt->template_type = templ_type; @@ -3673,7 +4047,7 @@ include_field: templ->col_no = i; if (index == clust_index) { - templ->rec_field_no = dict_col_get_clust_pos_noninline( + templ->rec_field_no = dict_col_get_clust_pos( &index->table->cols[i], index); } else { templ->rec_field_no = dict_index_get_nth_col_pos( @@ -3711,8 +4085,8 @@ include_field: (((Field_varstring*)field)->length_bytes); } - templ->charset = dtype_get_charset_coll_noninline( - index->table->cols[i].prtype); + templ->charset = dtype_get_charset_coll( + index->table->cols[i].prtype); templ->mbminlen = index->table->cols[i].mbminlen; templ->mbmaxlen = index->table->cols[i].mbmaxlen; templ->is_unsigned = index->table->cols[i].prtype @@ -3733,25 +4107,85 @@ skip_field: for (i = 0; i < n_requested_fields; i++) { templ = prebuilt->mysql_template + i; - templ->rec_field_no = dict_col_get_clust_pos_noninline( + templ->rec_field_no = dict_col_get_clust_pos( &index->table->cols[templ->col_no], clust_index); } } } -/************************************************************************ +/********************************************************************//** +Get the upper limit of the MySQL integral and floating-point type. */ +UNIV_INTERN +ulonglong +ha_innobase::innobase_get_int_col_max_value( +/*========================================*/ + const Field* field) +{ + ulonglong max_value = 0; + + switch(field->key_type()) { + /* TINY */ + case HA_KEYTYPE_BINARY: + max_value = 0xFFULL; + break; + case HA_KEYTYPE_INT8: + max_value = 0x7FULL; + break; + /* SHORT */ + case HA_KEYTYPE_USHORT_INT: + max_value = 0xFFFFULL; + break; + case HA_KEYTYPE_SHORT_INT: + max_value = 0x7FFFULL; + break; + /* MEDIUM */ + case HA_KEYTYPE_UINT24: + max_value = 0xFFFFFFULL; + break; + case HA_KEYTYPE_INT24: + max_value = 0x7FFFFFULL; + break; + /* LONG */ + case HA_KEYTYPE_ULONG_INT: + max_value = 0xFFFFFFFFULL; + break; + case HA_KEYTYPE_LONG_INT: + max_value = 0x7FFFFFFFULL; + break; + /* BIG */ + case HA_KEYTYPE_ULONGLONG: + max_value = 0xFFFFFFFFFFFFFFFFULL; + break; + case HA_KEYTYPE_LONGLONG: + max_value = 0x7FFFFFFFFFFFFFFFULL; + break; + case HA_KEYTYPE_FLOAT: + /* We use the maximum as per IEEE754-2008 standard, 2^24 */ + max_value = 0x1000000ULL; + break; + case HA_KEYTYPE_DOUBLE: + /* We use the maximum as per IEEE754-2008 standard, 2^53 */ + max_value = 0x20000000000000ULL; + break; + default: + ut_error; + } + + return(max_value); +} + +/********************************************************************//** This special handling is really to overcome the limitations of MySQL's binlogging. We need to eliminate the non-determinism that will arise in INSERT ... SELECT type of statements, since MySQL binlog only stores the min value of the autoinc interval. Once that is fixed we can get rid of -the special lock handling.*/ - -ulong +the special lock handling. +@return DB_SUCCESS if all OK else error code */ +UNIV_INTERN +ulint ha_innobase::innobase_lock_autoinc(void) /*====================================*/ - /* out: DB_SUCCESS if all OK else - error code */ { ulint error = DB_SUCCESS; @@ -3801,15 +4235,14 @@ ha_innobase::innobase_lock_autoinc(void) return(ulong(error)); } -/************************************************************************ -Reset the autoinc value in the table.*/ - -ulong +/********************************************************************//** +Reset the autoinc value in the table. +@return DB_SUCCESS if all went well else error code */ +UNIV_INTERN +ulint ha_innobase::innobase_reset_autoinc( /*================================*/ - /* out: DB_SUCCESS if all went well - else error code */ - ulonglong autoinc) /* in: value to store */ + ulonglong autoinc) /*!< in: value to store */ { ulint error; @@ -3825,16 +4258,15 @@ ha_innobase::innobase_reset_autoinc( return(ulong(error)); } -/************************************************************************ +/********************************************************************//** Store the autoinc value in the table. The autoinc value is only set if -it's greater than the existing autoinc value in the table.*/ - -ulong +it's greater than the existing autoinc value in the table. +@return DB_SUCCESS if all went well else error code */ +UNIV_INTERN +ulint ha_innobase::innobase_set_max_autoinc( /*==================================*/ - /* out: DB_SUCCES if all went well - else error code */ - ulonglong auto_inc) /* in: value to store */ + ulonglong auto_inc) /*!< in: value to store */ { ulint error; @@ -3850,15 +4282,15 @@ ha_innobase::innobase_set_max_autoinc( return(ulong(error)); } -/************************************************************************ +/********************************************************************//** Stores a row in an InnoDB database, to the table specified in this -handle. */ - +handle. +@return error code */ +UNIV_INTERN int ha_innobase::write_row( /*===================*/ - /* out: error code */ - uchar* record) /* in: a row in MySQL format */ + uchar* record) /*!< in: a row in MySQL format */ { ulint error = 0; int error_result= 0; @@ -3871,7 +4303,7 @@ ha_innobase::write_row( if (prebuilt->trx != trx) { sql_print_error("The transaction object for the table handle is at " "%p, but for the current thread it is at %p", - prebuilt->trx, trx); + (const void*) prebuilt->trx, (const void*) trx); fputs("InnoDB: Dump of 200 bytes around prebuilt: ", stderr); ut_print_buf(stderr, ((const byte*)prebuilt) - 100, 200); @@ -3905,7 +4337,7 @@ ha_innobase::write_row( being blocked by a MySQL table lock TL_WRITE_ALLOW_READ. */ dict_table_t* src_table; - ulint mode; + enum lock_mode mode; num_write_row = 0; @@ -4040,7 +4472,6 @@ no_commit: case SQLCOM_INSERT_SELECT: case SQLCOM_REPLACE_SELECT: goto set_max_autoinc; - break; default: break; @@ -4054,29 +4485,24 @@ no_commit: update the table upper limit. Note: last_value will be 0 if get_auto_increment() was not called.*/ - if (auto_inc >= prebuilt->autoinc_last_value) { + if (auto_inc <= col_max_value + && auto_inc >= prebuilt->autoinc_last_value) { set_max_autoinc: - /* This should filter out the negative - values set explicitly by the user. */ - if (auto_inc <= col_max_value) { - ut_a(prebuilt->autoinc_increment > 0); + ut_a(prebuilt->autoinc_increment > 0); - ulonglong need; - ulonglong offset; + ulonglong need; + ulonglong offset; - offset = prebuilt->autoinc_offset; - need = prebuilt->autoinc_increment; + offset = prebuilt->autoinc_offset; + need = prebuilt->autoinc_increment; - auto_inc = innobase_next_autoinc( - auto_inc, - need, offset, col_max_value); + auto_inc = innobase_next_autoinc( + auto_inc, need, offset, col_max_value); - err = innobase_set_max_autoinc( - auto_inc); + err = innobase_set_max_autoinc(auto_inc); - if (err != DB_SUCCESS) { - error = err; - } + if (err != DB_SUCCESS) { + error = err; } } break; @@ -4086,7 +4512,9 @@ set_max_autoinc: innodb_srv_conc_exit_innodb(prebuilt->trx); report_error: - error_result = convert_error_code_to_mysql((int) error, user_thd); + error_result = convert_error_code_to_mysql((int) error, + prebuilt->table->flags, + user_thd); func_exit: innobase_active_small(); @@ -4094,23 +4522,23 @@ func_exit: DBUG_RETURN(error_result); } -/************************************************************************** +/**********************************************************************//** Checks which fields have changed in a row and stores information -of them to an update vector. */ +of them to an update vector. +@return error number or 0 */ static int calc_row_difference( /*================*/ - /* out: error number or 0 */ - upd_t* uvect, /* in/out: update vector */ - uchar* old_row, /* in: old row in MySQL format */ - uchar* new_row, /* in: new row in MySQL format */ - struct st_table* table, /* in: table in MySQL data + upd_t* uvect, /*!< in/out: update vector */ + uchar* old_row, /*!< in: old row in MySQL format */ + uchar* new_row, /*!< in: new row in MySQL format */ + TABLE* table, /*!< in: table in MySQL data dictionary */ - uchar* upd_buff, /* in: buffer to use */ - ulint buff_len, /* in: buffer length */ - row_prebuilt_t* prebuilt, /* in: InnoDB prebuilt struct */ - THD* thd) /* in: user thread */ + uchar* upd_buff, /*!< in: buffer to use */ + ulint buff_len, /*!< in: buffer length */ + row_prebuilt_t* prebuilt, /*!< in: InnoDB prebuilt struct */ + THD* thd) /*!< in: user thread */ { uchar* original_upd_buff = upd_buff; Field* field; @@ -4119,9 +4547,9 @@ calc_row_difference( ulint o_len; ulint n_len; ulint col_pack_len; - byte* new_mysql_row_col; - byte* o_ptr; - byte* n_ptr; + const byte* new_mysql_row_col; + const byte* o_ptr; + const byte* n_ptr; byte* buf; upd_field_t* ufield; ulint col_type; @@ -4131,7 +4559,7 @@ calc_row_difference( uint i; n_fields = table->s->fields; - clust_index = dict_table_get_first_index_noninline(prebuilt->table); + clust_index = dict_table_get_first_index(prebuilt->table); /* We use upd_buff to convert changed fields */ buf = (byte*) upd_buff; @@ -4139,8 +4567,8 @@ calc_row_difference( for (i = 0; i < n_fields; i++) { field = table->field[i]; - o_ptr = (byte*) old_row + get_field_offset(table, field); - n_ptr = (byte*) new_row + get_field_offset(table, field); + o_ptr = (const byte*) old_row + get_field_offset(table, field); + n_ptr = (const byte*) new_row + get_field_offset(table, field); /* Use new_mysql_row_col and col_pack_len save the values */ @@ -4210,8 +4638,8 @@ calc_row_difference( /* Let us use a dummy dfield to make the conversion from the MySQL column format to the InnoDB format */ - dict_col_copy_type_noninline(prebuilt->table->cols + i, - &dfield.type); + dict_col_copy_type(prebuilt->table->cols + i, + dfield_get_type(&dfield)); if (n_len != UNIV_SQL_NULL) { buf = row_mysql_store_col_in_innobase_format( @@ -4220,17 +4648,15 @@ calc_row_difference( TRUE, new_mysql_row_col, col_pack_len, - dict_table_is_comp_noninline( - prebuilt->table)); - ufield->new_val.data = dfield.data; - ufield->new_val.len = dfield.len; + dict_table_is_comp(prebuilt->table)); + dfield_copy_data(&ufield->new_val, &dfield); } else { - ufield->new_val.data = NULL; - ufield->new_val.len = UNIV_SQL_NULL; + dfield_set_null(&ufield->new_val); } ufield->exp = NULL; - ufield->field_no = dict_col_get_clust_pos_noninline( + ufield->orig_len = 0; + ufield->field_no = dict_col_get_clust_pos( &prebuilt->table->cols[i], clust_index); n_changed++; } @@ -4244,20 +4670,20 @@ calc_row_difference( return(0); } -/************************************************************************** +/**********************************************************************//** Updates a row given as a parameter to a new value. Note that we are given whole rows, not just the fields which are updated: this incurs some overhead for CPU when we check which fields are actually updated. TODO: currently InnoDB does not prevent the 'Halloween problem': in a searched update a single row can get updated several times -if its index columns are updated! */ - +if its index columns are updated! +@return error number or 0 */ +UNIV_INTERN int ha_innobase::update_row( /*====================*/ - /* out: error number or 0 */ - const uchar* old_row, /* in: old row in MySQL format */ - uchar* new_row) /* in: new row in MySQL format */ + const uchar* old_row, /*!< in: old row in MySQL format */ + uchar* new_row) /*!< in: new row in MySQL format */ { upd_t* uvect; int error = 0; @@ -4288,7 +4714,7 @@ ha_innobase::update_row( /* This is not a delete */ prebuilt->upd_node->is_delete = FALSE; - assert(prebuilt->template_type == ROW_MYSQL_WHOLE_ROW); + ut_a(prebuilt->template_type == ROW_MYSQL_WHOLE_ROW); innodb_srv_conc_enter_innodb(trx); @@ -4336,7 +4762,8 @@ ha_innobase::update_row( innodb_srv_conc_exit_innodb(trx); - error = convert_error_code_to_mysql(error, user_thd); + error = convert_error_code_to_mysql(error, + prebuilt->table->flags, user_thd); if (error == 0 /* success */ && uvect->n_fields == 0 /* no columns were updated */) { @@ -4356,14 +4783,14 @@ ha_innobase::update_row( DBUG_RETURN(error); } -/************************************************************************** -Deletes a row given as the parameter. */ - +/**********************************************************************//** +Deletes a row given as the parameter. +@return error number or 0 */ +UNIV_INTERN int ha_innobase::delete_row( /*====================*/ - /* out: error number or 0 */ - const uchar* record) /* in: a row in MySQL format */ + const uchar* record) /*!< in: a row in MySQL format */ { int error = 0; trx_t* trx = thd_to_trx(user_thd); @@ -4388,7 +4815,8 @@ ha_innobase::delete_row( innodb_srv_conc_exit_innodb(trx); - error = convert_error_code_to_mysql(error, user_thd); + error = convert_error_code_to_mysql( + error, prebuilt->table->flags, user_thd); /* Tell the InnoDB server that there might be work for utility threads: */ @@ -4398,11 +4826,11 @@ ha_innobase::delete_row( DBUG_RETURN(error); } -/************************************************************************** +/**********************************************************************//** Removes a new lock set on a row, if it was not read optimistically. This can be called after a row has been read in the processing of an UPDATE or a DELETE query, if the option innodb_locks_unsafe_for_binlog is set. */ - +UNIV_INTERN void ha_innobase::unlock_row(void) /*=========================*/ @@ -4436,6 +4864,7 @@ ha_innobase::unlock_row(void) } /* See handler.h and row0mysql.h for docs on this function. */ +UNIV_INTERN bool ha_innobase::was_semi_consistent_read(void) /*=======================================*/ @@ -4444,6 +4873,7 @@ ha_innobase::was_semi_consistent_read(void) } /* See handler.h and row0mysql.h for docs on this function. */ +UNIV_INTERN void ha_innobase::try_semi_consistent_read(bool yes) /*===========================================*/ @@ -4464,27 +4894,25 @@ ha_innobase::try_semi_consistent_read(bool yes) } } -/********************************************************************** -Initializes a handle to use an index. */ - +/******************************************************************//** +Initializes a handle to use an index. +@return 0 or error number */ +UNIV_INTERN int ha_innobase::index_init( /*====================*/ - /* out: 0 or error number */ - uint keynr, /* in: key (index) number */ - bool sorted) /* in: 1 if result MUST be sorted according to index */ + uint keynr, /*!< in: key (index) number */ + bool sorted) /*!< in: 1 if result MUST be sorted according to index */ { - int error = 0; DBUG_ENTER("index_init"); - error = change_active_index(keynr); - - DBUG_RETURN(error); + DBUG_RETURN(change_active_index(keynr)); } -/********************************************************************** -Currently does nothing. */ - +/******************************************************************//** +Currently does nothing. +@return 0 */ +UNIV_INTERN int ha_innobase::index_end(void) /*========================*/ @@ -4495,10 +4923,10 @@ ha_innobase::index_end(void) DBUG_RETURN(error); } -/************************************************************************* +/*********************************************************************//** Converts a search mode flag understood by MySQL to a flag understood by InnoDB. */ -inline +static inline ulint convert_search_mode_to_innobase( /*============================*/ @@ -4600,18 +5028,17 @@ overwrap, we use this test only as a secondary way of determining the start of a new SQL statement. */ -/************************************************************************** +/**********************************************************************//** Positions an index cursor to the index specified in the handle. Fetches the -row if any. */ - +row if any. +@return 0, HA_ERR_KEY_NOT_FOUND, or error number */ +UNIV_INTERN int ha_innobase::index_read( /*====================*/ - /* out: 0, HA_ERR_KEY_NOT_FOUND, - or error number */ - uchar* buf, /* in/out: buffer for the returned + uchar* buf, /*!< in/out: buffer for the returned row */ - const uchar* key_ptr, /* in: key value; if this is NULL + const uchar* key_ptr, /*!< in: key value; if this is NULL we position the cursor at the start or end of index; this can also contain an InnoDB row id, in @@ -4620,8 +5047,8 @@ ha_innobase::index_read( also be a prefix of a full key value, and the last column can be a prefix of a full column */ - uint key_len,/* in: key value length */ - enum ha_rkey_function find_flag)/* in: search flags from my_base.h */ + uint key_len,/*!< in: key value length */ + enum ha_rkey_function find_flag)/*!< in: search flags from my_base.h */ { ulint mode; dict_index_t* index; @@ -4637,24 +5064,30 @@ ha_innobase::index_read( index = prebuilt->index; + if (UNIV_UNLIKELY(index == NULL)) { + prebuilt->index_usable = FALSE; + DBUG_RETURN(HA_ERR_CRASHED); + } + /* Note that if the index for which the search template is built is not necessarily prebuilt->index, but can also be the clustered index */ if (prebuilt->sql_stat_start) { - build_template(prebuilt, user_thd, table, - ROW_MYSQL_REC_FIELDS); + build_template(prebuilt, user_thd, table, ROW_MYSQL_REC_FIELDS); } if (key_ptr) { /* Convert the search key value to InnoDB format into prebuilt->search_tuple */ - row_sel_convert_mysql_key_to_innobase(prebuilt->search_tuple, - (byte*) key_val_buff, - (ulint)upd_and_key_val_buff_len, - index, - (byte*) key_ptr, - (ulint) key_len, prebuilt->trx); + row_sel_convert_mysql_key_to_innobase( + prebuilt->search_tuple, + (byte*) key_val_buff, + (ulint)upd_and_key_val_buff_len, + index, + (byte*) key_ptr, + (ulint) key_len, + prebuilt->trx); } else { /* We position the cursor to the last or the first entry in the index */ @@ -4667,10 +5100,12 @@ ha_innobase::index_read( match_mode = 0; if (find_flag == HA_READ_KEY_EXACT) { + match_mode = ROW_SEL_EXACT; } else if (find_flag == HA_READ_PREFIX - || find_flag == HA_READ_PREFIX_LAST) { + || find_flag == HA_READ_PREFIX_LAST) { + match_mode = ROW_SEL_EXACT_PREFIX; } @@ -4689,51 +5124,55 @@ ha_innobase::index_read( ret = DB_UNSUPPORTED; } - if (ret == DB_SUCCESS) { + switch (ret) { + case DB_SUCCESS: error = 0; table->status = 0; - - } else if (ret == DB_RECORD_NOT_FOUND) { + break; + case DB_RECORD_NOT_FOUND: error = HA_ERR_KEY_NOT_FOUND; table->status = STATUS_NOT_FOUND; - - } else if (ret == DB_END_OF_INDEX) { + break; + case DB_END_OF_INDEX: error = HA_ERR_KEY_NOT_FOUND; table->status = STATUS_NOT_FOUND; - } else { - error = convert_error_code_to_mysql((int) ret, user_thd); + break; + default: + error = convert_error_code_to_mysql((int) ret, + prebuilt->table->flags, + user_thd); table->status = STATUS_NOT_FOUND; + break; } DBUG_RETURN(error); } -/*********************************************************************** +/*******************************************************************//** The following functions works like index_read, but it find the last -row with the current key value or prefix. */ - +row with the current key value or prefix. +@return 0, HA_ERR_KEY_NOT_FOUND, or an error code */ +UNIV_INTERN int ha_innobase::index_read_last( /*=========================*/ - /* out: 0, HA_ERR_KEY_NOT_FOUND, or an - error code */ - uchar* buf, /* out: fetched row */ - const uchar* key_ptr,/* in: key value, or a prefix of a full + uchar* buf, /*!< out: fetched row */ + const uchar* key_ptr,/*!< in: key value, or a prefix of a full key value */ - uint key_len)/* in: length of the key val or prefix + uint key_len)/*!< in: length of the key val or prefix in bytes */ { return(index_read(buf, key_ptr, key_len, HA_READ_PREFIX_LAST)); } -/************************************************************************ -Get the index for a handle. Does not change active index.*/ - +/********************************************************************//** +Get the index for a handle. Does not change active index. +@return NULL or index instance. */ +UNIV_INTERN dict_index_t* ha_innobase::innobase_get_index( /*============================*/ - /* out: NULL or index instance. */ - uint keynr) /* in: use this index; MAX_KEY means always + uint keynr) /*!< in: use this index; MAX_KEY means always clustered index, even if it was internally generated by InnoDB */ { @@ -4749,10 +5188,10 @@ ha_innobase::innobase_get_index( if (keynr != MAX_KEY && table->s->keys > 0) { key = table->key_info + keynr; - index = dict_table_get_index_noninline( - prebuilt->table, key->name); + index = dict_table_get_index_on_name(prebuilt->table, + key->name); } else { - index = dict_table_get_first_index_noninline(prebuilt->table); + index = dict_table_get_first_index(prebuilt->table); } if (!index) { @@ -4766,14 +5205,14 @@ ha_innobase::innobase_get_index( DBUG_RETURN(index); } -/************************************************************************ -Changes the active index of a handle. */ - +/********************************************************************//** +Changes the active index of a handle. +@return 0 or error code */ +UNIV_INTERN int ha_innobase::change_active_index( /*=============================*/ - /* out: 0 or error code */ - uint keynr) /* in: use this index; MAX_KEY means always clustered + uint keynr) /*!< in: use this index; MAX_KEY means always clustered index, even if it was internally generated by InnoDB */ { @@ -4786,11 +5225,27 @@ ha_innobase::change_active_index( prebuilt->index = innobase_get_index(keynr); - if (!prebuilt->index) { + if (UNIV_UNLIKELY(!prebuilt->index)) { + sql_print_warning("InnoDB: change_active_index(%u) failed", + keynr); + prebuilt->index_usable = FALSE; DBUG_RETURN(1); } - assert(prebuilt->search_tuple != 0); + prebuilt->index_usable = row_merge_is_index_usable(prebuilt->trx, + prebuilt->index); + + if (UNIV_UNLIKELY(!prebuilt->index_usable)) { + push_warning_printf(user_thd, MYSQL_ERROR::WARN_LEVEL_WARN, + HA_ERR_TABLE_DEF_CHANGED, + "InnoDB: insufficient history for index %u", + keynr); + /* The caller seems to ignore this. Thus, we must check + this again in row_search_for_mysql(). */ + DBUG_RETURN(2); + } + + ut_a(prebuilt->search_tuple != 0); dtuple_set_n_fields(prebuilt->search_tuple, prebuilt->index->n_fields); @@ -4808,23 +5263,23 @@ ha_innobase::change_active_index( DBUG_RETURN(0); } -/************************************************************************** +/**********************************************************************//** Positions an index cursor to the index specified in keynr. Fetches the -row if any. */ -/* ??? This is only used to read whole keys ??? */ - +row if any. +??? This is only used to read whole keys ??? +@return error number or 0 */ +UNIV_INTERN int ha_innobase::index_read_idx( /*========================*/ - /* out: error number or 0 */ - uchar* buf, /* in/out: buffer for the returned + uchar* buf, /*!< in/out: buffer for the returned row */ - uint keynr, /* in: use this index */ - const uchar* key, /* in: key value; if this is NULL + uint keynr, /*!< in: use this index */ + const uchar* key, /*!< in: key value; if this is NULL we position the cursor at the start or end of index */ - uint key_len, /* in: key value length */ - enum ha_rkey_function find_flag)/* in: search flags from my_base.h */ + uint key_len, /*!< in: key value length */ + enum ha_rkey_function find_flag)/*!< in: search flags from my_base.h */ { if (change_active_index(keynr)) { @@ -4834,19 +5289,18 @@ ha_innobase::index_read_idx( return(index_read(buf, key, key_len, find_flag)); } -/*************************************************************************** +/***********************************************************************//** Reads the next or previous row from a cursor, which must have previously been -positioned using index_read. */ - +positioned using index_read. +@return 0, HA_ERR_END_OF_FILE, or error number */ +UNIV_INTERN int ha_innobase::general_fetch( /*=======================*/ - /* out: 0, HA_ERR_END_OF_FILE, or error - number */ - uchar* buf, /* in/out: buffer for next row in MySQL + uchar* buf, /*!< in/out: buffer for next row in MySQL format */ - uint direction, /* in: ROW_SEL_NEXT or ROW_SEL_PREV */ - uint match_mode) /* in: 0, ROW_SEL_EXACT, or + uint direction, /*!< in: ROW_SEL_NEXT or ROW_SEL_PREV */ + uint match_mode) /*!< in: 0, ROW_SEL_EXACT, or ROW_SEL_EXACT_PREFIX */ { ulint ret; @@ -4858,39 +5312,43 @@ ha_innobase::general_fetch( innodb_srv_conc_enter_innodb(prebuilt->trx); - ret = row_search_for_mysql((byte*)buf, 0, prebuilt, match_mode, - direction); + ret = row_search_for_mysql( + (byte*)buf, 0, prebuilt, match_mode, direction); + innodb_srv_conc_exit_innodb(prebuilt->trx); - if (ret == DB_SUCCESS) { + switch (ret) { + case DB_SUCCESS: error = 0; table->status = 0; - - } else if (ret == DB_RECORD_NOT_FOUND) { + break; + case DB_RECORD_NOT_FOUND: error = HA_ERR_END_OF_FILE; table->status = STATUS_NOT_FOUND; - - } else if (ret == DB_END_OF_INDEX) { + break; + case DB_END_OF_INDEX: error = HA_ERR_END_OF_FILE; table->status = STATUS_NOT_FOUND; - } else { - error = convert_error_code_to_mysql((int) ret, user_thd); + break; + default: + error = convert_error_code_to_mysql( + (int) ret, prebuilt->table->flags, user_thd); table->status = STATUS_NOT_FOUND; + break; } DBUG_RETURN(error); } -/*************************************************************************** +/***********************************************************************//** Reads the next row from a cursor, which must have previously been -positioned using index_read. */ - +positioned using index_read. +@return 0, HA_ERR_END_OF_FILE, or error number */ +UNIV_INTERN int ha_innobase::index_next( /*====================*/ - /* out: 0, HA_ERR_END_OF_FILE, or error - number */ - uchar* buf) /* in/out: buffer for next row in MySQL + uchar* buf) /*!< in/out: buffer for next row in MySQL format */ { ha_statistic_increment(&SSV::ha_read_next_count); @@ -4898,47 +5356,46 @@ ha_innobase::index_next( return(general_fetch(buf, ROW_SEL_NEXT, 0)); } -/*********************************************************************** -Reads the next row matching to the key value given as the parameter. */ - +/*******************************************************************//** +Reads the next row matching to the key value given as the parameter. +@return 0, HA_ERR_END_OF_FILE, or error number */ +UNIV_INTERN int ha_innobase::index_next_same( /*=========================*/ - /* out: 0, HA_ERR_END_OF_FILE, or error - number */ - uchar* buf, /* in/out: buffer for the row */ - const uchar* key, /* in: key value */ - uint keylen) /* in: key value length */ + uchar* buf, /*!< in/out: buffer for the row */ + const uchar* key, /*!< in: key value */ + uint keylen) /*!< in: key value length */ { ha_statistic_increment(&SSV::ha_read_next_count); return(general_fetch(buf, ROW_SEL_NEXT, last_match_mode)); } -/*************************************************************************** +/***********************************************************************//** Reads the previous row from a cursor, which must have previously been -positioned using index_read. */ - +positioned using index_read. +@return 0, HA_ERR_END_OF_FILE, or error number */ +UNIV_INTERN int ha_innobase::index_prev( /*====================*/ - /* out: 0, HA_ERR_END_OF_FILE, or error number */ - uchar* buf) /* in/out: buffer for previous row in MySQL format */ + uchar* buf) /*!< in/out: buffer for previous row in MySQL format */ { ha_statistic_increment(&SSV::ha_read_prev_count); return(general_fetch(buf, ROW_SEL_PREV, 0)); } -/************************************************************************ +/********************************************************************//** Positions a cursor on the first record in an index and reads the -corresponding row to buf. */ - +corresponding row to buf. +@return 0, HA_ERR_END_OF_FILE, or error code */ +UNIV_INTERN int ha_innobase::index_first( /*=====================*/ - /* out: 0, HA_ERR_END_OF_FILE, or error code */ - uchar* buf) /* in/out: buffer for the row */ + uchar* buf) /*!< in/out: buffer for the row */ { int error; @@ -4956,15 +5413,15 @@ ha_innobase::index_first( DBUG_RETURN(error); } -/************************************************************************ +/********************************************************************//** Positions a cursor on the last record in an index and reads the -corresponding row to buf. */ - +corresponding row to buf. +@return 0, HA_ERR_END_OF_FILE, or error code */ +UNIV_INTERN int ha_innobase::index_last( /*====================*/ - /* out: 0, HA_ERR_END_OF_FILE, or error code */ - uchar* buf) /* in/out: buffer for the row */ + uchar* buf) /*!< in/out: buffer for the row */ { int error; @@ -4982,14 +5439,14 @@ ha_innobase::index_last( DBUG_RETURN(error); } -/******************************************************************** -Initialize a table scan. */ - +/****************************************************************//** +Initialize a table scan. +@return 0 or error number */ +UNIV_INTERN int ha_innobase::rnd_init( /*==================*/ - /* out: 0 or error number */ - bool scan) /* in: ???????? */ + bool scan) /*!< in: TRUE if table/index scan FALSE otherwise */ { int err; @@ -5014,26 +5471,26 @@ ha_innobase::rnd_init( return(err); } -/********************************************************************* -Ends a table scan. */ - +/*****************************************************************//** +Ends a table scan. +@return 0 or error number */ +UNIV_INTERN int ha_innobase::rnd_end(void) /*======================*/ - /* out: 0 or error number */ { return(index_end()); } -/********************************************************************* +/*****************************************************************//** Reads the next row in a table scan (also used to read the FIRST row -in a table scan). */ - +in a table scan). +@return 0, HA_ERR_END_OF_FILE, or error number */ +UNIV_INTERN int ha_innobase::rnd_next( /*==================*/ - /* out: 0, HA_ERR_END_OF_FILE, or error number */ - uchar* buf) /* in/out: returns the row in this buffer, + uchar* buf) /*!< in/out: returns the row in this buffer, in MySQL format */ { int error; @@ -5043,9 +5500,11 @@ ha_innobase::rnd_next( if (start_of_scan) { error = index_first(buf); + if (error == HA_ERR_KEY_NOT_FOUND) { error = HA_ERR_END_OF_FILE; } + start_of_scan = 0; } else { error = general_fetch(buf, ROW_SEL_NEXT, 0); @@ -5054,15 +5513,15 @@ ha_innobase::rnd_next( DBUG_RETURN(error); } -/************************************************************************** -Fetches a row from the table based on a row reference. */ - +/**********************************************************************//** +Fetches a row from the table based on a row reference. +@return 0, HA_ERR_KEY_NOT_FOUND, or error code */ +UNIV_INTERN int ha_innobase::rnd_pos( /*=================*/ - /* out: 0, HA_ERR_KEY_NOT_FOUND, or error code */ - uchar* buf, /* in/out: buffer for the row */ - uchar* pos) /* in: primary key value of the row in the + uchar* buf, /*!< in/out: buffer for the row */ + uchar* pos) /*!< in: primary key value of the row in the MySQL format, or the row id if the clustered index was internally generated by InnoDB; the length of data in pos has to be ref_length */ @@ -5106,7 +5565,7 @@ ha_innobase::rnd_pos( DBUG_RETURN(error); } -/************************************************************************* +/*********************************************************************//** Stores a reference to the current row to 'ref' field of the handle. Note that in the case where we have generated the clustered index for the table, the function parameter is illogical: we MUST ASSUME that 'record' @@ -5114,11 +5573,11 @@ is the current 'position' of the handle, because if row ref is actually the row id internally generated in InnoDB, then 'record' does not contain it. We just guess that the row id must be for the record where the handle was positioned the last time. */ - +UNIV_INTERN void ha_innobase::position( /*==================*/ - const uchar* record) /* in: row in MySQL format */ + const uchar* record) /*!< in: row in MySQL format */ { uint len; @@ -5147,41 +5606,23 @@ ha_innobase::position( } } -/********************************************************************* -If it's a DB_TOO_BIG_RECORD error then set a suitable message to -return to the client.*/ -inline -void -innodb_check_for_record_too_big_error( -/*==================================*/ - ulint comp, /* in: ROW_FORMAT: nonzero=COMPACT, 0=REDUNDANT */ - int error) /* in: error code to check */ -{ - if (error == (int)DB_TOO_BIG_RECORD) { - ulint max_row_size - = page_get_free_space_of_empty_noninline(comp) / 2; - - my_error(ER_TOO_BIG_ROWSIZE, MYF(0), max_row_size); - } -} - /* limit innodb monitor access to users with PROCESS privilege. See http://bugs.mysql.com/32710 for expl. why we choose PROCESS. */ #define IS_MAGIC_TABLE_AND_USER_DENIED_ACCESS(table_name, thd) \ (row_is_magic_monitor_table(table_name) \ && check_global_access(thd, PROCESS_ACL)) -/********************************************************************* +/*****************************************************************//** Creates a table definition to an InnoDB database. */ static int create_table_def( /*=============*/ - trx_t* trx, /* in: InnoDB transaction handle */ - TABLE* form, /* in: information on table + trx_t* trx, /*!< in: InnoDB transaction handle */ + TABLE* form, /*!< in: information on table columns and indexes */ - const char* table_name, /* in: table name */ - const char* path_of_temp_table,/* in: if this is a table explicitly + const char* table_name, /*!< in: table name */ + const char* path_of_temp_table,/*!< in: if this is a table explicitly created by the user with the TEMPORARY keyword, then this parameter is the dir path where the @@ -5189,7 +5630,7 @@ create_table_def( an .ibd file for it (no .ibd extension in the path, though); otherwise this is NULL */ - ulint flags) /* in: table flags */ + ulint flags) /*!< in: table flags */ { Field* field; dict_table_t* table; @@ -5248,9 +5689,19 @@ create_table_def( charset_no = (ulint)field->charset()->number; - ut_a(charset_no < 256); /* in data0type.h we assume - that the number fits in one - byte */ + if (UNIV_UNLIKELY(charset_no >= 256)) { + /* in data0type.h we assume that the + number fits in one byte in prtype */ + push_warning_printf( + (THD*) trx->mysql_thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_CANT_CREATE_TABLE, + "In InnoDB, charset-collation codes" + " must be below 256." + " Unsupported code %lu.", + (ulong) charset_no); + DBUG_RETURN(ER_CANT_CREATE_TABLE); + } } ut_a(field->type() < 256); /* we assume in dtype_form_prtype() @@ -5275,17 +5726,8 @@ create_table_def( /* First check whether the column to be added has a system reserved name. */ if (dict_col_name_is_reserved(field->field_name)){ - push_warning_printf( - (THD*) trx->mysql_thd, - MYSQL_ERROR::WARN_LEVEL_WARN, - ER_CANT_CREATE_TABLE, - "Error creating table '%s' with " - "column name '%s'. '%s' is a " - "reserved name. Please try to " - "re-create the table with a " - "different column name.", - table->name, (char*) field->field_name, - (char*) field->field_name); + my_error(ER_WRONG_COLUMN_NAME, MYF(0), + field->field_name); dict_mem_table_free(table); trx_commit_for_mysql(trx); @@ -5307,25 +5749,32 @@ create_table_def( error = row_create_table_for_mysql(table, trx); - innodb_check_for_record_too_big_error(flags & DICT_TF_COMPACT, error); + if (error == DB_DUPLICATE_KEY) { + char buf[100]; + innobase_convert_identifier(buf, sizeof buf, + table_name, strlen(table_name), + trx->mysql_thd, TRUE); + my_error(ER_TABLE_EXISTS_ERROR, MYF(0), buf); + } error_ret: - error = convert_error_code_to_mysql(error, NULL); + error = convert_error_code_to_mysql(error, flags, NULL); DBUG_RETURN(error); } -/********************************************************************* +/*****************************************************************//** Creates an index in an InnoDB database. */ static int create_index( /*=========*/ - trx_t* trx, /* in: InnoDB transaction handle */ - TABLE* form, /* in: information on table + trx_t* trx, /*!< in: InnoDB transaction handle */ + TABLE* form, /*!< in: information on table columns and indexes */ - const char* table_name, /* in: table name */ - uint key_num) /* in: index number */ + ulint flags, /*!< in: InnoDB table flags */ + const char* table_name, /*!< in: table name */ + uint key_num) /*!< in: index number */ { Field* field; dict_index_t* index; @@ -5363,8 +5812,8 @@ create_index( /* We pass 0 as the space id, and determine at a lower level the space id where to store the table */ - index = dict_mem_index_create((char*) table_name, key->name, 0, - ind_type, n_fields); + index = dict_mem_index_create(table_name, key->name, 0, + ind_type, n_fields); field_lengths = (ulint*) my_malloc(sizeof(ulint) * n_fields, MYF(MY_FAE)); @@ -5435,27 +5884,23 @@ create_index( sure we don't create too long indexes. */ error = row_create_index_for_mysql(index, trx, field_lengths); - innodb_check_for_record_too_big_error(form->s->row_type - != ROW_TYPE_REDUNDANT, error); - - error = convert_error_code_to_mysql(error, NULL); + error = convert_error_code_to_mysql(error, flags, NULL); my_free(field_lengths, MYF(0)); DBUG_RETURN(error); } -/********************************************************************* +/*****************************************************************//** Creates an index to an InnoDB table when the user has defined no primary index. */ static int create_clustered_index_when_no_primary( /*===================================*/ - trx_t* trx, /* in: InnoDB transaction handle */ - ulint comp, /* in: ROW_FORMAT: - nonzero=COMPACT, 0=REDUNDANT */ - const char* table_name) /* in: table name */ + trx_t* trx, /*!< in: InnoDB transaction handle */ + ulint flags, /*!< in: InnoDB table flags */ + const char* table_name) /*!< in: table name */ { dict_index_t* index; int error; @@ -5465,22 +5910,187 @@ create_clustered_index_when_no_primary( index = dict_mem_index_create(table_name, innobase_index_reserve_name, 0, DICT_CLUSTERED, 0); - error = row_create_index_for_mysql(index, trx, NULL); - innodb_check_for_record_too_big_error(comp, error); + error = row_create_index_for_mysql(index, trx, NULL); - error = convert_error_code_to_mysql(error, NULL); + error = convert_error_code_to_mysql(error, flags, NULL); return(error); } -/********************************************************************* -Update create_info. Used in SHOW CREATE TABLE et al. */ +/*****************************************************************//** +Validates the create options. We may build on this function +in future. For now, it checks two specifiers: +KEY_BLOCK_SIZE and ROW_FORMAT +If innodb_strict_mode is not set then this function is a no-op +@return TRUE if valid. */ +static +ibool +create_options_are_valid( +/*=====================*/ + THD* thd, /*!< in: connection thread. */ + TABLE* form, /*!< in: information on table + columns and indexes */ + HA_CREATE_INFO* create_info) /*!< in: create info. */ +{ + ibool kbs_specified = FALSE; + ibool ret = TRUE; + + + ut_ad(thd != NULL); + + /* If innodb_strict_mode is not set don't do any validation. */ + if (!(THDVAR(thd, strict_mode))) { + return(TRUE); + } + + ut_ad(form != NULL); + ut_ad(create_info != NULL); + + /* First check if KEY_BLOCK_SIZE was specified. */ + if (create_info->key_block_size + || (create_info->used_fields & HA_CREATE_USED_KEY_BLOCK_SIZE)) { + + kbs_specified = TRUE; + switch (create_info->key_block_size) { + case 1: + case 2: + case 4: + case 8: + case 16: + /* Valid value. */ + break; + default: + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: invalid" + " KEY_BLOCK_SIZE = %lu." + " Valid values are" + " [1, 2, 4, 8, 16]", + create_info->key_block_size); + ret = FALSE; + } + } + + /* If KEY_BLOCK_SIZE was specified, check for its + dependencies. */ + if (kbs_specified && !srv_file_per_table) { + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: KEY_BLOCK_SIZE" + " requires innodb_file_per_table."); + ret = FALSE; + } + + if (kbs_specified && srv_file_format < DICT_TF_FORMAT_ZIP) { + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: KEY_BLOCK_SIZE" + " requires innodb_file_format >" + " Antelope."); + ret = FALSE; + } + + /* Now check for ROW_FORMAT specifier. */ + if (create_info->used_fields & HA_CREATE_USED_ROW_FORMAT) { + switch (form->s->row_type) { + const char* row_format_name; + case ROW_TYPE_COMPRESSED: + case ROW_TYPE_DYNAMIC: + row_format_name + = form->s->row_type == ROW_TYPE_COMPRESSED + ? "COMPRESSED" + : "DYNAMIC"; + + /* These two ROW_FORMATs require + srv_file_per_table and srv_file_format */ + if (!srv_file_per_table) { + push_warning_printf( + thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: ROW_FORMAT=%s" + " requires innodb_file_per_table.", + row_format_name); + ret = FALSE; + + } + + if (srv_file_format < DICT_TF_FORMAT_ZIP) { + push_warning_printf( + thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: ROW_FORMAT=%s" + " requires innodb_file_format >" + " Antelope.", + row_format_name); + ret = FALSE; + } + + /* Cannot specify KEY_BLOCK_SIZE with + ROW_FORMAT = DYNAMIC. + However, we do allow COMPRESSED to be + specified with KEY_BLOCK_SIZE. */ + if (kbs_specified + && form->s->row_type == ROW_TYPE_DYNAMIC) { + push_warning_printf( + thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: cannot specify" + " ROW_FORMAT = DYNAMIC with" + " KEY_BLOCK_SIZE."); + ret = FALSE; + } + + break; + + case ROW_TYPE_REDUNDANT: + case ROW_TYPE_COMPACT: + case ROW_TYPE_DEFAULT: + /* Default is COMPACT. */ + row_format_name + = form->s->row_type == ROW_TYPE_REDUNDANT + ? "REDUNDANT" + : "COMPACT"; + + /* Cannot specify KEY_BLOCK_SIZE with these + format specifiers. */ + if (kbs_specified) { + push_warning_printf( + thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: cannot specify" + " ROW_FORMAT = %s with" + " KEY_BLOCK_SIZE.", + row_format_name); + ret = FALSE; + } + + break; + + default: + push_warning(thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: invalid ROW_FORMAT specifier."); + ret = FALSE; + + } + } + + return(ret); +} +/*****************************************************************//** +Update create_info. Used in SHOW CREATE TABLE et al. */ +UNIV_INTERN void ha_innobase::update_create_info( /*============================*/ - HA_CREATE_INFO* create_info) /* in/out: create info */ + HA_CREATE_INFO* create_info) /*!< in/out: create info */ { if (!(create_info->used_fields & HA_CREATE_USED_AUTO)) { ha_innobase::info(HA_STATUS_AUTO); @@ -5488,17 +6098,17 @@ ha_innobase::update_create_info( } } -/********************************************************************* -Creates a new table to an InnoDB database. */ - +/*****************************************************************//** +Creates a new table to an InnoDB database. +@return error number */ +UNIV_INTERN int ha_innobase::create( /*================*/ - /* out: error number */ - const char* name, /* in: table name */ - TABLE* form, /* in: information on table + const char* name, /*!< in: table name */ + TABLE* form, /*!< in: information on table columns and indexes */ - HA_CREATE_INFO* create_info) /* in: more information of the + HA_CREATE_INFO* create_info) /*!< in: more information of the created table, contains also the create statement string */ { @@ -5511,8 +6121,11 @@ ha_innobase::create( char name2[FN_REFLEN]; char norm_name[FN_REFLEN]; THD* thd = ha_thd(); - ib_longlong auto_inc_value; + ib_int64_t auto_inc_value; ulint flags; + /* Cache the value of innodb_file_format, in case it is + modified by another thread while the table is being created. */ + const ulint file_format = srv_file_format; DBUG_ENTER("ha_innobase::create"); @@ -5560,18 +6173,7 @@ ha_innobase::create( trx_search_latch_release_if_reserved(parent_trx); - trx = trx_allocate_for_mysql(); - - trx->mysql_thd = thd; - trx->mysql_query_str = thd_query(thd); - - if (thd_test_options(thd, OPTION_NO_FOREIGN_KEY_CHECKS)) { - trx->check_foreigns = FALSE; - } - - if (thd_test_options(thd, OPTION_RELAXED_UNIQUE_CHECKS)) { - trx->check_unique_secondary = FALSE; - } + trx = innobase_trx_allocate(thd); if (lower_case_table_names) { srv_lower_case_table_names = TRUE; @@ -5593,8 +6195,145 @@ ha_innobase::create( flags = 0; - if (form->s->row_type != ROW_TYPE_REDUNDANT) { - flags |= DICT_TF_COMPACT; + /* Validate create options if innodb_strict_mode is set. */ + if (!create_options_are_valid(thd, form, create_info)) { + error = ER_ILLEGAL_HA_CREATE_OPTION; + goto cleanup; + } + + if (create_info->key_block_size + || (create_info->used_fields & HA_CREATE_USED_KEY_BLOCK_SIZE)) { + /* Determine the page_zip.ssize corresponding to the + requested page size (key_block_size) in kilobytes. */ + + ulint ssize, ksize; + ulint key_block_size = create_info->key_block_size; + + for (ssize = ksize = 1; ssize <= DICT_TF_ZSSIZE_MAX; + ssize++, ksize <<= 1) { + if (key_block_size == ksize) { + flags = ssize << DICT_TF_ZSSIZE_SHIFT + | DICT_TF_COMPACT + | DICT_TF_FORMAT_ZIP + << DICT_TF_FORMAT_SHIFT; + break; + } + } + + if (!srv_file_per_table) { + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: KEY_BLOCK_SIZE" + " requires innodb_file_per_table."); + flags = 0; + } + + if (file_format < DICT_TF_FORMAT_ZIP) { + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: KEY_BLOCK_SIZE" + " requires innodb_file_format >" + " Antelope."); + flags = 0; + } + + if (!flags) { + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: ignoring" + " KEY_BLOCK_SIZE=%lu.", + create_info->key_block_size); + } + } + + if (create_info->used_fields & HA_CREATE_USED_ROW_FORMAT) { + if (flags) { + /* KEY_BLOCK_SIZE was specified. */ + if (form->s->row_type != ROW_TYPE_COMPRESSED) { + /* ROW_FORMAT other than COMPRESSED + ignores KEY_BLOCK_SIZE. It does not + make sense to reject conflicting + KEY_BLOCK_SIZE and ROW_FORMAT, because + such combinations can be obtained + with ALTER TABLE anyway. */ + push_warning_printf( + thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: ignoring KEY_BLOCK_SIZE=%lu" + " unless ROW_FORMAT=COMPRESSED.", + create_info->key_block_size); + flags = 0; + } + } else { + /* No KEY_BLOCK_SIZE */ + if (form->s->row_type == ROW_TYPE_COMPRESSED) { + /* ROW_FORMAT=COMPRESSED without + KEY_BLOCK_SIZE implies half the + maximum KEY_BLOCK_SIZE. */ + flags = (DICT_TF_ZSSIZE_MAX - 1) + << DICT_TF_ZSSIZE_SHIFT + | DICT_TF_COMPACT + | DICT_TF_FORMAT_ZIP + << DICT_TF_FORMAT_SHIFT; +#if DICT_TF_ZSSIZE_MAX < 1 +# error "DICT_TF_ZSSIZE_MAX < 1" +#endif + } + } + + switch (form->s->row_type) { + const char* row_format_name; + case ROW_TYPE_REDUNDANT: + break; + case ROW_TYPE_COMPRESSED: + case ROW_TYPE_DYNAMIC: + row_format_name + = form->s->row_type == ROW_TYPE_COMPRESSED + ? "COMPRESSED" + : "DYNAMIC"; + + if (!srv_file_per_table) { + push_warning_printf( + thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: ROW_FORMAT=%s" + " requires innodb_file_per_table.", + row_format_name); + } else if (file_format < DICT_TF_FORMAT_ZIP) { + push_warning_printf( + thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: ROW_FORMAT=%s" + " requires innodb_file_format >" + " Antelope.", + row_format_name); + } else { + flags |= DICT_TF_COMPACT + | (DICT_TF_FORMAT_ZIP + << DICT_TF_FORMAT_SHIFT); + break; + } + + /* fall through */ + case ROW_TYPE_NOT_USED: + case ROW_TYPE_FIXED: + default: + push_warning(thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: assuming ROW_FORMAT=COMPACT."); + case ROW_TYPE_DEFAULT: + case ROW_TYPE_COMPACT: + flags = DICT_TF_COMPACT; + break; + } + } else if (!flags) { + /* No KEY_BLOCK_SIZE or ROW_FORMAT specified: + use ROW_FORMAT=COMPACT by default. */ + flags = DICT_TF_COMPACT; } /* Look for a primary key */ @@ -5606,11 +6345,12 @@ ha_innobase::create( /* Our function row_get_mysql_key_number_for_index assumes the primary key is always number 0, if it exists */ - DBUG_ASSERT(primary_key_no == -1 || primary_key_no == 0); + ut_a(primary_key_no == -1 || primary_key_no == 0); /* Check for name conflicts (with reserved name) for any user indices to be created. */ - if (innobase_index_name_is_reserved(trx, form, norm_name)) { + if (innobase_index_name_is_reserved(trx, form->key_info, + form->s->keys)) { error = -1; goto cleanup; } @@ -5632,8 +6372,7 @@ ha_innobase::create( by InnoDB */ error = create_clustered_index_when_no_primary( - trx, form->s->row_type != ROW_TYPE_REDUNDANT, - norm_name); + trx, flags, norm_name); if (error) { goto cleanup; } @@ -5642,7 +6381,7 @@ ha_innobase::create( if (primary_key_no != -1) { /* In InnoDB the clustered index must always be created first */ - if ((error = create_index(trx, form, norm_name, + if ((error = create_index(trx, form, flags, norm_name, (uint) primary_key_no))) { goto cleanup; } @@ -5652,7 +6391,8 @@ ha_innobase::create( if (i != (uint) primary_key_no) { - if ((error = create_index(trx, form, norm_name, i))) { + if ((error = create_index(trx, form, flags, norm_name, + i))) { goto cleanup; } } @@ -5663,7 +6403,7 @@ ha_innobase::create( *trx->mysql_query_str, norm_name, create_info->options & HA_LEX_CREATE_TMP_TABLE); - error = convert_error_code_to_mysql(error, NULL); + error = convert_error_code_to_mysql(error, flags, NULL); if (error) { goto cleanup; @@ -5684,6 +6424,15 @@ ha_innobase::create( DBUG_ASSERT(innobase_table != 0); + if (innobase_table) { + /* We update the highest file format in the system table + space, if this table has higher file format setting. */ + + trx_sys_file_format_max_upgrade( + (const char**) &innobase_file_format_check, + dict_table_get_format(innobase_table)); + } + /* Note: We can't call update_thd() as prebuilt will not be setup at this stage and so we use thd. */ @@ -5731,14 +6480,14 @@ cleanup: DBUG_RETURN(error); } -/********************************************************************* -Discards or imports an InnoDB tablespace. */ - +/*****************************************************************//** +Discards or imports an InnoDB tablespace. +@return 0 == success, -1 == error */ +UNIV_INTERN int ha_innobase::discard_or_import_tablespace( /*======================================*/ - /* out: 0 == success, -1 == error */ - my_bool discard) /* in: TRUE if discard, else import */ + my_bool discard) /*!< in: TRUE if discard, else import */ { dict_table_t* dict_table; trx_t* trx; @@ -5759,18 +6508,18 @@ ha_innobase::discard_or_import_tablespace( err = row_import_tablespace_for_mysql(dict_table->name, trx); } - err = convert_error_code_to_mysql(err, NULL); + err = convert_error_code_to_mysql(err, dict_table->flags, NULL); DBUG_RETURN(err); } -/********************************************************************* -Deletes all rows of an InnoDB table. */ - +/*****************************************************************//** +Deletes all rows of an InnoDB table. +@return error number */ +UNIV_INTERN int ha_innobase::delete_all_rows(void) /*==============================*/ - /* out: error number */ { int error; @@ -5797,23 +6546,24 @@ ha_innobase::delete_all_rows(void) goto fallback; } - error = convert_error_code_to_mysql(error, NULL); + error = convert_error_code_to_mysql(error, prebuilt->table->flags, + NULL); DBUG_RETURN(error); } -/********************************************************************* +/*****************************************************************//** Drops a table from an InnoDB database. Before calling this function, MySQL calls innobase_commit to commit the transaction of the current user. Then the current user cannot have locks set on the table. Drop table operation inside InnoDB will remove all locks any user has on the table -inside InnoDB. */ - +inside InnoDB. +@return error number */ +UNIV_INTERN int ha_innobase::delete_table( /*======================*/ - /* out: error number */ - const char* name) /* in: table name */ + const char* name) /*!< in: table name */ { ulint name_len; int error; @@ -5842,28 +6592,17 @@ ha_innobase::delete_table( trx_search_latch_release_if_reserved(parent_trx); + trx = innobase_trx_allocate(thd); + if (lower_case_table_names) { srv_lower_case_table_names = TRUE; } else { srv_lower_case_table_names = FALSE; } - trx = trx_allocate_for_mysql(); - - trx->mysql_thd = thd; - trx->mysql_query_str = thd_query(thd); - - if (thd_test_options(thd, OPTION_NO_FOREIGN_KEY_CHECKS)) { - trx->check_foreigns = FALSE; - } - - if (thd_test_options(thd, OPTION_RELAXED_UNIQUE_CHECKS)) { - trx->check_unique_secondary = FALSE; - } - name_len = strlen(name); - assert(name_len < 1000); + ut_a(name_len < 1000); /* Drop the table in InnoDB */ @@ -5886,26 +6625,24 @@ ha_innobase::delete_table( trx_free_for_mysql(trx); - error = convert_error_code_to_mysql(error, NULL); + error = convert_error_code_to_mysql(error, 0, NULL); DBUG_RETURN(error); } -/********************************************************************* +/*****************************************************************//** Removes all tables in the named database inside InnoDB. */ static void innobase_drop_database( /*===================*/ - /* out: error number */ - handlerton *hton, /* in: handlerton of Innodb */ - char* path) /* in: database path; inside InnoDB the name + handlerton *hton, /*!< in: handlerton of Innodb */ + char* path) /*!< in: database path; inside InnoDB the name of the last directory in the path is used as the database name: for example, in 'mysql/data/test' the database name is 'test' */ { ulint len = 0; - trx_t* parent_trx; trx_t* trx; char* ptr; int error; @@ -5915,12 +6652,18 @@ innobase_drop_database( /* Get the transaction associated with the current thd, or create one if not yet created */ - parent_trx = check_trx_exists(thd); + DBUG_ASSERT(hton == innodb_hton_ptr); - /* In case MySQL calls this in the middle of a SELECT query, release - possible adaptive hash latch to avoid deadlocks of threads */ + /* In the Windows plugin, thd = current_thd is always NULL */ + if (thd) { + trx_t* parent_trx = check_trx_exists(thd); - trx_search_latch_release_if_reserved(parent_trx); + /* In case MySQL calls this in the middle of a SELECT + query, release possible adaptive hash latch to avoid + deadlocks of threads */ + + trx_search_latch_release_if_reserved(parent_trx); + } ptr = strend(path) - 2; @@ -5938,14 +6681,14 @@ innobase_drop_database( #ifdef __WIN__ innobase_casedn_str(namebuf); #endif +#if defined __WIN__ && !defined MYSQL_SERVER + /* In the Windows plugin, thd = current_thd is always NULL */ trx = trx_allocate_for_mysql(); - trx->mysql_thd = thd; - trx->mysql_query_str = thd_query(thd); - - if (thd_test_options(thd, OPTION_NO_FOREIGN_KEY_CHECKS)) { - trx->check_foreigns = FALSE; - } - + trx->mysql_thd = NULL; + trx->mysql_query_str = NULL; +#else + trx = innobase_trx_allocate(thd); +#endif error = row_drop_database_for_mysql(namebuf, trx); my_free(namebuf, MYF(0)); @@ -5962,32 +6705,85 @@ innobase_drop_database( innobase_commit_low(trx); trx_free_for_mysql(trx); -#ifdef NO_LONGER_INTERESTED_IN_DROP_DB_ERROR - error = convert_error_code_to_mysql(error, NULL); - - return(error); -#else - return; -#endif } +/*********************************************************************//** +Renames an InnoDB table. +@return 0 or error code */ +static +int +innobase_rename_table( +/*==================*/ + trx_t* trx, /*!< in: transaction */ + const char* from, /*!< in: old name of the table */ + const char* to, /*!< in: new name of the table */ + ibool lock_and_commit) + /*!< in: TRUE=lock data dictionary and commit */ +{ + int error; + char* norm_to; + char* norm_from; -/************************************************************************* -Renames an InnoDB table. */ + if (lower_case_table_names) { + srv_lower_case_table_names = TRUE; + } else { + srv_lower_case_table_names = FALSE; + } + + // Magic number 64 arbitrary + norm_to = (char*) my_malloc(strlen(to) + 64, MYF(0)); + norm_from = (char*) my_malloc(strlen(from) + 64, MYF(0)); + + normalize_table_name(norm_to, to); + normalize_table_name(norm_from, from); + + /* Serialize data dictionary operations with dictionary mutex: + no deadlocks can occur then in these operations */ + if (lock_and_commit) { + row_mysql_lock_data_dictionary(trx); + } + + error = row_rename_table_for_mysql( + norm_from, norm_to, trx, lock_and_commit); + + if (error != DB_SUCCESS) { + FILE* ef = dict_foreign_err_file; + + fputs("InnoDB: Renaming table ", ef); + ut_print_name(ef, trx, TRUE, norm_from); + fputs(" to ", ef); + ut_print_name(ef, trx, TRUE, norm_to); + fputs(" failed!\n", ef); + } + + if (lock_and_commit) { + row_mysql_unlock_data_dictionary(trx); + + /* Flush the log to reduce probability that the .frm + files and the InnoDB data dictionary get out-of-sync + if the user runs with innodb_flush_log_at_trx_commit = 0 */ + + log_buffer_flush_to_disk(); + } + + my_free(norm_to, MYF(0)); + my_free(norm_from, MYF(0)); + + return error; +} +/*********************************************************************//** +Renames an InnoDB table. +@return 0 or error code */ +UNIV_INTERN int ha_innobase::rename_table( /*======================*/ - /* out: 0 or error code */ - const char* from, /* in: old name of the table */ - const char* to) /* in: new name of the table */ + const char* from, /*!< in: old name of the table */ + const char* to) /*!< in: new name of the table */ { - ulint name_len1; - ulint name_len2; + trx_t* trx; int error; trx_t* parent_trx; - trx_t* trx; - char norm_from[1000]; - char norm_to[1000]; THD* thd = ha_thd(); DBUG_ENTER("ha_innobase::rename_table"); @@ -6002,38 +6798,9 @@ ha_innobase::rename_table( trx_search_latch_release_if_reserved(parent_trx); - if (lower_case_table_names) { - srv_lower_case_table_names = TRUE; - } else { - srv_lower_case_table_names = FALSE; - } - - trx = trx_allocate_for_mysql(); - trx->mysql_thd = thd; - trx->mysql_query_str = thd_query(thd); - - if (thd_test_options(thd, OPTION_NO_FOREIGN_KEY_CHECKS)) { - trx->check_foreigns = FALSE; - } - - name_len1 = strlen(from); - name_len2 = strlen(to); + trx = innobase_trx_allocate(thd); - assert(name_len1 < 1000); - assert(name_len2 < 1000); - - normalize_table_name(norm_from, from); - normalize_table_name(norm_to, to); - - /* Rename the table in InnoDB */ - - error = row_rename_table_for_mysql(norm_from, norm_to, trx); - - /* Flush the log to reduce probability that the .frm files and - the InnoDB data dictionary get out-of-sync if the user runs - with innodb_flush_log_at_trx_commit = 0 */ - - log_buffer_flush_to_disk(); + error = innobase_rename_table(trx, from, to, TRUE); /* Tell the InnoDB server that there might be work for utility threads: */ @@ -6061,23 +6828,22 @@ ha_innobase::rename_table( error = DB_ERROR; } - error = convert_error_code_to_mysql(error, NULL); + error = convert_error_code_to_mysql(error, 0, NULL); DBUG_RETURN(error); } -/************************************************************************* -Estimates the number of index records in a range. */ - +/*********************************************************************//** +Estimates the number of index records in a range. +@return estimated number of rows */ +UNIV_INTERN ha_rows ha_innobase::records_in_range( /*==========================*/ - /* out: estimated number of - rows */ - uint keynr, /* in: index number */ - key_range *min_key, /* in: start key value of the + uint keynr, /*!< in: index number */ + key_range *min_key, /*!< in: start key value of the range, may also be 0 */ - key_range *max_key) /* in: range end key val, may + key_range *max_key) /*!< in: range end key val, may also be 0 */ { KEY* key; @@ -6090,11 +6856,10 @@ ha_innobase::records_in_range( + table->s->max_key_length + 100; dtuple_t* range_start; dtuple_t* range_end; - ib_longlong n_rows; + ib_int64_t n_rows; ulint mode1; ulint mode2; - void* heap1; - void* heap2; + mem_heap_t* heap; DBUG_ENTER("records_in_range"); @@ -6111,12 +6876,18 @@ ha_innobase::records_in_range( key = table->key_info + active_index; - index = dict_table_get_index_noninline(prebuilt->table, key->name); + index = dict_table_get_index_on_name(prebuilt->table, key->name); + + /* MySQL knows about this index and so we must be able to find it.*/ + ut_a(index); + + heap = mem_heap_create(2 * (key->key_parts * sizeof(dfield_t) + + sizeof(dtuple_t))); - range_start = dtuple_create_for_mysql(&heap1, key->key_parts); + range_start = dtuple_create(heap, key->key_parts); dict_index_copy_types(range_start, index, key->key_parts); - range_end = dtuple_create_for_mysql(&heap2, key->key_parts); + range_end = dtuple_create(heap, key->key_parts); dict_index_copy_types(range_end, index, key->key_parts); row_sel_convert_mysql_key_to_innobase( @@ -6151,8 +6922,7 @@ ha_innobase::records_in_range( n_rows = HA_POS_ERROR; } - dtuple_free_for_mysql(heap1); - dtuple_free_for_mysql(heap2); + mem_heap_free(heap); my_free(key_val_buff2, MYF(0)); @@ -6171,14 +6941,14 @@ ha_innobase::records_in_range( DBUG_RETURN((ha_rows) n_rows); } -/************************************************************************* +/*********************************************************************//** Gives an UPPER BOUND to the number of rows in a table. This is used in -filesort.cc. */ - +filesort.cc. +@return upper bound of rows */ +UNIV_INTERN ha_rows ha_innobase::estimate_rows_upper_bound(void) /*======================================*/ - /* out: upper bound of rows */ { dict_index_t* index; ulonglong estimate; @@ -6200,10 +6970,13 @@ ha_innobase::estimate_rows_upper_bound(void) trx_search_latch_release_if_reserved(prebuilt->trx); - index = dict_table_get_first_index_noninline(prebuilt->table); + index = dict_table_get_first_index(prebuilt->table); + + ut_a(index->stat_n_leaf_pages > 0); + + local_data_file_length = + ((ulonglong) index->stat_n_leaf_pages) * UNIV_PAGE_SIZE; - local_data_file_length = ((ulonglong) index->stat_n_leaf_pages) - * UNIV_PAGE_SIZE; /* Calculate a minimum length for a clustered index record and from that an upper bound for the number of rows. Since we only calculate @@ -6218,15 +6991,15 @@ ha_innobase::estimate_rows_upper_bound(void) DBUG_RETURN((ha_rows) estimate); } -/************************************************************************* +/*********************************************************************//** How many seeks it will take to read through the table. This is to be comparable to the number returned by records_in_range so that we can -decide if we should scan the table or use keys. */ - +decide if we should scan the table or use keys. +@return estimated time measured in disk seeks */ +UNIV_INTERN double ha_innobase::scan_time() /*====================*/ - /* out: estimated time measured in disk seeks */ { /* Since MySQL seems to favor table scans too much over index searches, we pretend that a sequential read takes the same time @@ -6236,17 +7009,17 @@ ha_innobase::scan_time() return((double) (prebuilt->table->stat_clustered_index_size)); } -/********************************************************************** +/******************************************************************//** Calculate the time it takes to read a set of ranges through an index -This enables us to optimise reads for clustered indexes. */ - +This enables us to optimise reads for clustered indexes. +@return estimated time measured in disk seeks */ +UNIV_INTERN double ha_innobase::read_time( /*===================*/ - /* out: estimated time measured in disk seeks */ - uint index, /* in: key number */ - uint ranges, /* in: how many ranges */ - ha_rows rows) /* in: estimated number of rows in the ranges */ + uint index, /*!< in: key number */ + uint ranges, /*!< in: how many ranges */ + ha_rows rows) /*!< in: estimated number of rows in the ranges */ { ha_rows total_rows; double time_for_scan; @@ -6274,19 +7047,19 @@ ha_innobase::read_time( return(ranges + (double) rows / (double) total_rows * time_for_scan); } -/************************************************************************* +/*********************************************************************//** Returns statistics information of the table to the MySQL interpreter, in various fields of the handle object. */ - +UNIV_INTERN int ha_innobase::info( /*==============*/ - uint flag) /* in: what information MySQL requests */ + uint flag) /*!< in: what information MySQL requests */ { dict_table_t* ib_table; dict_index_t* index; ha_rows rec_per_key; - ib_longlong n_rows; + ib_int64_t n_rows; ulong j; ulong i; char path[FN_REFLEN]; @@ -6452,10 +7225,10 @@ ha_innobase::info( } if (flag & HA_STATUS_CONST) { - index = dict_table_get_first_index_noninline(ib_table); + index = dict_table_get_first_index(ib_table); if (prebuilt->clust_index_was_generated) { - index = dict_table_get_next_index_noninline(index); + index = dict_table_get_next_index(index); } for (i = 0; i < table->s->keys; i++) { @@ -6466,8 +7239,8 @@ ha_innobase::info( ".frm file. Have you mixed up " ".frm files from different " "installations? See " -"http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html\n", - + REFMAN + "innodb-troubleshooting.html\n", ib_table->name); break; } @@ -6479,7 +7252,7 @@ ha_innobase::info( "Index %s of %s has %lu columns unique inside InnoDB, but MySQL is asking " "statistics for %lu columns. Have you mixed up .frm files from different " "installations? " -"See http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html\n", +"See " REFMAN "innodb-troubleshooting.html\n", index->name, ib_table->name, (unsigned long) @@ -6511,37 +7284,45 @@ ha_innobase::info( (ulong) rec_per_key; } - index = dict_table_get_next_index_noninline(index); + index = dict_table_get_next_index(index); } } if (flag & HA_STATUS_ERRKEY) { + const dict_index_t* err_index; + ut_a(prebuilt->trx); ut_a(prebuilt->trx->magic_n == TRX_MAGIC_N); - errkey = (unsigned int) row_get_mysql_key_number_for_index( - (dict_index_t*) trx_get_error_info(prebuilt->trx)); + err_index = trx_get_error_info(prebuilt->trx); + + if (err_index) { + errkey = (unsigned int) + row_get_mysql_key_number_for_index(err_index); + } else { + errkey = (unsigned int) prebuilt->trx->error_key_num; + } } - if (flag & HA_STATUS_AUTO && table->found_next_number_field) { - stats.auto_increment_value = innobase_peek_autoinc(); + if ((flag & HA_STATUS_AUTO) && table->found_next_number_field) { + stats.auto_increment_value = innobase_peek_autoinc(); } prebuilt->trx->op_info = (char*)""; - DBUG_RETURN(0); + DBUG_RETURN(0); } -/************************************************************************** +/**********************************************************************//** Updates index cardinalities of the table, based on 8 random dives into -each index tree. This does NOT calculate exact statistics on the table. */ - +each index tree. This does NOT calculate exact statistics on the table. +@return returns always 0 (success) */ +UNIV_INTERN int ha_innobase::analyze( /*=================*/ - /* out: returns always 0 (success) */ - THD* thd, /* in: connection thread handle */ - HA_CHECK_OPT* check_opt) /* in: currently ignored */ + THD* thd, /*!< in: connection thread handle */ + HA_CHECK_OPT* check_opt) /*!< in: currently ignored */ { /* Serialize ANALYZE TABLE inside InnoDB, see Bug#38996 Race condition in ANALYZE TABLE */ @@ -6555,31 +7336,30 @@ ha_innobase::analyze( return(0); } -/************************************************************************** +/**********************************************************************//** This is mapped to "ALTER TABLE tablename ENGINE=InnoDB", which rebuilds the table in MySQL. */ - +UNIV_INTERN int ha_innobase::optimize( /*==================*/ - THD* thd, /* in: connection thread handle */ - HA_CHECK_OPT* check_opt) /* in: currently ignored */ + THD* thd, /*!< in: connection thread handle */ + HA_CHECK_OPT* check_opt) /*!< in: currently ignored */ { return(HA_ADMIN_TRY_ALTER); } -/*********************************************************************** +/*******************************************************************//** Tries to check that an InnoDB table is not corrupted. If corruption is noticed, prints to stderr information about it. In case of corruption -may also assert a failure and crash the server. */ - +may also assert a failure and crash the server. +@return HA_ADMIN_CORRUPT or HA_ADMIN_OK */ +UNIV_INTERN int ha_innobase::check( /*===============*/ - /* out: HA_ADMIN_CORRUPT or - HA_ADMIN_OK */ - THD* thd, /* in: user thread handle */ - HA_CHECK_OPT* check_opt) /* in: check options, currently + THD* thd, /*!< in: user thread handle */ + HA_CHECK_OPT* check_opt) /*!< in: check options, currently ignored */ { ulint ret; @@ -6598,24 +7378,27 @@ ha_innobase::check( ret = row_check_table_for_mysql(prebuilt); - if (ret == DB_SUCCESS) { + switch (ret) { + case DB_SUCCESS: return(HA_ADMIN_OK); + case DB_INTERRUPTED: + my_error(ER_QUERY_INTERRUPTED, MYF(0)); + return(-1); + default: + return(HA_ADMIN_CORRUPT); } - - return(HA_ADMIN_CORRUPT); } -/***************************************************************** +/*************************************************************//** Adds information about free space in the InnoDB tablespace to a table comment which is printed out when a user calls SHOW TABLE STATUS. Adds also info on -foreign keys. */ - +foreign keys. +@return table comment + InnoDB free space + info on foreign keys */ +UNIV_INTERN char* ha_innobase::update_table_comment( /*==============================*/ - /* out: table comment + InnoDB free space + - info on foreign keys */ - const char* comment)/* in: table comment defined by user */ + const char* comment)/*!< in: table comment defined by user */ { uint length = (uint) strlen(comment); char* str; @@ -6641,7 +7424,7 @@ ha_innobase::update_table_comment( /* output the data to a temporary file */ - mutex_enter_noninline(&srv_dict_tmpfile_mutex); + mutex_enter(&srv_dict_tmpfile_mutex); rewind(srv_dict_tmpfile); fprintf(srv_dict_tmpfile, "InnoDB free: %llu kB", @@ -6674,22 +7457,22 @@ ha_innobase::update_table_comment( pos[flen] = 0; } - mutex_exit_noninline(&srv_dict_tmpfile_mutex); + mutex_exit(&srv_dict_tmpfile_mutex); prebuilt->trx->op_info = (char*)""; return(str ? str : (char*) comment); } -/*********************************************************************** -Gets the foreign key create info for a table stored in InnoDB. */ - +/*******************************************************************//** +Gets the foreign key create info for a table stored in InnoDB. +@return own: character string in the form which can be inserted to the +CREATE TABLE statement, MUST be freed with +ha_innobase::free_foreign_key_create_info */ +UNIV_INTERN char* ha_innobase::get_foreign_key_create_info(void) /*==========================================*/ - /* out, own: character string in the form which - can be inserted to the CREATE TABLE statement, - MUST be freed with ::free_foreign_key_create_info */ { char* str = 0; long flen; @@ -6710,7 +7493,7 @@ ha_innobase::get_foreign_key_create_info(void) trx_search_latch_release_if_reserved(prebuilt->trx); - mutex_enter_noninline(&srv_dict_tmpfile_mutex); + mutex_enter(&srv_dict_tmpfile_mutex); rewind(srv_dict_tmpfile); /* output the data to a temporary file */ @@ -6736,12 +7519,13 @@ ha_innobase::get_foreign_key_create_info(void) str[flen] = 0; } - mutex_exit_noninline(&srv_dict_tmpfile_mutex); + mutex_exit(&srv_dict_tmpfile_mutex); return(str); } +UNIV_INTERN int ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) { @@ -6752,7 +7536,7 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) update_thd(ha_thd()); prebuilt->trx->op_info = (char*)"getting list of foreign keys"; trx_search_latch_release_if_reserved(prebuilt->trx); - mutex_enter_noninline(&(dict_sys->mutex)); + mutex_enter(&(dict_sys->mutex)); foreign = UT_LIST_GET_FIRST(prebuilt->table->foreign_list); while (foreign != NULL) { @@ -6809,7 +7593,7 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) { length=7; tmp_buff= "CASCADE"; - } + } else if (foreign->type & DICT_FOREIGN_ON_DELETE_SET_NULL) { length=8; @@ -6827,8 +7611,8 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) } f_key_info.delete_method = thd_make_lex_string( thd, f_key_info.delete_method, tmp_buff, length, 1); - - + + if (foreign->type & DICT_FOREIGN_ON_UPDATE_CASCADE) { length=7; @@ -6867,17 +7651,18 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) f_key_list->push_back(pf_key_info); foreign = UT_LIST_GET_NEXT(foreign_list, foreign); } - mutex_exit_noninline(&(dict_sys->mutex)); + mutex_exit(&(dict_sys->mutex)); prebuilt->trx->op_info = (char*)""; DBUG_RETURN(0); } -/********************************************************************* +/*****************************************************************//** Checks if ALTER TABLE may change the storage engine of the table. Changing storage engines is not allowed for tables for which there -are foreign key constraints (parent or child tables). */ - +are foreign key constraints (parent or child tables). +@return TRUE if can switch engines */ +UNIV_INTERN bool ha_innobase::can_switch_engines(void) /*=================================*/ @@ -6901,18 +7686,18 @@ ha_innobase::can_switch_engines(void) DBUG_RETURN(can_switch); } -/*********************************************************************** +/*******************************************************************//** Checks if a table is referenced by a foreign key. The MySQL manual states that a REPLACE is either equivalent to an INSERT, or DELETE(s) + INSERT. Only a delete is then allowed internally to resolve a duplicate key conflict in -REPLACE, not an update. */ - +REPLACE, not an update. +@return > 0 if referenced by a FOREIGN KEY */ +UNIV_INTERN uint ha_innobase::referenced_by_foreign_key(void) /*========================================*/ - /* out: > 0 if referenced by a FOREIGN KEY */ { - if (dict_table_referenced_by_foreign_key(prebuilt->table)) { + if (dict_table_is_referenced_by_foreign_key(prebuilt->table)) { return(1); } @@ -6920,29 +7705,29 @@ ha_innobase::referenced_by_foreign_key(void) return(0); } -/*********************************************************************** +/*******************************************************************//** Frees the foreign key create info for a table stored in InnoDB, if it is non-NULL. */ - +UNIV_INTERN void ha_innobase::free_foreign_key_create_info( /*======================================*/ - char* str) /* in, own: create info string to free */ + char* str) /*!< in, own: create info string to free */ { if (str) { my_free(str, MYF(0)); } } -/*********************************************************************** -Tells something additional to the handler about how to do things. */ - +/*******************************************************************//** +Tells something additional to the handler about how to do things. +@return 0 or error number */ +UNIV_INTERN int ha_innobase::extra( /*===============*/ - /* out: 0 or error number */ enum ha_extra_function operation) - /* in: HA_EXTRA_FLUSH or some other flag */ + /*!< in: HA_EXTRA_FLUSH or some other flag */ { /* Warning: since it is not sure that MySQL calls external_lock before calling this function, the trx field in prebuilt can be @@ -6993,11 +7778,9 @@ ha_innobase::extra( return(0); } -/********************************************************************** -Reset state of file to after 'open'. -This function is called after every statement for all tables used -by that statement. */ -int ha_innobase::reset() +UNIV_INTERN +int +ha_innobase::reset() { if (prebuilt->blob_heap) { row_mysql_prebuilt_free_blob_heap(prebuilt); @@ -7014,7 +7797,7 @@ int ha_innobase::reset() return(0); } -/********************************************************************** +/******************************************************************//** MySQL calls this function at the start of each SQL statement inside LOCK TABLES. Inside LOCK TABLES the ::external_lock method does not work to mark SQL statement borders. Note also a special case: if a temporary table @@ -7024,13 +7807,13 @@ MySQL-5.0 also calls this before each statement in an execution of a stored procedure. To make the execution more deterministic for binlogging, MySQL-5.0 locks all tables involved in a stored procedure with full explicit table locks (thd_in_lock_tables(thd) holds in store_lock()) before executing the -procedure. */ - +procedure. +@return 0 or error code */ +UNIV_INTERN int ha_innobase::start_stmt( /*====================*/ - /* out: 0 or error code */ - THD* thd, /* in: handle to the user thread */ + THD* thd, /*!< in: handle to the user thread */ thr_lock_type lock_type) { trx_t* trx; @@ -7099,14 +7882,14 @@ ha_innobase::start_stmt( return(0); } -/********************************************************************** -Maps a MySQL trx isolation level code to the InnoDB isolation level code */ -inline +/******************************************************************//** +Maps a MySQL trx isolation level code to the InnoDB isolation level code +@return InnoDB isolation level */ +static inline ulint innobase_map_isolation_level( /*=========================*/ - /* out: InnoDB isolation level */ - enum_tx_isolation iso) /* in: MySQL isolation level code */ + enum_tx_isolation iso) /*!< in: MySQL isolation level code */ { switch(iso) { case ISO_REPEATABLE_READ: return(TRX_ISO_REPEATABLE_READ); @@ -7117,21 +7900,21 @@ innobase_map_isolation_level( } } -/********************************************************************** +/******************************************************************//** As MySQL will execute an external lock for every new table it uses when it starts to process an SQL statement (an exception is when MySQL calls start_stmt for the handle) we can use this function to store the pointer to the THD in the handle. We will also use this function to communicate to InnoDB that a new SQL statement has started and that we must store a savepoint to our transaction handle, so that we are able to roll back -the SQL statement in case of an error. */ - +the SQL statement in case of an error. +@return 0 */ +UNIV_INTERN int ha_innobase::external_lock( /*=======================*/ - /* out: 0 */ - THD* thd, /* in: handle to the user thread */ - int lock_type) /* in: lock type */ + THD* thd, /*!< in: handle to the user thread */ + int lock_type) /*!< in: lock type */ { trx_t* trx; @@ -7147,10 +7930,13 @@ ha_innobase::external_lock( if (lock_type == F_WRLCK) { ulong const binlog_format= thd_binlog_format(thd); - ulong const tx_isolation = thd_tx_isolation(current_thd); - if (tx_isolation <= ISO_READ_COMMITTED - && binlog_format == BINLOG_FORMAT_STMT - && thd_binlog_filter_ok(thd)) + ulong const tx_isolation = thd_tx_isolation(ha_thd()); + if (tx_isolation <= ISO_READ_COMMITTED + && binlog_format == BINLOG_FORMAT_STMT +#if MYSQL_VERSION_ID > 50140 + && thd_binlog_filter_ok(thd) +#endif /* MYSQL_VERSION_ID > 50140 */ + ) { char buf[256]; my_snprintf(buf, sizeof(buf), @@ -7234,7 +8020,7 @@ ha_innobase::external_lock( if (error != DB_SUCCESS) { error = convert_error_code_to_mysql( - (int) error, thd); + (int) error, 0, thd); DBUG_RETURN((int) error); } } @@ -7286,16 +8072,16 @@ ha_innobase::external_lock( DBUG_RETURN(0); } -/********************************************************************** +/******************************************************************//** With this function MySQL request a transactional lock to a table when -user issued query LOCK TABLES..WHERE ENGINE = InnoDB. */ - +user issued query LOCK TABLES..WHERE ENGINE = InnoDB. +@return error code */ +UNIV_INTERN int ha_innobase::transactional_table_lock( /*==================================*/ - /* out: error code */ - THD* thd, /* in: handle to the user thread */ - int lock_type) /* in: lock type */ + THD* thd, /*!< in: handle to the user thread */ + int lock_type) /*!< in: lock type */ { trx_t* trx; @@ -7317,8 +8103,8 @@ ha_innobase::transactional_table_lock( "InnoDB: Have you deleted the .ibd file" " from the database directory under\n" "InnoDB: the MySQL datadir?" - "InnoDB: See" - " http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html\n" + "InnoDB: See " REFMAN + "innodb-troubleshooting.html\n" "InnoDB: how you can resolve the problem.\n", prebuilt->table->name); DBUG_RETURN(HA_ERR_CRASHED); @@ -7361,7 +8147,8 @@ ha_innobase::transactional_table_lock( error = row_lock_table_for_mysql(prebuilt, NULL, 0); if (error != DB_SUCCESS) { - error = convert_error_code_to_mysql((int) error, thd); + error = convert_error_code_to_mysql( + (int) error, prebuilt->table->flags, thd); DBUG_RETURN((int) error); } @@ -7378,29 +8165,27 @@ ha_innobase::transactional_table_lock( DBUG_RETURN(0); } -/**************************************************************************** -Here we export InnoDB status variables to MySQL. */ +/************************************************************************//** +Here we export InnoDB status variables to MySQL. */ static -int -innodb_export_status() -/*==================*/ +void +innodb_export_status(void) +/*======================*/ { if (innodb_inited) { srv_export_innodb_status(); } - - return 0; } -/**************************************************************************** +/************************************************************************//** Implements the SHOW INNODB STATUS command. Sends the output of the InnoDB Monitor to the client. */ static bool innodb_show_status( /*===============*/ - handlerton* hton, /* in: the innodb handlerton */ - THD* thd, /* in: the MySQL query thread of the caller */ + handlerton* hton, /*!< in: the innodb handlerton */ + THD* thd, /*!< in: the MySQL query thread of the caller */ stat_print_fn *stat_print) { trx_t* trx; @@ -7410,6 +8195,7 @@ innodb_show_status( ulint trx_list_end = ULINT_UNDEFINED; DBUG_ENTER("innodb_show_status"); + DBUG_ASSERT(hton == innodb_hton_ptr); trx = check_trx_exists(thd); @@ -7421,10 +8207,10 @@ innodb_show_status( long flen, usable_len; char* str; - mutex_enter_noninline(&srv_monitor_file_mutex); + mutex_enter(&srv_monitor_file_mutex); rewind(srv_monitor_file); - srv_printf_innodb_monitor(srv_monitor_file, FALSE, - &trx_list_start, &trx_list_end); + srv_printf_innodb_monitor(srv_monitor_file, + &trx_list_start, &trx_list_end); flen = ftell(srv_monitor_file); os_file_set_eof(srv_monitor_file); @@ -7442,7 +8228,7 @@ innodb_show_status( read the contents of the temporary file */ if (!(str = (char*) my_malloc(usable_len + 1, MYF(0)))) { - mutex_exit_noninline(&srv_monitor_file_mutex); + mutex_exit(&srv_monitor_file_mutex); DBUG_RETURN(TRUE); } @@ -7467,7 +8253,7 @@ innodb_show_status( flen = (long) fread(str, 1, MAX_STATUS_SIZE - 1, srv_monitor_file); } - mutex_exit_noninline(&srv_monitor_file_mutex); + mutex_exit(&srv_monitor_file_mutex); bool result = FALSE; @@ -7480,19 +8266,20 @@ innodb_show_status( DBUG_RETURN(FALSE); } -/**************************************************************************** +/************************************************************************//** Implements the SHOW MUTEX STATUS command. . */ static bool innodb_mutex_show_status( /*=====================*/ - handlerton* hton, /* in: the innodb handlerton */ - THD* thd, /* in: the MySQL query thread of the + handlerton* hton, /*!< in: the innodb handlerton */ + THD* thd, /*!< in: the MySQL query thread of the caller */ stat_print_fn* stat_print) { char buf1[IO_SIZE], buf2[IO_SIZE]; - mutex_t* mutex; + mutex_t* mutex; + rw_lock_t* lock; #ifdef UNIV_DEBUG ulint rw_lock_count= 0; ulint rw_lock_count_spin_loop= 0; @@ -7503,12 +8290,17 @@ innodb_mutex_show_status( #endif /* UNIV_DEBUG */ uint hton_name_len= (uint) strlen(innobase_hton_name), buf1len, buf2len; DBUG_ENTER("innodb_mutex_show_status"); + DBUG_ASSERT(hton == innodb_hton_ptr); - mutex_enter_noninline(&mutex_list_mutex); + mutex_enter(&mutex_list_mutex); mutex = UT_LIST_GET_FIRST(mutex_list); while (mutex != NULL) { + if (mutex->count_os_wait == 0 + || buf_pool_is_block_mutex(mutex)) { + goto next_mutex; + } #ifdef UNIV_DEBUG if (mutex->mutex_type != 1) { if (mutex->count_using > 0) { @@ -7530,8 +8322,7 @@ innodb_mutex_show_status( if (stat_print(thd, innobase_hton_name, hton_name_len, buf1, buf1len, buf2, buf2len)) { - mutex_exit_noninline( - &mutex_list_mutex); + mutex_exit(&mutex_list_mutex); DBUG_RETURN(1); } } @@ -7553,15 +8344,40 @@ innodb_mutex_show_status( if (stat_print(thd, innobase_hton_name, hton_name_len, buf1, buf1len, buf2, buf2len)) { - mutex_exit_noninline(&mutex_list_mutex); + mutex_exit(&mutex_list_mutex); DBUG_RETURN(1); } #endif /* UNIV_DEBUG */ +next_mutex: mutex = UT_LIST_GET_NEXT(list, mutex); } - mutex_exit_noninline(&mutex_list_mutex); + mutex_exit(&mutex_list_mutex); + + mutex_enter(&rw_lock_list_mutex); + + lock = UT_LIST_GET_FIRST(rw_lock_list); + + while (lock != NULL) { + if (lock->count_os_wait + && !buf_pool_is_block_lock(lock)) { + buf1len= my_snprintf(buf1, sizeof(buf1), "%s:%lu", + lock->cfile_name, (ulong) lock->cline); + buf2len= my_snprintf(buf2, sizeof(buf2), + "os_waits=%lu", lock->count_os_wait); + + if (stat_print(thd, innobase_hton_name, + hton_name_len, buf1, buf1len, + buf2, buf2len)) { + mutex_exit(&rw_lock_list_mutex); + DBUG_RETURN(1); + } + } + lock = UT_LIST_GET_NEXT(list, lock); + } + + mutex_exit(&rw_lock_list_mutex); #ifdef UNIV_DEBUG buf2len= my_snprintf(buf2, sizeof(buf2), @@ -7586,100 +8402,111 @@ bool innobase_show_status(handlerton *hton, THD* thd, stat_print_fn* stat_print, enum ha_stat_type stat_type) { + DBUG_ASSERT(hton == innodb_hton_ptr); + switch (stat_type) { case HA_ENGINE_STATUS: return innodb_show_status(hton, thd, stat_print); case HA_ENGINE_MUTEX: return innodb_mutex_show_status(hton, thd, stat_print); default: - return FALSE; + return(FALSE); } } - -/**************************************************************************** +/************************************************************************//** Handling the shared INNOBASE_SHARE structure that is needed to provide table locking. ****************************************************************************/ -static uchar* innobase_get_key(INNOBASE_SHARE* share, size_t *length, - my_bool not_used __attribute__((unused))) -{ - *length=share->table_name_length; - - return (uchar*) share->table_name; -} - static INNOBASE_SHARE* get_share(const char* table_name) { INNOBASE_SHARE *share; pthread_mutex_lock(&innobase_share_mutex); - uint length=(uint) strlen(table_name); - if (!(share=(INNOBASE_SHARE*) hash_search(&innobase_open_tables, - (uchar*) table_name, - length))) { + ulint fold = ut_fold_string(table_name); + + HASH_SEARCH(table_name_hash, innobase_open_tables, fold, + INNOBASE_SHARE*, share, + ut_ad(share->use_count > 0), + !strcmp(share->table_name, table_name)); + + if (!share) { + + uint length = (uint) strlen(table_name); + + /* TODO: invoke HASH_MIGRATE if innobase_open_tables + grows too big */ share = (INNOBASE_SHARE *) my_malloc(sizeof(*share)+length+1, MYF(MY_FAE | MY_ZEROFILL)); - share->table_name_length=length; - share->table_name=(char*) (share+1); - strmov(share->table_name,table_name); - - if (my_hash_insert(&innobase_open_tables, - (uchar*) share)) { - pthread_mutex_unlock(&innobase_share_mutex); - my_free(share,0); + share->table_name = (char*) memcpy(share + 1, + table_name, length + 1); - return 0; - } + HASH_INSERT(INNOBASE_SHARE, table_name_hash, + innobase_open_tables, fold, share); thr_lock_init(&share->lock); - pthread_mutex_init(&share->mutex,MY_MUTEX_INIT_FAST); } share->use_count++; pthread_mutex_unlock(&innobase_share_mutex); - return share; + return(share); } static void free_share(INNOBASE_SHARE* share) { pthread_mutex_lock(&innobase_share_mutex); +#ifdef UNIV_DEBUG + INNOBASE_SHARE* share2; + ulint fold = ut_fold_string(share->table_name); + + HASH_SEARCH(table_name_hash, innobase_open_tables, fold, + INNOBASE_SHARE*, share2, + ut_ad(share->use_count > 0), + !strcmp(share->table_name, share2->table_name)); + + ut_a(share2 == share); +#endif /* UNIV_DEBUG */ + if (!--share->use_count) { - hash_delete(&innobase_open_tables, (uchar*) share); + ulint fold = ut_fold_string(share->table_name); + + HASH_DELETE(INNOBASE_SHARE, table_name_hash, + innobase_open_tables, fold, share); thr_lock_delete(&share->lock); - pthread_mutex_destroy(&share->mutex); my_free(share, MYF(0)); + + /* TODO: invoke HASH_MIGRATE if innobase_open_tables + shrinks too much */ } pthread_mutex_unlock(&innobase_share_mutex); } -/********************************************************************* +/*****************************************************************//** Converts a MySQL table lock stored in the 'lock' field of the handle to a proper type before storing pointer to the lock into an array of pointers. MySQL also calls this if it wants to reset some table locks to a not-locked state during the processing of an SQL query. An example is that during a SELECT the read lock is released early on the 'const' tables where we only fetch one row. MySQL does not call this when it releases all locks at the -end of an SQL statement. */ - +end of an SQL statement. +@return pointer to the next element in the 'to' array */ +UNIV_INTERN THR_LOCK_DATA** ha_innobase::store_lock( /*====================*/ - /* out: pointer to the next - element in the 'to' array */ - THD* thd, /* in: user thread handle */ - THR_LOCK_DATA** to, /* in: pointer to an array + THD* thd, /*!< in: user thread handle */ + THR_LOCK_DATA** to, /*!< in: pointer to an array of pointers to lock structs; pointer to the 'lock' field of current handle is stored next to this array */ - enum thr_lock_type lock_type) /* in: lock type to store in + enum thr_lock_type lock_type) /*!< in: lock type to store in 'lock'; this may also be TL_IGNORE */ { @@ -7713,7 +8540,7 @@ ha_innobase::store_lock( } } - DBUG_ASSERT(thd == current_thd); + DBUG_ASSERT(EQ_CURRENT_THD(thd)); const bool in_lock_tables = thd_in_lock_tables(thd); const uint sql_command = thd_sql_command(thd); @@ -7757,6 +8584,7 @@ ha_innobase::store_lock( && isolation_level != TRX_ISO_SERIALIZABLE && (lock_type == TL_READ || lock_type == TL_READ_NO_INSERT) && (sql_command == SQLCOM_INSERT_SELECT + || sql_command == SQLCOM_REPLACE_SELECT || sql_command == SQLCOM_UPDATE || sql_command == SQLCOM_CREATE_TABLE)) { @@ -7764,10 +8592,11 @@ ha_innobase::store_lock( option set or this session is using READ COMMITTED isolation level and isolation level of the transaction is not set to serializable and MySQL is doing - INSERT INTO...SELECT or UPDATE ... = (SELECT ...) or - CREATE ... SELECT... without FOR UPDATE or - IN SHARE MODE in select, then we use consistent - read for select. */ + INSERT INTO...SELECT or REPLACE INTO...SELECT + or UPDATE ... = (SELECT ...) or CREATE ... + SELECT... without FOR UPDATE or IN SHARE + MODE in select, then we use consistent read + for select. */ prebuilt->select_lock_type = LOCK_NONE; prebuilt->stored_select_lock_type = LOCK_NONE; @@ -7862,16 +8691,16 @@ ha_innobase::store_lock( return(to); } -/******************************************************************************* +/*********************************************************************//** Read the next autoinc value. Acquire the relevant locks before reading the AUTOINC value. If SUCCESS then the table AUTOINC mutex will be locked -on return and all relevant locks acquired. */ - -ulong +on return and all relevant locks acquired. +@return DB_SUCCESS or error code */ +UNIV_INTERN +ulint ha_innobase::innobase_get_autoinc( /*==============================*/ - /* out: DB_SUCCESS or error code */ - ulonglong* value) /* out: autoinc value */ + ulonglong* value) /*!< out: autoinc value */ { *value = 0; @@ -7885,18 +8714,18 @@ ha_innobase::innobase_get_autoinc( /* It should have been initialized during open. */ ut_a(*value != 0); } - - return(ulong(prebuilt->autoinc_error)); + + return(prebuilt->autoinc_error); } -/*********************************************************************** +/*******************************************************************//** This function reads the global auto-inc counter. It doesn't use the -AUTOINC lock even if the lock mode is set to TRADITIONAL. */ - +AUTOINC lock even if the lock mode is set to TRADITIONAL. +@return the autoinc value */ +UNIV_INTERN ulonglong -ha_innobase::innobase_peek_autoinc() -/*================================*/ - /* out: the autoinc value */ +ha_innobase::innobase_peek_autoinc(void) +/*====================================*/ { ulonglong auto_inc; dict_table_t* innodb_table; @@ -7913,26 +8742,26 @@ ha_innobase::innobase_peek_autoinc() ut_a(auto_inc > 0); dict_table_autoinc_unlock(innodb_table); - + return(auto_inc); } -/******************************************************************************* +/*********************************************************************//** This function initializes the auto-inc counter if it has not been initialized yet. This function does not change the value of the auto-inc counter if it already has been initialized. Returns the value of the auto-inc counter in *first_value, and ULONGLONG_MAX in *nb_reserved_values (as we have a table-level lock). offset, increment, nb_desired_values are ignored. -*first_value is set to -1 if error (deadlock or lock wait timeout) */ - +*first_value is set to -1 if error (deadlock or lock wait timeout) */ +UNIV_INTERN void ha_innobase::get_auto_increment( /*============================*/ - ulonglong offset, /* in: */ - ulonglong increment, /* in: table autoinc increment */ - ulonglong nb_desired_values, /* in: number of values reqd */ - ulonglong *first_value, /* out: the autoinc value */ - ulonglong *nb_reserved_values) /* out: count of reserved values */ + ulonglong offset, /*!< in: table autoinc offset */ + ulonglong increment, /*!< in: table autoinc increment */ + ulonglong nb_desired_values, /*!< in: number of values reqd */ + ulonglong *first_value, /*!< out: the autoinc value */ + ulonglong *nb_reserved_values) /*!< out: count of reserved values */ { trx_t* trx; ulint error; @@ -8028,11 +8857,17 @@ ha_innobase::get_auto_increment( dict_table_autoinc_unlock(prebuilt->table); } -/* See comment in handler.h */ +/*******************************************************************//** +Reset the auto-increment counter to the given value, i.e. the next row +inserted will get the given value. This is called e.g. after TRUNCATE +is emulated by doing a 'DELETE FROM t'. HA_ERR_WRONG_COMMAND is +returned by storage engines that don't support this operation. +@return 0 or error code */ +UNIV_INTERN int ha_innobase::reset_auto_increment( /*==============================*/ - ulonglong value) /* in: new value for table autoinc */ + ulonglong value) /*!< in: new value for table autoinc */ { DBUG_ENTER("ha_innobase::reset_auto_increment"); @@ -8043,7 +8878,9 @@ ha_innobase::reset_auto_increment( error = row_lock_table_autoinc_for_mysql(prebuilt); if (error != DB_SUCCESS) { - error = convert_error_code_to_mysql(error, user_thd); + error = convert_error_code_to_mysql(error, + prebuilt->table->flags, + user_thd); DBUG_RETURN(error); } @@ -8059,6 +8896,7 @@ ha_innobase::reset_auto_increment( } /* See comment in handler.cc */ +UNIV_INTERN bool ha_innobase::get_error_message(int error, String *buf) { @@ -8067,22 +8905,21 @@ ha_innobase::get_error_message(int error, String *buf) buf->copy(trx->detailed_error, (uint) strlen(trx->detailed_error), system_charset_info); - return FALSE; + return(FALSE); } -/*********************************************************************** +/*******************************************************************//** Compares two 'refs'. A 'ref' is the (internal) primary key value of the row. If there is no explicitly declared non-null unique key or a primary key, then -InnoDB internally uses the row id as the primary key. */ - +InnoDB internally uses the row id as the primary key. +@return < 0 if ref1 < ref2, 0 if equal, else > 0 */ +UNIV_INTERN int ha_innobase::cmp_ref( /*=================*/ - /* out: < 0 if ref1 < ref2, 0 if equal, else - > 0 */ - const uchar* ref1, /* in: an (internal) primary key value in the + const uchar* ref1, /*!< in: an (internal) primary key value in the MySQL key value format */ - const uchar* ref2) /* in: an (internal) primary key value in the + const uchar* ref2) /*!< in: an (internal) primary key value in the MySQL key value format */ { enum_field_types mysql_type; @@ -8142,25 +8979,24 @@ ha_innobase::cmp_ref( return(0); } -/*********************************************************************** -Ask InnoDB if a query to a table can be cached. */ - +/*******************************************************************//** +Ask InnoDB if a query to a table can be cached. +@return TRUE if query caching of the table is permitted */ +UNIV_INTERN my_bool ha_innobase::register_query_cache_table( /*====================================*/ - /* out: TRUE if query caching - of the table is permitted */ - THD* thd, /* in: user thread handle */ - char* table_key, /* in: concatenation of database name, - the null character '\0', + THD* thd, /*!< in: user thread handle */ + char* table_key, /*!< in: concatenation of database name, + the null character NUL, and the table name */ - uint key_length, /* in: length of the full name, i.e. + uint key_length, /*!< in: length of the full name, i.e. len(dbname) + len(tablename) + 1 */ qc_engine_callback* - call_back, /* out: pointer to function for + call_back, /*!< out: pointer to function for checking if query caching is permitted */ - ulonglong *engine_data) /* in/out: data to call_back */ + ulonglong *engine_data) /*!< in/out: data to call_back */ { *call_back = innobase_query_caching_of_table_permitted; *engine_data = 0; @@ -8169,45 +9005,43 @@ ha_innobase::register_query_cache_table( engine_data)); } +UNIV_INTERN char* ha_innobase::get_mysql_bin_log_name() { return(trx_sys_mysql_bin_log_name); } +UNIV_INTERN ulonglong ha_innobase::get_mysql_bin_log_pos() { - /* trx... is ib_longlong, which is a typedef for a 64-bit integer + /* trx... is ib_int64_t, which is a typedef for a 64-bit integer (__int64 or longlong) so it's ok to cast it to ulonglong. */ return(trx_sys_mysql_bin_log_pos); } -/********************************************************************** +/******************************************************************//** This function is used to find the storage length in bytes of the first n characters for prefix indexes using a multibyte character set. The function finds charset information and returns length of prefix_len characters in the index field in bytes. - -NOTE: the prototype of this function is copied to data0type.c! If you change -this function, you MUST change also data0type.c! */ -extern "C" +@return number of bytes occupied by the first n characters */ +extern "C" UNIV_INTERN ulint innobase_get_at_most_n_mbchars( /*===========================*/ - /* out: number of bytes occupied by the first - n characters */ - ulint charset_id, /* in: character set id */ - ulint prefix_len, /* in: prefix length in bytes of the index + ulint charset_id, /*!< in: character set id */ + ulint prefix_len, /*!< in: prefix length in bytes of the index (this has to be divided by mbmaxlen to get the number of CHARACTERS n in the prefix) */ - ulint data_len, /* in: length of the string in bytes */ - const char* str) /* in: character string */ + ulint data_len, /*!< in: length of the string in bytes */ + const char* str) /*!< in: character string */ { - ulint char_length; /* character length in bytes */ - ulint n_chars; /* number of characters in prefix */ - CHARSET_INFO* charset; /* charset used in the field */ + ulint char_length; /*!< character length in bytes */ + ulint n_chars; /*!< number of characters in prefix */ + CHARSET_INFO* charset; /*!< charset used in the field */ charset = get_charset((uint) charset_id, MYF(MY_WME)); @@ -8258,49 +9092,30 @@ innobase_get_at_most_n_mbchars( return(char_length); } -/*********************************************************************** -This function is used to prepare X/Open XA distributed transaction */ +/*******************************************************************//** +This function is used to prepare an X/Open XA distributed transaction. +@return 0 or error number */ static int innobase_xa_prepare( /*================*/ - /* out: 0 or error number */ - handlerton *hton, - THD* thd, /* in: handle to the MySQL thread of the user - whose XA transaction should be prepared */ - bool all) /* in: TRUE - commit transaction - FALSE - the current SQL statement ended */ + handlerton* hton, /*!< in: InnoDB handlerton */ + THD* thd, /*!< in: handle to the MySQL thread of + the user whose XA transaction should + be prepared */ + bool all) /*!< in: TRUE - commit transaction + FALSE - the current SQL statement + ended */ { int error = 0; trx_t* trx = check_trx_exists(thd); - if (thd_sql_command(thd) != SQLCOM_XA_PREPARE && - (all || !thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) - { - - /* For ibbackup to work the order of transactions in binlog - and InnoDB must be the same. Consider the situation - - thread1> prepare; write to binlog; ... - <context switch> - thread2> prepare; write to binlog; commit - thread1> ... commit - - To ensure this will not happen we're taking the mutex on - prepare, and releasing it on commit. - - Note: only do it for normal commits, done via ha_commit_trans. - If 2pc protocol is executed by external transaction - coordinator, it will be just a regular MySQL client - executing XA PREPARE and XA COMMIT commands. - In this case we cannot know how many minutes or hours - will be between XA PREPARE and XA COMMIT, and we don't want - to block for undefined period of time. */ - pthread_mutex_lock(&prepare_commit_mutex); - trx->active_trans = 2; - } + DBUG_ASSERT(hton == innodb_hton_ptr); - if (!THDVAR(thd, support_xa)) { + /* we use support_xa value as it was seen at transaction start + time, not the current session variable value. Any possible changes + to the session variable take effect only in the next transaction */ + if (!trx->support_xa) { return(0); } @@ -8349,21 +9164,48 @@ innobase_xa_prepare( srv_active_wake_master_thread(); - return error; + if (thd_sql_command(thd) != SQLCOM_XA_PREPARE && + (all || !thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) + { + + /* For ibbackup to work the order of transactions in binlog + and InnoDB must be the same. Consider the situation + + thread1> prepare; write to binlog; ... + <context switch> + thread2> prepare; write to binlog; commit + thread1> ... commit + + To ensure this will not happen we're taking the mutex on + prepare, and releasing it on commit. + + Note: only do it for normal commits, done via ha_commit_trans. + If 2pc protocol is executed by external transaction + coordinator, it will be just a regular MySQL client + executing XA PREPARE and XA COMMIT commands. + In this case we cannot know how many minutes or hours + will be between XA PREPARE and XA COMMIT, and we don't want + to block for undefined period of time. */ + pthread_mutex_lock(&prepare_commit_mutex); + trx->active_trans = 2; + } + + return(error); } -/*********************************************************************** -This function is used to recover X/Open XA distributed transactions */ +/*******************************************************************//** +This function is used to recover X/Open XA distributed transactions. +@return number of prepared transactions stored in xid_list */ static int innobase_xa_recover( /*================*/ - /* out: number of prepared transactions - stored in xid_list */ - handlerton *hton, - XID* xid_list, /* in/out: prepared transactions */ - uint len) /* in: number of slots in xid_list */ + handlerton* hton, /*!< in: InnoDB handlerton */ + XID* xid_list,/*!< in/out: prepared transactions */ + uint len) /*!< in: number of slots in xid_list */ { + DBUG_ASSERT(hton == innodb_hton_ptr); + if (len == 0 || xid_list == NULL) { return(0); @@ -8372,19 +9214,21 @@ innobase_xa_recover( return(trx_recover_for_mysql(xid_list, len)); } -/*********************************************************************** +/*******************************************************************//** This function is used to commit one X/Open XA distributed transaction -which is in the prepared state */ +which is in the prepared state +@return 0 or error number */ static int innobase_commit_by_xid( /*===================*/ - /* out: 0 or error number */ handlerton *hton, - XID* xid) /* in: X/Open XA transaction identification */ + XID* xid) /*!< in: X/Open XA transaction identification */ { trx_t* trx; + DBUG_ASSERT(hton == innodb_hton_ptr); + trx = trx_get_trx_by_xid(xid); if (trx) { @@ -8396,19 +9240,22 @@ innobase_commit_by_xid( } } -/*********************************************************************** +/*******************************************************************//** This function is used to rollback one X/Open XA distributed transaction -which is in the prepared state */ +which is in the prepared state +@return 0 or error number */ static int innobase_rollback_by_xid( /*=====================*/ - /* out: 0 or error number */ - handlerton *hton, - XID *xid) /* in: X/Open XA transaction identification */ + handlerton* hton, /*!< in: InnoDB handlerton */ + XID* xid) /*!< in: X/Open XA transaction + identification */ { trx_t* trx; + DBUG_ASSERT(hton == innodb_hton_ptr); + trx = trx_get_trx_by_xid(xid); if (trx) { @@ -8418,23 +9265,25 @@ innobase_rollback_by_xid( } } -/*********************************************************************** +/*******************************************************************//** Create a consistent view for a cursor based on current transaction which is created if the corresponding MySQL thread still lacks one. This consistent view is then used inside of MySQL when accessing records -using a cursor. */ +using a cursor. +@return pointer to cursor view or NULL */ static void* innobase_create_cursor_view( /*========================*/ - /* out: pointer to cursor view or NULL */ - handlerton *hton, /* in: innobase hton */ - THD* thd) /* in: user thread handle */ + handlerton *hton, /*!< in: innobase hton */ + THD* thd) /*!< in: user thread handle */ { + DBUG_ASSERT(hton == innodb_hton_ptr); + return(read_cursor_view_create_for_mysql(check_trx_exists(thd))); } -/*********************************************************************** +/*******************************************************************//** Close the given consistent cursor view of a transaction and restore global read view to a transaction read view. Transaction is created if the corresponding MySQL thread still lacks one. */ @@ -8443,14 +9292,16 @@ void innobase_close_cursor_view( /*=======================*/ handlerton *hton, - THD* thd, /* in: user thread handle */ - void* curview)/* in: Consistent read view to be closed */ + THD* thd, /*!< in: user thread handle */ + void* curview)/*!< in: Consistent read view to be closed */ { + DBUG_ASSERT(hton == innodb_hton_ptr); + read_cursor_view_close_for_mysql(check_trx_exists(thd), (cursor_view_t*) curview); } -/*********************************************************************** +/*******************************************************************//** Set the given consistent cursor view to a transaction which is created if the corresponding MySQL thread still lacks one. If the given consistent cursor view is NULL global read view of a transaction is @@ -8460,9 +9311,11 @@ void innobase_set_cursor_view( /*=====================*/ handlerton *hton, - THD* thd, /* in: user thread handle */ - void* curview)/* in: Consistent cursor view to be set */ + THD* thd, /*!< in: user thread handle */ + void* curview)/*!< in: Consistent cursor view to be set */ { + DBUG_ASSERT(hton == innodb_hton_ptr); + read_cursor_set_for_mysql(check_trx_exists(thd), (cursor_view_t*) curview); } @@ -8559,20 +9412,22 @@ foreign_key_column_is_being_renamed( return(false); } -bool ha_innobase::check_if_incompatible_data( +UNIV_INTERN +bool +ha_innobase::check_if_incompatible_data( HA_CREATE_INFO* info, uint table_changes) { if (table_changes != IS_EQUAL_YES) { - return COMPATIBLE_DATA_NO; + return(COMPATIBLE_DATA_NO); } /* Check that auto_increment value was not changed */ if ((info->used_fields & HA_CREATE_USED_AUTO) && info->auto_increment_value != 0) { - return COMPATIBLE_DATA_NO; + return(COMPATIBLE_DATA_NO); } /* Check if a column participating in a foreign key is being renamed. @@ -8583,13 +9438,418 @@ bool ha_innobase::check_if_incompatible_data( } /* Check that row format didn't change */ - if ((info->used_fields & HA_CREATE_USED_ROW_FORMAT) && - get_row_type() != info->row_type) { + if ((info->used_fields & HA_CREATE_USED_ROW_FORMAT) + && info->row_type != ROW_TYPE_DEFAULT + && info->row_type != get_row_type()) { - return COMPATIBLE_DATA_NO; + return(COMPATIBLE_DATA_NO); + } + + /* Specifying KEY_BLOCK_SIZE requests a rebuild of the table. */ + if (info->used_fields & HA_CREATE_USED_KEY_BLOCK_SIZE) { + return(COMPATIBLE_DATA_NO); + } + + return(COMPATIBLE_DATA_YES); +} + +/************************************************************//** +Validate the file format name and return its corresponding id. +@return valid file format id */ +static +uint +innobase_file_format_name_lookup( +/*=============================*/ + const char* format_name) /*!< in: pointer to file format name */ +{ + char* endp; + uint format_id; + + ut_a(format_name != NULL); + + /* The format name can contain the format id itself instead of + the name and we check for that. */ + format_id = (uint) strtoul(format_name, &endp, 10); + + /* Check for valid parse. */ + if (*endp == '\0' && *format_name != '\0') { + + if (format_id <= DICT_TF_FORMAT_MAX) { + + return(format_id); + } + } else { + + for (format_id = 0; format_id <= DICT_TF_FORMAT_MAX; + format_id++) { + const char* name; + + name = trx_sys_file_format_id_to_name(format_id); + + if (!innobase_strcasecmp(format_name, name)) { + + return(format_id); + } + } + } + + return(DICT_TF_FORMAT_MAX + 1); +} + +/************************************************************//** +Validate the file format check value, is it one of "on" or "off", +as a side effect it sets the srv_check_file_format_at_startup variable. +@return true if config value one of "on" or "off" */ +static +bool +innobase_file_format_check_on_off( +/*==============================*/ + const char* format_check) /*!< in: parameter value */ +{ + bool ret = true; + + if (!innobase_strcasecmp(format_check, "off")) { + + /* Set the value to disable checking. */ + srv_check_file_format_at_startup = DICT_TF_FORMAT_MAX + 1; + + } else if (!innobase_strcasecmp(format_check, "on")) { + + /* Set the value to the lowest supported format. */ + srv_check_file_format_at_startup = DICT_TF_FORMAT_51; + } else { + ret = FALSE; + } + + return(ret); +} + +/************************************************************//** +Validate the file format check config parameters, as a side effect it +sets the srv_check_file_format_at_startup variable. +@return the format_id if valid config value, otherwise, return -1 */ +static +int +innobase_file_format_validate_and_set( +/*================================*/ + const char* format_check) /*!< in: parameter value */ +{ + uint format_id; + + format_id = innobase_file_format_name_lookup(format_check); + + if (format_id < DICT_TF_FORMAT_MAX + 1) { + srv_check_file_format_at_startup = format_id; + + return((int) format_id); + } else { + return(-1); + } +} + +/*************************************************************//** +Check if it is a valid file format. This function is registered as +a callback with MySQL. +@return 0 for valid file format */ +static +int +innodb_file_format_name_validate( +/*=============================*/ + THD* thd, /*!< in: thread handle */ + struct st_mysql_sys_var* var, /*!< in: pointer to system + variable */ + void* save, /*!< out: immediate result + for update function */ + struct st_mysql_value* value) /*!< in: incoming string */ +{ + const char* file_format_input; + char buff[STRING_BUFFER_USUAL_SIZE]; + int len = sizeof(buff); + + ut_a(save != NULL); + ut_a(value != NULL); + + file_format_input = value->val_str(value, buff, &len); + + if (file_format_input != NULL) { + uint format_id; + + format_id = innobase_file_format_name_lookup( + file_format_input); + + if (format_id <= DICT_TF_FORMAT_MAX) { + + /* Save a pointer to the name in the + 'file_format_name_map' constant array. */ + *static_cast<const char**>(save) = + trx_sys_file_format_id_to_name(format_id); + + return(0); + } + } + + *static_cast<const char**>(save) = NULL; + return(1); +} + +/****************************************************************//** +Update the system variable innodb_file_format using the "saved" +value. This function is registered as a callback with MySQL. */ +static +void +innodb_file_format_name_update( +/*===========================*/ + THD* thd, /*!< in: thread handle */ + struct st_mysql_sys_var* var, /*!< in: pointer to + system variable */ + void* var_ptr, /*!< out: where the + formal string goes */ + const void* save) /*!< in: immediate result + from check function */ +{ + const char* format_name; + + ut_a(var_ptr != NULL); + ut_a(save != NULL); + + format_name = *static_cast<const char*const*>(save); + + if (format_name) { + uint format_id; + + format_id = innobase_file_format_name_lookup(format_name); + + if (format_id <= DICT_TF_FORMAT_MAX) { + srv_file_format = format_id; + } + } + + *static_cast<const char**>(var_ptr) + = trx_sys_file_format_id_to_name(srv_file_format); +} + +/*************************************************************//** +Check if valid argument to innodb_file_format_check. This +function is registered as a callback with MySQL. +@return 0 for valid file format */ +static +int +innodb_file_format_check_validate( +/*==============================*/ + THD* thd, /*!< in: thread handle */ + struct st_mysql_sys_var* var, /*!< in: pointer to system + variable */ + void* save, /*!< out: immediate result + for update function */ + struct st_mysql_value* value) /*!< in: incoming string */ +{ + const char* file_format_input; + char buff[STRING_BUFFER_USUAL_SIZE]; + int len = sizeof(buff); + int format_id; + + ut_a(save != NULL); + ut_a(value != NULL); + + file_format_input = value->val_str(value, buff, &len); + + if (file_format_input != NULL) { + + /* Check if user set on/off, we want to print a suitable + message if they did so. */ + + if (innobase_file_format_check_on_off(file_format_input)) { + push_warning_printf(thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_WRONG_ARGUMENTS, + "InnoDB: invalid innodb_file_format_check " + "value; on/off can only be set at startup or " + "in the configuration file"); + } else { + format_id = innobase_file_format_validate_and_set( + file_format_input); + + if (format_id >= 0) { + /* Save a pointer to the name in the + 'file_format_name_map' constant array. */ + *static_cast<const char**>(save) = + trx_sys_file_format_id_to_name( + (uint)format_id); + + return(0); + + } else { + push_warning_printf(thd, + MYSQL_ERROR::WARN_LEVEL_WARN, + ER_WRONG_ARGUMENTS, + "InnoDB: invalid innodb_file_format_check " + "value; can be any format up to %s " + "or its equivalent numeric id", + trx_sys_file_format_id_to_name( + DICT_TF_FORMAT_MAX)); + } + } } - return COMPATIBLE_DATA_YES; + *static_cast<const char**>(save) = NULL; + return(1); +} + +/****************************************************************//** +Update the system variable innodb_file_format_check using the "saved" +value. This function is registered as a callback with MySQL. */ +static +void +innodb_file_format_check_update( +/*============================*/ + THD* thd, /*!< in: thread handle */ + struct st_mysql_sys_var* var, /*!< in: pointer to + system variable */ + void* var_ptr, /*!< out: where the + formal string goes */ + const void* save) /*!< in: immediate result + from check function */ +{ + const char* format_name_in; + const char** format_name_out; + uint format_id; + + ut_a(save != NULL); + ut_a(var_ptr != NULL); + + format_name_in = *static_cast<const char*const*>(save); + + if (!format_name_in) { + + return; + } + + format_id = innobase_file_format_name_lookup(format_name_in); + + if (format_id > DICT_TF_FORMAT_MAX) { + /* DEFAULT is "on", which is invalid at runtime. */ + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_WRONG_ARGUMENTS, + "Ignoring SET innodb_file_format=%s", + format_name_in); + return; + } + + format_name_out = static_cast<const char**>(var_ptr); + + /* Update the max format id in the system tablespace. */ + if (trx_sys_file_format_max_set(format_id, format_name_out)) { + ut_print_timestamp(stderr); + fprintf(stderr, + " [Info] InnoDB: the file format in the system " + "tablespace is now set to %s.\n", *format_name_out); + } +} + +/****************************************************************//** +Update the system variable innodb_adaptive_hash_index using the "saved" +value. This function is registered as a callback with MySQL. */ +static +void +innodb_adaptive_hash_index_update( +/*==============================*/ + THD* thd, /*!< in: thread handle */ + struct st_mysql_sys_var* var, /*!< in: pointer to + system variable */ + void* var_ptr, /*!< out: where the + formal string goes */ + const void* save) /*!< in: immediate result + from check function */ +{ + if (*(my_bool*) save) { + btr_search_enable(); + } else { + btr_search_disable(); + } +} + +/****************************************************************//** +Update the system variable innodb_old_blocks_pct using the "saved" +value. This function is registered as a callback with MySQL. */ +static +void +innodb_old_blocks_pct_update( +/*=========================*/ + THD* thd, /*!< in: thread handle */ + struct st_mysql_sys_var* var, /*!< in: pointer to + system variable */ + void* var_ptr,/*!< out: where the + formal string goes */ + const void* save) /*!< in: immediate result + from check function */ +{ + innobase_old_blocks_pct = buf_LRU_old_ratio_update( + *static_cast<const uint*>(save), TRUE); +} + +/*************************************************************//** +Check if it is a valid value of innodb_change_buffering. This function is +registered as a callback with MySQL. +@return 0 for valid innodb_change_buffering */ +static +int +innodb_change_buffering_validate( +/*=============================*/ + THD* thd, /*!< in: thread handle */ + struct st_mysql_sys_var* var, /*!< in: pointer to system + variable */ + void* save, /*!< out: immediate result + for update function */ + struct st_mysql_value* value) /*!< in: incoming string */ +{ + const char* change_buffering_input; + char buff[STRING_BUFFER_USUAL_SIZE]; + int len = sizeof(buff); + + ut_a(save != NULL); + ut_a(value != NULL); + + change_buffering_input = value->val_str(value, buff, &len); + + if (change_buffering_input != NULL) { + ulint use; + + for (use = 0; use < UT_ARR_SIZE(innobase_change_buffering_values); + use++) { + if (!innobase_strcasecmp( + change_buffering_input, + innobase_change_buffering_values[use])) { + *(ibuf_use_t*) save = (ibuf_use_t) use; + return(0); + } + } + } + + return(1); +} + +/****************************************************************//** +Update the system variable innodb_change_buffering using the "saved" +value. This function is registered as a callback with MySQL. */ +static +void +innodb_change_buffering_update( +/*===========================*/ + THD* thd, /*!< in: thread handle */ + struct st_mysql_sys_var* var, /*!< in: pointer to + system variable */ + void* var_ptr, /*!< out: where the + formal string goes */ + const void* save) /*!< in: immediate result + from check function */ +{ + ut_a(var_ptr != NULL); + ut_a(save != NULL); + ut_a((*(ibuf_use_t*) save) < IBUF_USE_COUNT); + + ibuf_use = *(const ibuf_use_t*) save; + + *(const char**) var_ptr = innobase_change_buffering_values[ibuf_use]; } static int show_innodb_vars(THD *thd, SHOW_VAR *var, char *buff) @@ -8603,36 +9863,39 @@ static int show_innodb_vars(THD *thd, SHOW_VAR *var, char *buff) /*********************************************************************** This function checks each index name for a table against reserved system default primary index name 'GEN_CLUST_INDEX'. If a name matches, -this function pushes an error message to the client, and returns true. */ -static +this function pushes an warning message to the client, and returns true. */ +extern "C" UNIV_INTERN bool innobase_index_name_is_reserved( /*============================*/ /* out: true if an index name matches the reserved name */ const trx_t* trx, /* in: InnoDB transaction handle */ - const TABLE* form, /* in: information on table - columns and indexes */ - const char* norm_name) /* in: table name */ + const KEY* key_info, /* in: Indexes to be created */ + ulint num_of_keys) /* in: Number of indexes to + be created. */ { - KEY* key; + const KEY* key; uint key_num; /* index number */ - for (key_num = 0; key_num < form->s->keys; key_num++) { - key = form->key_info + key_num; + for (key_num = 0; key_num < num_of_keys; key_num++) { + key = &key_info[key_num]; if (innobase_strcasecmp(key->name, innobase_index_reserve_name) == 0) { /* Push warning to mysql */ push_warning_printf((THD*) trx->mysql_thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_CANT_CREATE_TABLE, + ER_WRONG_NAME_FOR_INDEX, "Cannot Create Index with name " "'%s'. The name is reserved " "for the system default primary " "index.", innobase_index_reserve_name); + my_error(ER_WRONG_NAME_FOR_INDEX, MYF(0), + innobase_index_reserve_name); + return(true); } } @@ -8666,6 +9929,11 @@ static MYSQL_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite, "Disable with --skip-innodb-doublewrite.", NULL, NULL, TRUE); +static MYSQL_SYSVAR_ULONG(io_capacity, srv_io_capacity, + PLUGIN_VAR_RQCMDARG, + "Number of IOPs the server can do. Tunes the background IO rate", + NULL, NULL, 200, 100, ~0L, 0); + static MYSQL_SYSVAR_ULONG(fast_shutdown, innobase_fast_shutdown, PLUGIN_VAR_OPCMDARG, "Speeds up the shutdown process of the InnoDB storage engine. Possible " @@ -8678,11 +9946,27 @@ static MYSQL_SYSVAR_ULONG(fast_shutdown, innobase_fast_shutdown, ".", NULL, NULL, 1, 0, IF_NETWARE(1,2), 0); -static MYSQL_SYSVAR_BOOL(file_per_table, innobase_file_per_table, - PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, +static MYSQL_SYSVAR_BOOL(file_per_table, srv_file_per_table, + PLUGIN_VAR_NOCMDARG, "Stores each InnoDB table to an .ibd file in the database dir.", NULL, NULL, FALSE); +static MYSQL_SYSVAR_STR(file_format, innobase_file_format_name, + PLUGIN_VAR_RQCMDARG, + "File format to use for new tables in .ibd files.", + innodb_file_format_name_validate, + innodb_file_format_name_update, "Antelope"); + +/* If a new file format is introduced, the file format +name needs to be updated accordingly. Please refer to +file_format_name_map[] defined in trx0sys.c for the next +file format name. */ +static MYSQL_SYSVAR_STR(file_format_check, innobase_file_format_check, + PLUGIN_VAR_OPCMDARG, + "The highest file format in the tablespace.", + innodb_file_format_check_validate, + innodb_file_format_check_update, "Barracuda"); + static MYSQL_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit, PLUGIN_VAR_OPCMDARG, "Set to 0 (write and flush once per second)," @@ -8690,7 +9974,7 @@ static MYSQL_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit, " or 2 (write at commit, flush once per second).", NULL, NULL, 1, 0, 2, 0); -static MYSQL_SYSVAR_STR(flush_method, innobase_unix_file_flush_method, +static MYSQL_SYSVAR_STR(flush_method, innobase_file_flush_method, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "With which method to flush data.", NULL, NULL, NULL); @@ -8716,7 +10000,12 @@ static MYSQL_SYSVAR_STR(log_group_home_dir, innobase_log_group_home_dir, static MYSQL_SYSVAR_ULONG(max_dirty_pages_pct, srv_max_buf_pool_modified_pct, PLUGIN_VAR_RQCMDARG, "Percentage of dirty pages allowed in bufferpool.", - NULL, NULL, 90, 0, 100, 0); + NULL, NULL, 75, 0, 99, 0); + +static MYSQL_SYSVAR_BOOL(adaptive_flushing, srv_adaptive_flushing, + PLUGIN_VAR_NOCMDARG, + "Attempt flushing dirty pages to avoid IO bursts at checkpoints.", + NULL, NULL, TRUE); static MYSQL_SYSVAR_ULONG(max_purge_lag, srv_max_purge_lag, PLUGIN_VAR_RQCMDARG, @@ -8738,24 +10027,27 @@ static MYSQL_SYSVAR_BOOL(stats_on_metadata, innobase_stats_on_metadata, "Enable statistics gathering for metadata commands such as SHOW TABLE STATUS (on by default)", NULL, NULL, TRUE); -static MYSQL_SYSVAR_BOOL(use_legacy_cardinality_algorithm, - srv_use_legacy_cardinality_algorithm, - PLUGIN_VAR_OPCMDARG, - "Use legacy algorithm for picking random pages during index cardinality " - "estimation. Disable this to use a better algorithm, but note that your " - "query plans may change (enabled by default).", - NULL, NULL, TRUE); +static MYSQL_SYSVAR_ULONGLONG(stats_sample_pages, srv_stats_sample_pages, + PLUGIN_VAR_RQCMDARG, + "The number of index pages to sample when calculating statistics (default 8)", + NULL, NULL, 8, 1, ~0ULL, 0); -static MYSQL_SYSVAR_BOOL(adaptive_hash_index, innobase_adaptive_hash_index, - PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, +static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled, + PLUGIN_VAR_OPCMDARG, "Enable InnoDB adaptive hash index (enabled by default). " "Disable with --skip-innodb-adaptive-hash-index.", - NULL, NULL, TRUE); + NULL, innodb_adaptive_hash_index_update, TRUE); + +static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay, + PLUGIN_VAR_RQCMDARG, + "Replication thread delay (ms) on the slave server if " + "innodb_thread_concurrency is reached (0 by default)", + NULL, NULL, 0, 0, ~0UL, 0); static MYSQL_SYSVAR_LONG(additional_mem_pool_size, innobase_additional_mem_pool_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures.", - NULL, NULL, 1*1024*1024L, 512*1024L, LONG_MAX, 1024); + NULL, NULL, 8*1024*1024L, 512*1024L, LONG_MAX, 1024); static MYSQL_SYSVAR_ULONG(autoextend_increment, srv_auto_extend_increment, PLUGIN_VAR_RQCMDARG, @@ -8765,7 +10057,7 @@ static MYSQL_SYSVAR_ULONG(autoextend_increment, srv_auto_extend_increment, static MYSQL_SYSVAR_LONGLONG(buffer_pool_size, innobase_buffer_pool_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.", - NULL, NULL, 8*1024*1024L, 1024*1024L, LONGLONG_MAX, 1024*1024L); + NULL, NULL, 128*1024*1024L, 5*1024*1024L, LONGLONG_MAX, 1024*1024L); static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency, PLUGIN_VAR_RQCMDARG, @@ -8778,24 +10070,29 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter, NULL, NULL, 500L, 1L, ~0L, 0); static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads, - PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, + PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR, "Number of file I/O threads in InnoDB.", NULL, NULL, 4, 4, 64, 0); +static MYSQL_SYSVAR_ULONG(read_io_threads, innobase_read_io_threads, + PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, + "Number of background read I/O threads in InnoDB.", + NULL, NULL, 4, 1, 64, 0); + +static MYSQL_SYSVAR_ULONG(write_io_threads, innobase_write_io_threads, + PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, + "Number of background write I/O threads in InnoDB.", + NULL, NULL, 4, 1, 64, 0); + static MYSQL_SYSVAR_LONG(force_recovery, innobase_force_recovery, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Helps to save your data in case the disk image of the database becomes corrupt.", NULL, NULL, 0, 0, 6, 0); -static MYSQL_SYSVAR_LONG(lock_wait_timeout, innobase_lock_wait_timeout, - PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, - "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back.", - NULL, NULL, 50, 1, 1024 * 1024 * 1024, 0); - static MYSQL_SYSVAR_LONG(log_buffer_size, innobase_log_buffer_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "The size of the buffer which InnoDB uses to write log to the log files on disk.", - NULL, NULL, 1024*1024L, 256*1024L, LONG_MAX, 1024); + NULL, NULL, 8*1024*1024L, 256*1024L, LONG_MAX, 1024); static MYSQL_SYSVAR_LONGLONG(log_file_size, innobase_log_file_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, @@ -8812,6 +10109,18 @@ static MYSQL_SYSVAR_LONG(mirrored_log_groups, innobase_mirrored_log_groups, "Number of identical copies of log groups we keep for the database. Currently this should be set to 1.", NULL, NULL, 1, 1, 10, 0); +static MYSQL_SYSVAR_UINT(old_blocks_pct, innobase_old_blocks_pct, + PLUGIN_VAR_RQCMDARG, + "Percentage of the buffer pool to reserve for 'old' blocks.", + NULL, innodb_old_blocks_pct_update, 100 * 3 / 8, 5, 95, 0); + +static MYSQL_SYSVAR_UINT(old_blocks_time, buf_LRU_old_threshold_ms, + PLUGIN_VAR_RQCMDARG, + "Move blocks to the 'new' end of the buffer pool if the first access" + " was at least this many milliseconds ago." + " The timeout is disabled if 0 (the default).", + NULL, NULL, 0, 0, UINT_MAX32, 0); + static MYSQL_SYSVAR_LONG(open_files, innobase_open_files, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "How many files at the maximum InnoDB keeps open at the same time.", @@ -8819,13 +10128,18 @@ static MYSQL_SYSVAR_LONG(open_files, innobase_open_files, static MYSQL_SYSVAR_ULONG(sync_spin_loops, srv_n_spin_wait_rounds, PLUGIN_VAR_RQCMDARG, - "Count of spin-loop rounds in InnoDB mutexes", - NULL, NULL, 20L, 0L, ~0L, 0); + "Count of spin-loop rounds in InnoDB mutexes (30 by default)", + NULL, NULL, 30L, 0L, ~0L, 0); + +static MYSQL_SYSVAR_ULONG(spin_wait_delay, srv_spin_wait_delay, + PLUGIN_VAR_OPCMDARG, + "Maximum delay between polling for a spin lock (6 by default)", + NULL, NULL, 6L, 0L, ~0L, 0); static MYSQL_SYSVAR_ULONG(thread_concurrency, srv_thread_concurrency, PLUGIN_VAR_RQCMDARG, "Helps in performance tuning in heavily concurrent environments. Sets the maximum number of threads allowed inside InnoDB. Value 0 will disable the thread throttling.", - NULL, NULL, 8, 0, 1000, 0); + NULL, NULL, 0, 0, 1000, 0); static MYSQL_SYSVAR_ULONG(thread_sleep_delay, srv_thread_sleep_delay, PLUGIN_VAR_RQCMDARG, @@ -8849,6 +10163,28 @@ static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode, AUTOINC_OLD_STYLE_LOCKING, /* Minimum value */ AUTOINC_NO_LOCKING, 0); /* Maximum value */ +static MYSQL_SYSVAR_STR(version, innodb_version_str, + PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY, + "InnoDB version", NULL, NULL, INNODB_VERSION_STR); + +static MYSQL_SYSVAR_BOOL(use_sys_malloc, srv_use_sys_malloc, + PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, + "Use OS memory allocator instead of InnoDB's internal memory allocator", + NULL, NULL, TRUE); + +static MYSQL_SYSVAR_STR(change_buffering, innobase_change_buffering, + PLUGIN_VAR_RQCMDARG, + "Buffer changes to reduce random access: " + "OFF, ON, inserting, deleting, changing, or purging.", + innodb_change_buffering_validate, + innodb_change_buffering_update, NULL); + +static MYSQL_SYSVAR_ULONG(read_ahead_threshold, srv_read_ahead_threshold, + PLUGIN_VAR_RQCMDARG, + "Number of pages that must be accessed sequentially for InnoDB to" + "trigger a readahead.", + NULL, NULL, 56, 0, 64, 0); + static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(additional_mem_pool_size), MYSQL_SYSVAR(autoextend_increment), @@ -8861,7 +10197,11 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(doublewrite), MYSQL_SYSVAR(fast_shutdown), MYSQL_SYSVAR(file_io_threads), + MYSQL_SYSVAR(read_io_threads), + MYSQL_SYSVAR(write_io_threads), MYSQL_SYSVAR(file_per_table), + MYSQL_SYSVAR(file_format), + MYSQL_SYSVAR(file_format_check), MYSQL_SYSVAR(flush_log_at_trx_commit), MYSQL_SYSVAR(flush_method), MYSQL_SYSVAR(force_recovery), @@ -8876,20 +10216,31 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(log_files_in_group), MYSQL_SYSVAR(log_group_home_dir), MYSQL_SYSVAR(max_dirty_pages_pct), + MYSQL_SYSVAR(adaptive_flushing), MYSQL_SYSVAR(max_purge_lag), MYSQL_SYSVAR(mirrored_log_groups), + MYSQL_SYSVAR(old_blocks_pct), + MYSQL_SYSVAR(old_blocks_time), MYSQL_SYSVAR(open_files), MYSQL_SYSVAR(rollback_on_timeout), MYSQL_SYSVAR(stats_on_metadata), - MYSQL_SYSVAR(use_legacy_cardinality_algorithm), + MYSQL_SYSVAR(stats_sample_pages), MYSQL_SYSVAR(adaptive_hash_index), + MYSQL_SYSVAR(replication_delay), MYSQL_SYSVAR(status_file), + MYSQL_SYSVAR(strict_mode), MYSQL_SYSVAR(support_xa), MYSQL_SYSVAR(sync_spin_loops), + MYSQL_SYSVAR(spin_wait_delay), MYSQL_SYSVAR(table_locks), MYSQL_SYSVAR(thread_concurrency), MYSQL_SYSVAR(thread_sleep_delay), MYSQL_SYSVAR(autoinc_lock_mode), + MYSQL_SYSVAR(version), + MYSQL_SYSVAR(use_sys_malloc), + MYSQL_SYSVAR(change_buffering), + MYSQL_SYSVAR(read_ahead_threshold), + MYSQL_SYSVAR(io_capacity), NULL }; @@ -8898,16 +10249,23 @@ mysql_declare_plugin(innobase) MYSQL_STORAGE_ENGINE_PLUGIN, &innobase_storage_engine, innobase_hton_name, - "Innobase OY", + "Innobase Oy", "Supports transactions, row-level locking, and foreign keys", PLUGIN_LICENSE_GPL, innobase_init, /* Plugin Init */ NULL, /* Plugin Deinit */ - 0x0100 /* 1.0 */, + INNODB_VERSION_SHORT, innodb_status_variables_export,/* status variables */ innobase_system_variables, /* system variables */ NULL /* reserved */ -} +}, +i_s_innodb_trx, +i_s_innodb_locks, +i_s_innodb_lock_waits, +i_s_innodb_cmp, +i_s_innodb_cmp_reset, +i_s_innodb_cmpmem, +i_s_innodb_cmpmem_reset mysql_declare_plugin_end; /** @brief Initialize the default value of innodb_commit_concurrency. @@ -8927,3 +10285,125 @@ innobase_commit_concurrency_init_default(void) MYSQL_SYSVAR_NAME(commit_concurrency).def_val = innobase_commit_concurrency; } + +#ifdef UNIV_COMPILE_TEST_FUNCS + +typedef struct innobase_convert_name_test_struct { + char* buf; + ulint buflen; + const char* id; + ulint idlen; + void* thd; + ibool file_id; + + const char* expected; +} innobase_convert_name_test_t; + +void +test_innobase_convert_name() +{ + char buf[1024]; + ulint i; + + innobase_convert_name_test_t test_input[] = { + {buf, sizeof(buf), "abcd", 4, NULL, TRUE, "\"abcd\""}, + {buf, 7, "abcd", 4, NULL, TRUE, "\"abcd\""}, + {buf, 6, "abcd", 4, NULL, TRUE, "\"abcd\""}, + {buf, 5, "abcd", 4, NULL, TRUE, "\"abc\""}, + {buf, 4, "abcd", 4, NULL, TRUE, "\"ab\""}, + + {buf, sizeof(buf), "ab@0060cd", 9, NULL, TRUE, "\"ab`cd\""}, + {buf, 9, "ab@0060cd", 9, NULL, TRUE, "\"ab`cd\""}, + {buf, 8, "ab@0060cd", 9, NULL, TRUE, "\"ab`cd\""}, + {buf, 7, "ab@0060cd", 9, NULL, TRUE, "\"ab`cd\""}, + {buf, 6, "ab@0060cd", 9, NULL, TRUE, "\"ab`c\""}, + {buf, 5, "ab@0060cd", 9, NULL, TRUE, "\"ab`\""}, + {buf, 4, "ab@0060cd", 9, NULL, TRUE, "\"ab\""}, + + {buf, sizeof(buf), "ab\"cd", 5, NULL, TRUE, + "\"#mysql50#ab\"\"cd\""}, + {buf, 17, "ab\"cd", 5, NULL, TRUE, + "\"#mysql50#ab\"\"cd\""}, + {buf, 16, "ab\"cd", 5, NULL, TRUE, + "\"#mysql50#ab\"\"c\""}, + {buf, 15, "ab\"cd", 5, NULL, TRUE, + "\"#mysql50#ab\"\"\""}, + {buf, 14, "ab\"cd", 5, NULL, TRUE, + "\"#mysql50#ab\""}, + {buf, 13, "ab\"cd", 5, NULL, TRUE, + "\"#mysql50#ab\""}, + {buf, 12, "ab\"cd", 5, NULL, TRUE, + "\"#mysql50#a\""}, + {buf, 11, "ab\"cd", 5, NULL, TRUE, + "\"#mysql50#\""}, + {buf, 10, "ab\"cd", 5, NULL, TRUE, + "\"#mysql50\""}, + + {buf, sizeof(buf), "ab/cd", 5, NULL, TRUE, "\"ab\".\"cd\""}, + {buf, 9, "ab/cd", 5, NULL, TRUE, "\"ab\".\"cd\""}, + {buf, 8, "ab/cd", 5, NULL, TRUE, "\"ab\".\"c\""}, + {buf, 7, "ab/cd", 5, NULL, TRUE, "\"ab\".\"\""}, + {buf, 6, "ab/cd", 5, NULL, TRUE, "\"ab\"."}, + {buf, 5, "ab/cd", 5, NULL, TRUE, "\"ab\"."}, + {buf, 4, "ab/cd", 5, NULL, TRUE, "\"ab\""}, + {buf, 3, "ab/cd", 5, NULL, TRUE, "\"a\""}, + {buf, 2, "ab/cd", 5, NULL, TRUE, "\"\""}, + /* XXX probably "" is a better result in this case + {buf, 1, "ab/cd", 5, NULL, TRUE, "."}, + */ + {buf, 0, "ab/cd", 5, NULL, TRUE, ""}, + }; + + for (i = 0; i < sizeof(test_input) / sizeof(test_input[0]); i++) { + + char* end; + ibool ok = TRUE; + size_t res_len; + + fprintf(stderr, "TESTING %lu, %s, %lu, %s\n", + test_input[i].buflen, + test_input[i].id, + test_input[i].idlen, + test_input[i].expected); + + end = innobase_convert_name( + test_input[i].buf, + test_input[i].buflen, + test_input[i].id, + test_input[i].idlen, + test_input[i].thd, + test_input[i].file_id); + + res_len = (size_t) (end - test_input[i].buf); + + if (res_len != strlen(test_input[i].expected)) { + + fprintf(stderr, "unexpected len of the result: %u, " + "expected: %u\n", (unsigned) res_len, + (unsigned) strlen(test_input[i].expected)); + ok = FALSE; + } + + if (memcmp(test_input[i].buf, + test_input[i].expected, + strlen(test_input[i].expected)) != 0 + || !ok) { + + fprintf(stderr, "unexpected result: %.*s, " + "expected: %s\n", (int) res_len, + test_input[i].buf, + test_input[i].expected); + ok = FALSE; + } + + if (ok) { + fprintf(stderr, "OK: res: %.*s\n\n", (int) res_len, + buf); + } else { + fprintf(stderr, "FAILED\n\n"); + return; + } + } +} + +#endif /* UNIV_COMPILE_TEST_FUNCS */ diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index 5b3df16875a..31e88ed8530 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -1,17 +1,20 @@ -/* Copyright (C) 2000-2005 MySQL AB && Innobase Oy +/***************************************************************************** - 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. +Copyright (c) 2000, 2009, MySQL AB & Innobase Oy. All Rights Reserved. - 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. +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. - 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 */ +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 + +*****************************************************************************/ /* This file is based on ha_berkeley.h of MySQL distribution @@ -24,34 +27,43 @@ #pragma interface /* gcc class implementation */ #endif +/** InnoDB table share */ typedef struct st_innobase_share { - THR_LOCK lock; - pthread_mutex_t mutex; - char *table_name; - uint table_name_length,use_count; + THR_LOCK lock; /*!< MySQL lock protecting + this structure */ + const char* table_name; /*!< InnoDB table name */ + uint use_count; /*!< reference count, + incremented in get_share() + and decremented in free_share() */ + void* table_name_hash;/*!< hash table chain node */ } INNOBASE_SHARE; +/** InnoDB B-tree index */ struct dict_index_struct; +/** Prebuilt structures in an Innobase table handle used within MySQL */ struct row_prebuilt_struct; +/** InnoDB B-tree index */ typedef struct dict_index_struct dict_index_t; +/** Prebuilt structures in an Innobase table handle used within MySQL */ typedef struct row_prebuilt_struct row_prebuilt_t; -/* The class defining a handle to an Innodb table */ +/** The class defining a handle to an Innodb table */ class ha_innobase: public handler { - row_prebuilt_t* prebuilt; /* prebuilt struct in InnoDB, used + row_prebuilt_t* prebuilt; /*!< prebuilt struct in InnoDB, used to save CPU time with prebuilt data structures*/ - THD* user_thd; /* the thread handle of the user + THD* user_thd; /*!< the thread handle of the user currently using the handle; this is set in external_lock function */ THR_LOCK_DATA lock; - INNOBASE_SHARE *share; + INNOBASE_SHARE* share; /*!< information for MySQL + table locking */ - uchar* upd_buff; /* buffer used in updates */ - uchar* key_val_buff; /* buffer used in converting + uchar* upd_buff; /*!< buffer used in updates */ + uchar* key_val_buff; /*!< buffer used in converting search key values from MySQL format to Innodb format */ ulong upd_and_key_val_buff_len; @@ -59,61 +71,49 @@ class ha_innobase: public handler two buffers */ Table_flags int_table_flags; uint primary_key; - ulong start_of_scan; /* this is set to 1 when we are + ulong start_of_scan; /*!< this is set to 1 when we are starting a table scan but have not yet fetched any row, else 0 */ uint last_match_mode;/* match mode of the latest search: ROW_SEL_EXACT, ROW_SEL_EXACT_PREFIX, or undefined */ - uint num_write_row; /* number of write_row() calls */ + uint num_write_row; /*!< number of write_row() calls */ uint store_key_val_for_row(uint keynr, char* buff, uint buff_len, const uchar* record); - int update_thd(THD* thd); + inline void update_thd(THD* thd); + void update_thd(); int change_active_index(uint keynr); int general_fetch(uchar* buf, uint direction, uint match_mode); - ulong innobase_lock_autoinc(); + ulint innobase_lock_autoinc(); ulonglong innobase_peek_autoinc(); - ulong innobase_set_max_autoinc(ulonglong auto_inc); - ulong innobase_reset_autoinc(ulonglong auto_inc); - ulong innobase_get_autoinc(ulonglong* value); - ulong innobase_update_autoinc(ulonglong auto_inc); - void innobase_initialize_autoinc(); + ulint innobase_set_max_autoinc(ulonglong auto_inc); + ulint innobase_reset_autoinc(ulonglong auto_inc); + ulint innobase_get_autoinc(ulonglong* value); + ulint innobase_update_autoinc(ulonglong auto_inc); + ulint innobase_initialize_autoinc(); dict_index_t* innobase_get_index(uint keynr); + ulonglong innobase_get_int_col_max_value(const Field* field); /* Init values for the class: */ public: ha_innobase(handlerton *hton, TABLE_SHARE *table_arg); - ~ha_innobase() {} + ~ha_innobase(); /* Get the row type from the storage engine. If this method returns ROW_TYPE_NOT_USED, the information in HA_CREATE_INFO should be used. */ enum row_type get_row_type() const; - const char* table_type() const { return("InnoDB");} - const char *index_type(uint key_number) { return "BTREE"; } + const char* table_type() const; + const char* index_type(uint key_number); const char** bas_ext() const; Table_flags table_flags() const; - ulong index_flags(uint idx, uint part, bool all_parts) const - { - return (HA_READ_NEXT | - HA_READ_PREV | - HA_READ_ORDER | - HA_READ_RANGE | - HA_KEYREAD_ONLY); - } - uint max_supported_keys() const { return MAX_KEY; } - /* An InnoDB page must store >= 2 keys; - a secondary key record must also contain the - primary key value: - max key length is therefore set to slightly - less than 1 / 4 of page size which is 16 kB; - but currently MySQL does not work with keys - whose size is > MAX_KEY_LENGTH */ - uint max_supported_key_length() const { return 3500; } + ulong index_flags(uint idx, uint part, bool all_parts) const; + uint max_supported_keys() const; + uint max_supported_key_length() const; uint max_supported_key_part_length() const; - const key_map *keys_to_use_for_scanning() { return &key_map_full; } + const key_map* keys_to_use_for_scanning(); int open(const char *name, int mode, uint test_if_locked); int close(void); @@ -184,7 +184,7 @@ class ha_innobase: public handler virtual bool get_error_message(int error, String *buf); - uint8 table_cache_type() { return HA_CACHE_TBL_ASKTRANSACT; } + uint8 table_cache_type(); /* ask handler about permission to cache table during query registration */ @@ -194,8 +194,14 @@ class ha_innobase: public handler ulonglong *engine_data); static char *get_mysql_bin_log_name(); static ulonglong get_mysql_bin_log_pos(); - bool primary_key_is_clustered() { return true; } + bool primary_key_is_clustered(); int cmp_ref(const uchar *ref1, const uchar *ref2); + /** Fast index creation (smart ALTER TABLE) @see handler0alter.cc @{ */ + int add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys); + int prepare_drop_index(TABLE *table_arg, uint *key_num, + uint num_of_keys); + int final_drop_index(TABLE *table_arg); + /** @} */ bool check_if_incompatible_data(HA_CREATE_INFO *info, uint table_changes); }; @@ -252,10 +258,54 @@ int thd_binlog_format(const MYSQL_THD thd); */ void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all); +#if MYSQL_VERSION_ID > 50140 /** Check if binary logging is filtered for thread's current db. @param thd Thread handle @retval 1 the query is not filtered, 0 otherwise. */ bool thd_binlog_filter_ok(const MYSQL_THD thd); +#endif /* MYSQL_VERSION_ID > 50140 */ } + +typedef struct trx_struct trx_t; +/********************************************************************//** +@file handler/ha_innodb.h +Converts an InnoDB error code to a MySQL error code and also tells to MySQL +about a possible transaction rollback inside InnoDB caused by a lock wait +timeout or a deadlock. +@return MySQL error code */ +extern "C" +int +convert_error_code_to_mysql( +/*========================*/ + int error, /*!< in: InnoDB error code */ + ulint flags, /*!< in: InnoDB table flags, or 0 */ + MYSQL_THD thd); /*!< in: user thread handle or NULL */ + +/*********************************************************************//** +Allocates an InnoDB transaction for a MySQL handler object. +@return InnoDB transaction handle */ +extern "C" +trx_t* +innobase_trx_allocate( +/*==================*/ + MYSQL_THD thd); /*!< in: user thread handle */ + + +/*********************************************************************//** +This function checks each index name for a table against reserved +system default primary index name 'GEN_CLUST_INDEX'. If a name +matches, this function pushes an warning message to the client, +and returns true. */ +extern "C" +bool +innobase_index_name_is_reserved( +/*============================*/ + /* out: true if the index name + matches the reserved name */ + const trx_t* trx, /* in: InnoDB transaction handle */ + const KEY* key_info, /* in: Indexes to be created */ + ulint num_of_keys); /* in: Number of indexes to + be created. */ + diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc new file mode 100644 index 00000000000..a5008991400 --- /dev/null +++ b/storage/innobase/handler/handler0alter.cc @@ -0,0 +1,1224 @@ +/***************************************************************************** + +Copyright (c) 2005, 2009, Innobase Oy. 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 + +*****************************************************************************/ + +/**************************************************//** +@file handler/handler0alter.cc +Smart ALTER TABLE +*******************************************************/ + +#include <mysql_priv.h> +#include <mysqld_error.h> + +extern "C" { +#include "log0log.h" +#include "row0merge.h" +#include "srv0srv.h" +#include "trx0trx.h" +#include "trx0roll.h" +#include "ha_prototypes.h" +#include "handler0alter.h" +} + +#include "ha_innodb.h" + +/*************************************************************//** +Copies an InnoDB column to a MySQL field. This function is +adapted from row_sel_field_store_in_mysql_format(). */ +static +void +innobase_col_to_mysql( +/*==================*/ + const dict_col_t* col, /*!< in: InnoDB column */ + const uchar* data, /*!< in: InnoDB column data */ + ulint len, /*!< in: length of data, in bytes */ + Field* field) /*!< in/out: MySQL field */ +{ + uchar* ptr; + uchar* dest = field->ptr; + ulint flen = field->pack_length(); + + switch (col->mtype) { + case DATA_INT: + ut_ad(len == flen); + + /* Convert integer data from Innobase to little-endian + format, sign bit restored to normal */ + + for (ptr = dest + len; ptr != dest; ) { + *--ptr = *data++; + } + + if (!(field->flags & UNSIGNED_FLAG)) { + ((byte*) dest)[len - 1] ^= 0x80; + } + + break; + + case DATA_VARCHAR: + case DATA_VARMYSQL: + case DATA_BINARY: + field->reset(); + + if (field->type() == MYSQL_TYPE_VARCHAR) { + /* This is a >= 5.0.3 type true VARCHAR. Store the + length of the data to the first byte or the first + two bytes of dest. */ + + dest = row_mysql_store_true_var_len( + dest, len, flen - field->key_length()); + } + + /* Copy the actual data */ + memcpy(dest, data, len); + break; + + case DATA_BLOB: + /* Store a pointer to the BLOB buffer to dest: the BLOB was + already copied to the buffer in row_sel_store_mysql_rec */ + + row_mysql_store_blob_ref(dest, flen, data, len); + break; + +#ifdef UNIV_DEBUG + case DATA_MYSQL: + ut_ad(flen >= len); + ut_ad(col->mbmaxlen >= col->mbminlen); + ut_ad(col->mbmaxlen > col->mbminlen || flen == len); + memcpy(dest, data, len); + break; + + default: + case DATA_SYS_CHILD: + case DATA_SYS: + /* These column types should never be shipped to MySQL. */ + ut_ad(0); + + case DATA_CHAR: + case DATA_FIXBINARY: + case DATA_FLOAT: + case DATA_DOUBLE: + case DATA_DECIMAL: + /* Above are the valid column types for MySQL data. */ + ut_ad(flen == len); +#else /* UNIV_DEBUG */ + default: +#endif /* UNIV_DEBUG */ + memcpy(dest, data, len); + } +} + +/*************************************************************//** +Copies an InnoDB record to table->record[0]. */ +extern "C" UNIV_INTERN +void +innobase_rec_to_mysql( +/*==================*/ + TABLE* table, /*!< in/out: MySQL table */ + const rec_t* rec, /*!< in: record */ + const dict_index_t* index, /*!< in: index */ + const ulint* offsets) /*!< in: rec_get_offsets( + rec, index, ...) */ +{ + uint n_fields = table->s->fields; + uint i; + + ut_ad(n_fields == dict_table_get_n_user_cols(index->table)); + + for (i = 0; i < n_fields; i++) { + Field* field = table->field[i]; + ulint ipos; + ulint ilen; + const uchar* ifield; + + field->reset(); + + ipos = dict_index_get_nth_col_pos(index, i); + + if (UNIV_UNLIKELY(ipos == ULINT_UNDEFINED)) { +null_field: + field->set_null(); + continue; + } + + ifield = rec_get_nth_field(rec, offsets, ipos, &ilen); + + /* Assign the NULL flag */ + if (ilen == UNIV_SQL_NULL) { + ut_ad(field->real_maybe_null()); + goto null_field; + } + + field->set_notnull(); + + innobase_col_to_mysql( + dict_field_get_col( + dict_index_get_nth_field(index, ipos)), + ifield, ilen, field); + } +} + +/*************************************************************//** +Resets table->record[0]. */ +extern "C" UNIV_INTERN +void +innobase_rec_reset( +/*===============*/ + TABLE* table) /*!< in/out: MySQL table */ +{ + uint n_fields = table->s->fields; + uint i; + + for (i = 0; i < n_fields; i++) { + table->field[i]->set_default(); + } +} + +/******************************************************************//** +Removes the filename encoding of a database and table name. */ +static +void +innobase_convert_tablename( +/*=======================*/ + char* s) /*!< in: identifier; out: decoded identifier */ +{ + uint errors; + + char* slash = strchr(s, '/'); + + if (slash) { + char* t; + /* Temporarily replace the '/' with NUL. */ + *slash = 0; + /* Convert the database name. */ + strconvert(&my_charset_filename, s, system_charset_info, + s, slash - s + 1, &errors); + + t = s + strlen(s); + ut_ad(slash >= t); + /* Append a '.' after the database name. */ + *t++ = '.'; + slash++; + /* Convert the table name. */ + strconvert(&my_charset_filename, slash, system_charset_info, + t, slash - t + strlen(slash), &errors); + } else { + strconvert(&my_charset_filename, s, + system_charset_info, s, strlen(s), &errors); + } +} + +/*******************************************************************//** +This function checks that index keys are sensible. +@return 0 or error number */ +static +int +innobase_check_index_keys( +/*======================*/ + const KEY* key_info, /*!< in: Indexes to be created */ + ulint num_of_keys) /*!< in: Number of indexes to + be created */ +{ + ulint key_num; + + ut_ad(key_info); + ut_ad(num_of_keys); + + for (key_num = 0; key_num < num_of_keys; key_num++) { + const KEY& key = key_info[key_num]; + + /* Check that the same index name does not appear + twice in indexes to be created. */ + + for (ulint i = 0; i < key_num; i++) { + const KEY& key2 = key_info[i]; + + if (0 == strcmp(key.name, key2.name)) { + sql_print_error("InnoDB: key name `%s` appears" + " twice in CREATE INDEX\n", + key.name); + + return(ER_WRONG_NAME_FOR_INDEX); + } + } + + /* Check that MySQL does not try to create a column + prefix index field on an inappropriate data type and + that the same colum does not appear twice in the index. */ + + for (ulint i = 0; i < key.key_parts; i++) { + const KEY_PART_INFO& key_part1 + = key.key_part[i]; + const Field* field + = key_part1.field; + ibool is_unsigned; + + switch (get_innobase_type_from_mysql_type( + &is_unsigned, field)) { + default: + break; + case DATA_INT: + case DATA_FLOAT: + case DATA_DOUBLE: + case DATA_DECIMAL: + if (field->type() == MYSQL_TYPE_VARCHAR) { + if (key_part1.length + >= field->pack_length() + - ((Field_varstring*) field) + ->length_bytes) { + break; + } + } else { + if (key_part1.length + >= field->pack_length()) { + break; + } + } + + sql_print_error("InnoDB: MySQL is trying to" + " create a column prefix" + " index field on an" + " inappropriate data type." + " column `%s`," + " index `%s`.\n", + field->field_name, + key.name); + return(ER_WRONG_KEY_COLUMN); + } + + for (ulint j = 0; j < i; j++) { + const KEY_PART_INFO& key_part2 + = key.key_part[j]; + + if (strcmp(key_part1.field->field_name, + key_part2.field->field_name)) { + continue; + } + + sql_print_error("InnoDB: column `%s`" + " is not allowed to occur" + " twice in index `%s`.\n", + key_part1.field->field_name, + key.name); + return(ER_WRONG_KEY_COLUMN); + } + } + } + + return(0); +} + +/*******************************************************************//** +Create index field definition for key part */ +static +void +innobase_create_index_field_def( +/*============================*/ + KEY_PART_INFO* key_part, /*!< in: MySQL key definition */ + mem_heap_t* heap, /*!< in: memory heap */ + merge_index_field_t* index_field) /*!< out: index field + definition for key_part */ +{ + Field* field; + ibool is_unsigned; + ulint col_type; + + DBUG_ENTER("innobase_create_index_field_def"); + + ut_ad(key_part); + ut_ad(index_field); + + field = key_part->field; + ut_a(field); + + col_type = get_innobase_type_from_mysql_type(&is_unsigned, field); + + if (DATA_BLOB == col_type + || (key_part->length < field->pack_length() + && field->type() != MYSQL_TYPE_VARCHAR) + || (field->type() == MYSQL_TYPE_VARCHAR + && key_part->length < field->pack_length() + - ((Field_varstring*)field)->length_bytes)) { + + index_field->prefix_len = key_part->length; + } else { + index_field->prefix_len = 0; + } + + index_field->field_name = mem_heap_strdup(heap, field->field_name); + + DBUG_VOID_RETURN; +} + +/*******************************************************************//** +Create index definition for key */ +static +void +innobase_create_index_def( +/*======================*/ + KEY* key, /*!< in: key definition */ + bool new_primary, /*!< in: TRUE=generating + a new primary key + on the table */ + bool key_primary, /*!< in: TRUE if this key + is a primary key */ + merge_index_def_t* index, /*!< out: index definition */ + mem_heap_t* heap) /*!< in: heap where memory + is allocated */ +{ + ulint i; + ulint len; + ulint n_fields = key->key_parts; + char* index_name; + + DBUG_ENTER("innobase_create_index_def"); + + index->fields = (merge_index_field_t*) mem_heap_alloc( + heap, n_fields * sizeof *index->fields); + + index->ind_type = 0; + index->n_fields = n_fields; + len = strlen(key->name) + 1; + index->name = index_name = (char*) mem_heap_alloc(heap, + len + !new_primary); + + if (UNIV_LIKELY(!new_primary)) { + *index_name++ = TEMP_INDEX_PREFIX; + } + + memcpy(index_name, key->name, len); + + if (key->flags & HA_NOSAME) { + index->ind_type |= DICT_UNIQUE; + } + + if (key_primary) { + index->ind_type |= DICT_CLUSTERED; + } + + for (i = 0; i < n_fields; i++) { + innobase_create_index_field_def(&key->key_part[i], heap, + &index->fields[i]); + } + + DBUG_VOID_RETURN; +} + +/*******************************************************************//** +Copy index field definition */ +static +void +innobase_copy_index_field_def( +/*==========================*/ + const dict_field_t* field, /*!< in: definition to copy */ + merge_index_field_t* index_field) /*!< out: copied definition */ +{ + DBUG_ENTER("innobase_copy_index_field_def"); + DBUG_ASSERT(field != NULL); + DBUG_ASSERT(index_field != NULL); + + index_field->field_name = field->name; + index_field->prefix_len = field->prefix_len; + + DBUG_VOID_RETURN; +} + +/*******************************************************************//** +Copy index definition for the index */ +static +void +innobase_copy_index_def( +/*====================*/ + const dict_index_t* index, /*!< in: index definition to copy */ + merge_index_def_t* new_index,/*!< out: Index definition */ + mem_heap_t* heap) /*!< in: heap where allocated */ +{ + ulint n_fields; + ulint i; + + DBUG_ENTER("innobase_copy_index_def"); + + /* Note that we take only those fields that user defined to be + in the index. In the internal representation more colums were + added and those colums are not copied .*/ + + n_fields = index->n_user_defined_cols; + + new_index->fields = (merge_index_field_t*) mem_heap_alloc( + heap, n_fields * sizeof *new_index->fields); + + /* When adding a PRIMARY KEY, we may convert a previous + clustered index to a secondary index (UNIQUE NOT NULL). */ + new_index->ind_type = index->type & ~DICT_CLUSTERED; + new_index->n_fields = n_fields; + new_index->name = index->name; + + for (i = 0; i < n_fields; i++) { + innobase_copy_index_field_def(&index->fields[i], + &new_index->fields[i]); + } + + DBUG_VOID_RETURN; +} + +/*******************************************************************//** +Create an index table where indexes are ordered as follows: + +IF a new primary key is defined for the table THEN + + 1) New primary key + 2) Original secondary indexes + 3) New secondary indexes + +ELSE + + 1) All new indexes in the order they arrive from MySQL + +ENDIF + + +@return key definitions or NULL */ +static +merge_index_def_t* +innobase_create_key_def( +/*====================*/ + trx_t* trx, /*!< in: trx */ + const dict_table_t*table, /*!< in: table definition */ + mem_heap_t* heap, /*!< in: heap where space for key + definitions are allocated */ + KEY* key_info, /*!< in: Indexes to be created */ + ulint& n_keys) /*!< in/out: Number of indexes to + be created */ +{ + ulint i = 0; + merge_index_def_t* indexdef; + merge_index_def_t* indexdefs; + bool new_primary; + + DBUG_ENTER("innobase_create_key_def"); + + indexdef = indexdefs = (merge_index_def_t*) + mem_heap_alloc(heap, sizeof *indexdef + * (n_keys + UT_LIST_GET_LEN(table->indexes))); + + /* If there is a primary key, it is always the first index + defined for the table. */ + + new_primary = !my_strcasecmp(system_charset_info, + key_info->name, "PRIMARY"); + + /* If there is a UNIQUE INDEX consisting entirely of NOT NULL + columns, MySQL will treat it as a PRIMARY KEY unless the + table already has one. */ + + if (!new_primary && (key_info->flags & HA_NOSAME) + && row_table_got_default_clust_index(table)) { + uint key_part = key_info->key_parts; + + new_primary = TRUE; + + while (key_part--) { + if (key_info->key_part[key_part].key_type + & FIELDFLAG_MAYBE_NULL) { + new_primary = FALSE; + break; + } + } + } + + if (new_primary) { + const dict_index_t* index; + + /* Create the PRIMARY key index definition */ + innobase_create_index_def(&key_info[i++], TRUE, TRUE, + indexdef++, heap); + + row_mysql_lock_data_dictionary(trx); + + index = dict_table_get_first_index(table); + + /* Copy the index definitions of the old table. Skip + the old clustered index if it is a generated clustered + index or a PRIMARY KEY. If the clustered index is a + UNIQUE INDEX, it must be converted to a secondary index. */ + + if (dict_index_get_nth_col(index, 0)->mtype == DATA_SYS + || !my_strcasecmp(system_charset_info, + index->name, "PRIMARY")) { + index = dict_table_get_next_index(index); + } + + while (index) { + innobase_copy_index_def(index, indexdef++, heap); + index = dict_table_get_next_index(index); + } + + row_mysql_unlock_data_dictionary(trx); + } + + /* Create definitions for added secondary indexes. */ + + while (i < n_keys) { + innobase_create_index_def(&key_info[i++], new_primary, FALSE, + indexdef++, heap); + } + + n_keys = indexdef - indexdefs; + + DBUG_RETURN(indexdefs); +} + +/*******************************************************************//** +Create a temporary tablename using query id, thread id, and id +@return temporary tablename */ +static +char* +innobase_create_temporary_tablename( +/*================================*/ + mem_heap_t* heap, /*!< in: memory heap */ + char id, /*!< in: identifier [0-9a-zA-Z] */ + const char* table_name) /*!< in: table name */ +{ + char* name; + ulint len; + static const char suffix[] = "@0023 "; /* "# " */ + + len = strlen(table_name); + + name = (char*) mem_heap_alloc(heap, len + sizeof suffix); + memcpy(name, table_name, len); + memcpy(name + len, suffix, sizeof suffix); + name[len + (sizeof suffix - 2)] = id; + + return(name); +} + +/*******************************************************************//** +Create indexes. +@return 0 or error number */ +UNIV_INTERN +int +ha_innobase::add_index( +/*===================*/ + TABLE* table, /*!< in: Table where indexes are created */ + KEY* key_info, /*!< in: Indexes to be created */ + uint num_of_keys) /*!< in: Number of indexes to be created */ +{ + dict_index_t** index; /*!< Index to be created */ + dict_table_t* innodb_table; /*!< InnoDB table in dictionary */ + dict_table_t* indexed_table; /*!< Table where indexes are created */ + merge_index_def_t* index_defs; /*!< Index definitions */ + mem_heap_t* heap; /*!< Heap for index definitions */ + trx_t* trx; /*!< Transaction */ + ulint num_of_idx; + ulint num_created = 0; + ibool dict_locked = FALSE; + ulint new_primary; + int error; + + DBUG_ENTER("ha_innobase::add_index"); + ut_a(table); + ut_a(key_info); + ut_a(num_of_keys); + + if (srv_created_new_raw || srv_force_recovery) { + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } + + update_thd(); + + heap = mem_heap_create(1024); + + /* In case MySQL calls this in the middle of a SELECT query, release + possible adaptive hash latch to avoid deadlocks of threads. */ + trx_search_latch_release_if_reserved(prebuilt->trx); + trx_start_if_not_started(prebuilt->trx); + + /* Create a background transaction for the operations on + the data dictionary tables. */ + trx = innobase_trx_allocate(user_thd); + trx_start_if_not_started(trx); + + innodb_table = indexed_table + = dict_table_get(prebuilt->table->name, FALSE); + + /* Check if the index name is reserved. */ + if (innobase_index_name_is_reserved(trx, key_info, num_of_keys)) { + error = -1; + } else { + /* Check that index keys are sensible */ + error = innobase_check_index_keys(key_info, num_of_keys); + } + + if (UNIV_UNLIKELY(error)) { +err_exit: + mem_heap_free(heap); + trx_general_rollback_for_mysql(trx, NULL); + trx_free_for_mysql(trx); + trx_commit_for_mysql(prebuilt->trx); + DBUG_RETURN(error); + } + + /* Create table containing all indexes to be built in this + alter table add index so that they are in the correct order + in the table. */ + + num_of_idx = num_of_keys; + + index_defs = innobase_create_key_def( + trx, innodb_table, heap, key_info, num_of_idx); + + new_primary = DICT_CLUSTERED & index_defs[0].ind_type; + + /* Allocate memory for dictionary index definitions */ + + index = (dict_index_t**) mem_heap_alloc( + heap, num_of_idx * sizeof *index); + + /* Flag this transaction as a dictionary operation, so that + the data dictionary will be locked in crash recovery. */ + trx_set_dict_operation(trx, TRX_DICT_OP_INDEX); + + /* Acquire a lock on the table before creating any indexes. */ + error = row_merge_lock_table(prebuilt->trx, innodb_table, + new_primary ? LOCK_X : LOCK_S); + + if (UNIV_UNLIKELY(error != DB_SUCCESS)) { + + goto error_handling; + } + + /* Latch the InnoDB data dictionary exclusively so that no deadlocks + or lock waits can happen in it during an index create operation. */ + + row_mysql_lock_data_dictionary(trx); + dict_locked = TRUE; + + /* If a new primary key is defined for the table we need + to drop the original table and rebuild all indexes. */ + + if (UNIV_UNLIKELY(new_primary)) { + /* This transaction should be the only one + operating on the table. */ + ut_a(innodb_table->n_mysql_handles_opened == 1); + + char* new_table_name = innobase_create_temporary_tablename( + heap, '1', innodb_table->name); + + /* Clone the table. */ + trx_set_dict_operation(trx, TRX_DICT_OP_TABLE); + indexed_table = row_merge_create_temporary_table( + new_table_name, index_defs, innodb_table, trx); + + if (!indexed_table) { + + switch (trx->error_state) { + case DB_TABLESPACE_ALREADY_EXISTS: + case DB_DUPLICATE_KEY: + innobase_convert_tablename(new_table_name); + my_error(HA_ERR_TABLE_EXIST, MYF(0), + new_table_name); + error = HA_ERR_TABLE_EXIST; + break; + default: + error = convert_error_code_to_mysql( + trx->error_state, innodb_table->flags, + user_thd); + } + + row_mysql_unlock_data_dictionary(trx); + goto err_exit; + } + + trx->table_id = indexed_table->id; + } + + /* Create the indexes in SYS_INDEXES and load into dictionary. */ + + for (ulint i = 0; i < num_of_idx; i++) { + + index[i] = row_merge_create_index(trx, indexed_table, + &index_defs[i]); + + if (!index[i]) { + error = trx->error_state; + goto error_handling; + } + + num_created++; + } + + ut_ad(error == DB_SUCCESS); + + /* Commit the data dictionary transaction in order to release + the table locks on the system tables. This means that if + MySQL crashes while creating a new primary key inside + row_merge_build_indexes(), indexed_table will not be dropped + by trx_rollback_active(). It will have to be recovered or + dropped by the database administrator. */ + trx_commit_for_mysql(trx); + + row_mysql_unlock_data_dictionary(trx); + dict_locked = FALSE; + + ut_a(trx->n_active_thrs == 0); + ut_a(UT_LIST_GET_LEN(trx->signals) == 0); + + if (UNIV_UNLIKELY(new_primary)) { + /* A primary key is to be built. Acquire an exclusive + table lock also on the table that is being created. */ + ut_ad(indexed_table != innodb_table); + + error = row_merge_lock_table(prebuilt->trx, indexed_table, + LOCK_X); + + if (UNIV_UNLIKELY(error != DB_SUCCESS)) { + + goto error_handling; + } + } + + /* Read the clustered index of the table and build indexes + based on this information using temporary files and merge sort. */ + error = row_merge_build_indexes(prebuilt->trx, + innodb_table, indexed_table, + index, num_of_idx, table); + +error_handling: +#ifdef UNIV_DEBUG + /* TODO: At the moment we can't handle the following statement + in our debugging code below: + + alter table t drop index b, add index (b); + + The fix will have to parse the SQL and note that the index + being added has the same name as the one being dropped and + ignore that in the dup index check.*/ + //dict_table_check_for_dup_indexes(prebuilt->table); +#endif + + /* After an error, remove all those index definitions from the + dictionary which were defined. */ + + switch (error) { + const char* old_name; + char* tmp_name; + case DB_SUCCESS: + ut_a(!dict_locked); + row_mysql_lock_data_dictionary(trx); + dict_locked = TRUE; + + if (!new_primary) { + error = row_merge_rename_indexes(trx, indexed_table); + + if (error != DB_SUCCESS) { + row_merge_drop_indexes(trx, indexed_table, + index, num_created); + } + + goto convert_error; + } + + /* If a new primary key was defined for the table and + there was no error at this point, we can now rename + the old table as a temporary table, rename the new + temporary table as the old table and drop the old table. */ + old_name = innodb_table->name; + tmp_name = innobase_create_temporary_tablename(heap, '2', + old_name); + + error = row_merge_rename_tables(innodb_table, indexed_table, + tmp_name, trx); + + if (error != DB_SUCCESS) { + + row_merge_drop_table(trx, indexed_table); + + switch (error) { + case DB_TABLESPACE_ALREADY_EXISTS: + case DB_DUPLICATE_KEY: + innobase_convert_tablename(tmp_name); + my_error(HA_ERR_TABLE_EXIST, MYF(0), tmp_name); + error = HA_ERR_TABLE_EXIST; + break; + default: + goto convert_error; + } + break; + } + + trx_commit_for_mysql(prebuilt->trx); + row_prebuilt_free(prebuilt, TRUE); + prebuilt = row_create_prebuilt(indexed_table); + + indexed_table->n_mysql_handles_opened++; + + error = row_merge_drop_table(trx, innodb_table); + innodb_table = indexed_table; + goto convert_error; + + case DB_TOO_BIG_RECORD: + my_error(HA_ERR_TO_BIG_ROW, MYF(0)); + goto error; + case DB_PRIMARY_KEY_IS_NULL: + my_error(ER_PRIMARY_CANT_HAVE_NULL, MYF(0)); + /* fall through */ + case DB_DUPLICATE_KEY: +error: + prebuilt->trx->error_info = NULL; + /* fall through */ + default: + if (new_primary) { + if (indexed_table != innodb_table) { + row_merge_drop_table(trx, indexed_table); + } + } else { + if (!dict_locked) { + row_mysql_lock_data_dictionary(trx); + dict_locked = TRUE; + } + + row_merge_drop_indexes(trx, indexed_table, + index, num_created); + } + +convert_error: + error = convert_error_code_to_mysql(error, + innodb_table->flags, + user_thd); + } + + mem_heap_free(heap); + trx_commit_for_mysql(trx); + if (prebuilt->trx) { + trx_commit_for_mysql(prebuilt->trx); + } + + if (dict_locked) { + row_mysql_unlock_data_dictionary(trx); + } + + trx_free_for_mysql(trx); + + /* There might be work for utility threads.*/ + srv_active_wake_master_thread(); + + DBUG_RETURN(error); +} + +/*******************************************************************//** +Prepare to drop some indexes of a table. +@return 0 or error number */ +UNIV_INTERN +int +ha_innobase::prepare_drop_index( +/*============================*/ + TABLE* table, /*!< in: Table where indexes are dropped */ + uint* key_num, /*!< in: Key nums to be dropped */ + uint num_of_keys) /*!< in: Number of keys to be dropped */ +{ + trx_t* trx; + int err = 0; + uint n_key; + + DBUG_ENTER("ha_innobase::prepare_drop_index"); + ut_ad(table); + ut_ad(key_num); + ut_ad(num_of_keys); + if (srv_created_new_raw || srv_force_recovery) { + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } + + update_thd(); + + trx_search_latch_release_if_reserved(prebuilt->trx); + trx = prebuilt->trx; + + /* Test and mark all the indexes to be dropped */ + + row_mysql_lock_data_dictionary(trx); + + /* Check that none of the indexes have previously been flagged + for deletion. */ + { + const dict_index_t* index + = dict_table_get_first_index(prebuilt->table); + do { + ut_a(!index->to_be_dropped); + index = dict_table_get_next_index(index); + } while (index); + } + + for (n_key = 0; n_key < num_of_keys; n_key++) { + const KEY* key; + dict_index_t* index; + + key = table->key_info + key_num[n_key]; + index = dict_table_get_index_on_name_and_min_id( + prebuilt->table, key->name); + + if (!index) { + sql_print_error("InnoDB could not find key n:o %u " + "with name %s for table %s", + key_num[n_key], + key ? key->name : "NULL", + prebuilt->table->name); + + err = HA_ERR_KEY_NOT_FOUND; + goto func_exit; + } + + /* Refuse to drop the clustered index. It would be + better to automatically generate a clustered index, + but mysql_alter_table() will call this method only + after ha_innobase::add_index(). */ + + if (dict_index_is_clust(index)) { + my_error(ER_REQUIRES_PRIMARY_KEY, MYF(0)); + err = -1; + goto func_exit; + } + + index->to_be_dropped = TRUE; + } + + /* If FOREIGN_KEY_CHECK = 1 you may not drop an index defined + for a foreign key constraint because InnoDB requires that both + tables contain indexes for the constraint. Note that CREATE + INDEX id ON table does a CREATE INDEX and DROP INDEX, and we + can ignore here foreign keys because a new index for the + foreign key has already been created. + + We check for the foreign key constraints after marking the + candidate indexes for deletion, because when we check for an + equivalent foreign index we don't want to select an index that + is later deleted. */ + + if (trx->check_foreigns + && thd_sql_command(user_thd) != SQLCOM_CREATE_INDEX) { + dict_index_t* index; + + for (index = dict_table_get_first_index(prebuilt->table); + index; + index = dict_table_get_next_index(index)) { + dict_foreign_t* foreign; + + if (!index->to_be_dropped) { + + continue; + } + + /* Check if the index is referenced. */ + foreign = dict_table_get_referenced_constraint( + prebuilt->table, index); + + if (foreign) { +index_needed: + trx_set_detailed_error( + trx, + "Index needed in foreign key " + "constraint"); + + trx->error_info = index; + + err = HA_ERR_DROP_INDEX_FK; + break; + } else { + /* Check if this index references some + other table */ + foreign = dict_table_get_foreign_constraint( + prebuilt->table, index); + + if (foreign) { + ut_a(foreign->foreign_index == index); + + /* Search for an equivalent index that + the foreign key constraint could use + if this index were to be deleted. */ + if (!dict_foreign_find_equiv_index( + foreign)) { + + goto index_needed; + } + } + } + } + } else if (thd_sql_command(user_thd) == SQLCOM_CREATE_INDEX) { + /* This is a drop of a foreign key constraint index that + was created by MySQL when the constraint was added. MySQL + does this when the user creates an index explicitly which + can be used in place of the automatically generated index. */ + + dict_index_t* index; + + for (index = dict_table_get_first_index(prebuilt->table); + index; + index = dict_table_get_next_index(index)) { + dict_foreign_t* foreign; + + if (!index->to_be_dropped) { + + continue; + } + + /* Check if this index references some other table */ + foreign = dict_table_get_foreign_constraint( + prebuilt->table, index); + + if (foreign == NULL) { + + continue; + } + + ut_a(foreign->foreign_index == index); + + /* Search for an equivalent index that the + foreign key constraint could use if this index + were to be deleted. */ + + if (!dict_foreign_find_equiv_index(foreign)) { + trx_set_detailed_error( + trx, + "Index needed in foreign key " + "constraint"); + + trx->error_info = foreign->foreign_index; + + err = HA_ERR_DROP_INDEX_FK; + break; + } + } + } + +func_exit: + if (err) { + /* Undo our changes since there was some sort of error. */ + dict_index_t* index + = dict_table_get_first_index(prebuilt->table); + + do { + index->to_be_dropped = FALSE; + index = dict_table_get_next_index(index); + } while (index); + } + + row_mysql_unlock_data_dictionary(trx); + + DBUG_RETURN(err); +} + +/*******************************************************************//** +Drop the indexes that were passed to a successful prepare_drop_index(). +@return 0 or error number */ +UNIV_INTERN +int +ha_innobase::final_drop_index( +/*==========================*/ + TABLE* table) /*!< in: Table where indexes are dropped */ +{ + dict_index_t* index; /*!< Index to be dropped */ + trx_t* trx; /*!< Transaction */ + int err; + + DBUG_ENTER("ha_innobase::final_drop_index"); + ut_ad(table); + + if (srv_created_new_raw || srv_force_recovery) { + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } + + update_thd(); + + trx_search_latch_release_if_reserved(prebuilt->trx); + trx_start_if_not_started(prebuilt->trx); + + /* Create a background transaction for the operations on + the data dictionary tables. */ + trx = innobase_trx_allocate(user_thd); + trx_start_if_not_started(trx); + + /* Flag this transaction as a dictionary operation, so that + the data dictionary will be locked in crash recovery. */ + trx_set_dict_operation(trx, TRX_DICT_OP_INDEX); + + /* Lock the table exclusively, to ensure that no active + transaction depends on an index that is being dropped. */ + err = convert_error_code_to_mysql( + row_merge_lock_table(prebuilt->trx, prebuilt->table, LOCK_X), + prebuilt->table->flags, user_thd); + + row_mysql_lock_data_dictionary(trx); + + if (UNIV_UNLIKELY(err)) { + + /* Unmark the indexes to be dropped. */ + for (index = dict_table_get_first_index(prebuilt->table); + index; index = dict_table_get_next_index(index)) { + + index->to_be_dropped = FALSE; + } + + goto func_exit; + } + + /* Drop indexes marked to be dropped */ + + index = dict_table_get_first_index(prebuilt->table); + + while (index) { + dict_index_t* next_index; + + next_index = dict_table_get_next_index(index); + + if (index->to_be_dropped) { + + row_merge_drop_index(index, prebuilt->table, trx); + } + + index = next_index; + } + + /* Check that all flagged indexes were dropped. */ + for (index = dict_table_get_first_index(prebuilt->table); + index; index = dict_table_get_next_index(index)) { + ut_a(!index->to_be_dropped); + } + +#ifdef UNIV_DEBUG + dict_table_check_for_dup_indexes(prebuilt->table); +#endif + +func_exit: + trx_commit_for_mysql(trx); + trx_commit_for_mysql(prebuilt->trx); + row_mysql_unlock_data_dictionary(trx); + + /* Flush the log to reduce probability that the .frm files and + the InnoDB data dictionary get out-of-sync if the user runs + with innodb_flush_log_at_trx_commit = 0 */ + + log_buffer_flush_to_disk(); + + trx_free_for_mysql(trx); + + /* Tell the InnoDB server that there might be work for + utility threads: */ + + srv_active_wake_master_thread(); + + DBUG_RETURN(err); +} diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc new file mode 100644 index 00000000000..524fe696de2 --- /dev/null +++ b/storage/innobase/handler/i_s.cc @@ -0,0 +1,1578 @@ +/***************************************************************************** + +Copyright (c) 2007, 2009, Innobase Oy. 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 + +*****************************************************************************/ + +/**************************************************//** +@file handler/i_s.cc +InnoDB INFORMATION SCHEMA tables interface to MySQL. + +Created July 18, 2007 Vasil Dimov +*******************************************************/ + +#include <mysql_priv.h> +#include <mysqld_error.h> + +#include <m_ctype.h> +#include <hash.h> +#include <myisampack.h> +#include <mysys_err.h> +#include <my_sys.h> +#include "i_s.h" +#include <mysql/plugin.h> + +extern "C" { +#include "trx0i_s.h" +#include "trx0trx.h" /* for TRX_QUE_STATE_STR_MAX_LEN */ +#include "buf0buddy.h" /* for i_s_cmpmem */ +#include "buf0buf.h" /* for buf_pool and PAGE_ZIP_MIN_SIZE */ +#include "ha_prototypes.h" /* for innobase_convert_name() */ +#include "srv0start.h" /* for srv_was_started */ +} + +static const char plugin_author[] = "Innobase Oy"; + +#define OK(expr) \ + if ((expr) != 0) { \ + DBUG_RETURN(1); \ + } + +#define RETURN_IF_INNODB_NOT_STARTED(plugin_name) \ +do { \ + if (!srv_was_started) { \ + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, \ + ER_CANT_FIND_SYSTEM_REC, \ + "InnoDB: SELECTing from " \ + "INFORMATION_SCHEMA.%s but " \ + "the InnoDB storage engine " \ + "is not installed", plugin_name); \ + DBUG_RETURN(0); \ + } \ +} while (0) + +#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER +#define STRUCT_FLD(name, value) name: value +#else +#define STRUCT_FLD(name, value) value +#endif + +/* Don't use a static const variable here, as some C++ compilers (notably +HPUX aCC: HP ANSI C++ B3910B A.03.65) can't handle it. */ +#define END_OF_ST_FIELD_INFO \ + {STRUCT_FLD(field_name, NULL), \ + STRUCT_FLD(field_length, 0), \ + STRUCT_FLD(field_type, MYSQL_TYPE_NULL), \ + STRUCT_FLD(value, 0), \ + STRUCT_FLD(field_flags, 0), \ + STRUCT_FLD(old_name, ""), \ + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)} + +/* +Use the following types mapping: + +C type ST_FIELD_INFO::field_type +--------------------------------- +long MYSQL_TYPE_LONGLONG +(field_length=MY_INT64_NUM_DECIMAL_DIGITS) + +long unsigned MYSQL_TYPE_LONGLONG +(field_length=MY_INT64_NUM_DECIMAL_DIGITS, field_flags=MY_I_S_UNSIGNED) + +char* MYSQL_TYPE_STRING +(field_length=n) + +float MYSQL_TYPE_FLOAT +(field_length=0 is ignored) + +void* MYSQL_TYPE_LONGLONG +(field_length=MY_INT64_NUM_DECIMAL_DIGITS, field_flags=MY_I_S_UNSIGNED) + +boolean (if else) MYSQL_TYPE_LONG +(field_length=1) + +time_t MYSQL_TYPE_DATETIME +(field_length=0 ignored) +--------------------------------- +*/ + +/* XXX these are defined in mysql_priv.h inside #ifdef MYSQL_SERVER */ +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); + +/*******************************************************************//** +Common function to fill any of the dynamic tables: +INFORMATION_SCHEMA.innodb_trx +INFORMATION_SCHEMA.innodb_locks +INFORMATION_SCHEMA.innodb_lock_waits +@return 0 on success */ +static +int +trx_i_s_common_fill_table( +/*======================*/ + THD* thd, /*!< in: thread */ + TABLE_LIST* tables, /*!< in/out: tables to fill */ + COND* cond); /*!< in: condition (not used) */ + +/*******************************************************************//** +Unbind a dynamic INFORMATION_SCHEMA table. +@return 0 on success */ +static +int +i_s_common_deinit( +/*==============*/ + void* p); /*!< in/out: table schema object */ + +/*******************************************************************//** +Auxiliary function to store time_t value in MYSQL_TYPE_DATETIME +field. +@return 0 on success */ +static +int +field_store_time_t( +/*===============*/ + Field* field, /*!< in/out: target field for storage */ + time_t time) /*!< in: value to store */ +{ + MYSQL_TIME my_time; + struct tm tm_time; + +#if 0 + /* use this if you are sure that `variables' and `time_zone' + are always initialized */ + thd->variables.time_zone->gmt_sec_to_TIME( + &my_time, (my_time_t) time); +#else + localtime_r(&time, &tm_time); + localtime_to_TIME(&my_time, &tm_time); + my_time.time_type = MYSQL_TIMESTAMP_DATETIME; +#endif + + return(field->store_time(&my_time, MYSQL_TIMESTAMP_DATETIME)); +} + +/*******************************************************************//** +Auxiliary function to store char* value in MYSQL_TYPE_STRING field. +@return 0 on success */ +static +int +field_store_string( +/*===============*/ + Field* field, /*!< in/out: target field for storage */ + const char* str) /*!< in: NUL-terminated utf-8 string, + or NULL */ +{ + int ret; + + if (str != NULL) { + + ret = field->store(str, strlen(str), + system_charset_info); + field->set_notnull(); + } else { + + ret = 0; /* success */ + field->set_null(); + } + + return(ret); +} + +/*******************************************************************//** +Auxiliary function to store ulint value in MYSQL_TYPE_LONGLONG field. +If the value is ULINT_UNDEFINED then the field it set to NULL. +@return 0 on success */ +static +int +field_store_ulint( +/*==============*/ + Field* field, /*!< in/out: target field for storage */ + ulint n) /*!< in: value to store */ +{ + int ret; + + if (n != ULINT_UNDEFINED) { + + ret = field->store(n); + field->set_notnull(); + } else { + + ret = 0; /* success */ + field->set_null(); + } + + return(ret); +} + +/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_trx */ +static ST_FIELD_INFO innodb_trx_fields_info[] = +{ +#define IDX_TRX_ID 0 + {STRUCT_FLD(field_name, "trx_id"), + STRUCT_FLD(field_length, TRX_ID_MAX_LEN + 1), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_TRX_STATE 1 + {STRUCT_FLD(field_name, "trx_state"), + STRUCT_FLD(field_length, TRX_QUE_STATE_STR_MAX_LEN + 1), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_TRX_STARTED 2 + {STRUCT_FLD(field_name, "trx_started"), + STRUCT_FLD(field_length, 0), + STRUCT_FLD(field_type, MYSQL_TYPE_DATETIME), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_TRX_REQUESTED_LOCK_ID 3 + {STRUCT_FLD(field_name, "trx_requested_lock_id"), + STRUCT_FLD(field_length, TRX_I_S_LOCK_ID_MAX_LEN + 1), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_TRX_WAIT_STARTED 4 + {STRUCT_FLD(field_name, "trx_wait_started"), + STRUCT_FLD(field_length, 0), + STRUCT_FLD(field_type, MYSQL_TYPE_DATETIME), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_TRX_WEIGHT 5 + {STRUCT_FLD(field_name, "trx_weight"), + STRUCT_FLD(field_length, MY_INT64_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, MY_I_S_UNSIGNED), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_TRX_MYSQL_THREAD_ID 6 + {STRUCT_FLD(field_name, "trx_mysql_thread_id"), + STRUCT_FLD(field_length, MY_INT64_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, MY_I_S_UNSIGNED), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_TRX_QUERY 7 + {STRUCT_FLD(field_name, "trx_query"), + STRUCT_FLD(field_length, TRX_I_S_TRX_QUERY_MAX_LEN), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + END_OF_ST_FIELD_INFO +}; + +/*******************************************************************//** +Read data from cache buffer and fill the INFORMATION_SCHEMA.innodb_trx +table with it. +@return 0 on success */ +static +int +fill_innodb_trx_from_cache( +/*=======================*/ + trx_i_s_cache_t* cache, /*!< in: cache to read from */ + THD* thd, /*!< in: used to call + schema_table_store_record() */ + TABLE* table) /*!< in/out: fill this table */ +{ + Field** fields; + ulint rows_num; + char lock_id[TRX_I_S_LOCK_ID_MAX_LEN + 1]; + ulint i; + + DBUG_ENTER("fill_innodb_trx_from_cache"); + + fields = table->field; + + rows_num = trx_i_s_cache_get_rows_used(cache, + I_S_INNODB_TRX); + + for (i = 0; i < rows_num; i++) { + + i_s_trx_row_t* row; + char trx_id[TRX_ID_MAX_LEN + 1]; + + row = (i_s_trx_row_t*) + trx_i_s_cache_get_nth_row( + cache, I_S_INNODB_TRX, i); + + /* trx_id */ + ut_snprintf(trx_id, sizeof(trx_id), TRX_ID_FMT, row->trx_id); + OK(field_store_string(fields[IDX_TRX_ID], trx_id)); + + /* trx_state */ + OK(field_store_string(fields[IDX_TRX_STATE], + row->trx_state)); + + /* trx_started */ + OK(field_store_time_t(fields[IDX_TRX_STARTED], + (time_t) row->trx_started)); + + /* trx_requested_lock_id */ + /* trx_wait_started */ + if (row->trx_wait_started != 0) { + + OK(field_store_string( + fields[IDX_TRX_REQUESTED_LOCK_ID], + trx_i_s_create_lock_id( + row->requested_lock_row, + lock_id, sizeof(lock_id)))); + /* field_store_string() sets it no notnull */ + + OK(field_store_time_t( + fields[IDX_TRX_WAIT_STARTED], + (time_t) row->trx_wait_started)); + fields[IDX_TRX_WAIT_STARTED]->set_notnull(); + } else { + + fields[IDX_TRX_REQUESTED_LOCK_ID]->set_null(); + fields[IDX_TRX_WAIT_STARTED]->set_null(); + } + + /* trx_weight */ + OK(fields[IDX_TRX_WEIGHT]->store((longlong) row->trx_weight, + true)); + + /* trx_mysql_thread_id */ + OK(fields[IDX_TRX_MYSQL_THREAD_ID]->store( + row->trx_mysql_thread_id)); + + /* trx_query */ + OK(field_store_string(fields[IDX_TRX_QUERY], + row->trx_query)); + + OK(schema_table_store_record(thd, table)); + } + + DBUG_RETURN(0); +} + +/*******************************************************************//** +Bind the dynamic table INFORMATION_SCHEMA.innodb_trx +@return 0 on success */ +static +int +innodb_trx_init( +/*============*/ + void* p) /*!< in/out: table schema object */ +{ + ST_SCHEMA_TABLE* schema; + + DBUG_ENTER("innodb_trx_init"); + + schema = (ST_SCHEMA_TABLE*) p; + + schema->fields_info = innodb_trx_fields_info; + schema->fill_table = trx_i_s_common_fill_table; + + DBUG_RETURN(0); +} + +static struct st_mysql_information_schema i_s_info = +{ + MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION +}; + +UNIV_INTERN struct st_mysql_plugin i_s_innodb_trx = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_TRX"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB transactions"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, innodb_trx_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* reserved for dependency checking */ + /* void* */ + STRUCT_FLD(__reserved1, NULL) +}; + +/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */ +static ST_FIELD_INFO innodb_locks_fields_info[] = +{ +#define IDX_LOCK_ID 0 + {STRUCT_FLD(field_name, "lock_id"), + STRUCT_FLD(field_length, TRX_I_S_LOCK_ID_MAX_LEN + 1), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_LOCK_TRX_ID 1 + {STRUCT_FLD(field_name, "lock_trx_id"), + STRUCT_FLD(field_length, TRX_ID_MAX_LEN + 1), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_LOCK_MODE 2 + {STRUCT_FLD(field_name, "lock_mode"), + /* S[,GAP] X[,GAP] IS[,GAP] IX[,GAP] AUTO_INC UNKNOWN */ + STRUCT_FLD(field_length, 32), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_LOCK_TYPE 3 + {STRUCT_FLD(field_name, "lock_type"), + STRUCT_FLD(field_length, 32 /* RECORD|TABLE|UNKNOWN */), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_LOCK_TABLE 4 + {STRUCT_FLD(field_name, "lock_table"), + STRUCT_FLD(field_length, 1024), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_LOCK_INDEX 5 + {STRUCT_FLD(field_name, "lock_index"), + STRUCT_FLD(field_length, 1024), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_LOCK_SPACE 6 + {STRUCT_FLD(field_name, "lock_space"), + STRUCT_FLD(field_length, MY_INT64_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_LOCK_PAGE 7 + {STRUCT_FLD(field_name, "lock_page"), + STRUCT_FLD(field_length, MY_INT64_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_LOCK_REC 8 + {STRUCT_FLD(field_name, "lock_rec"), + STRUCT_FLD(field_length, MY_INT64_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_LOCK_DATA 9 + {STRUCT_FLD(field_name, "lock_data"), + STRUCT_FLD(field_length, TRX_I_S_LOCK_DATA_MAX_LEN), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, MY_I_S_MAYBE_NULL), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + END_OF_ST_FIELD_INFO +}; + +/*******************************************************************//** +Read data from cache buffer and fill the INFORMATION_SCHEMA.innodb_locks +table with it. +@return 0 on success */ +static +int +fill_innodb_locks_from_cache( +/*=========================*/ + trx_i_s_cache_t* cache, /*!< in: cache to read from */ + THD* thd, /*!< in: MySQL client connection */ + TABLE* table) /*!< in/out: fill this table */ +{ + Field** fields; + ulint rows_num; + char lock_id[TRX_I_S_LOCK_ID_MAX_LEN + 1]; + ulint i; + + DBUG_ENTER("fill_innodb_locks_from_cache"); + + fields = table->field; + + rows_num = trx_i_s_cache_get_rows_used(cache, + I_S_INNODB_LOCKS); + + for (i = 0; i < rows_num; i++) { + + i_s_locks_row_t* row; + + /* note that the decoded database or table name is + never expected to be longer than NAME_LEN; + NAME_LEN for database name + 2 for surrounding quotes around database name + NAME_LEN for table name + 2 for surrounding quotes around table name + 1 for the separating dot (.) + 9 for the #mysql50# prefix */ + char buf[2 * NAME_LEN + 14]; + const char* bufend; + + char lock_trx_id[TRX_ID_MAX_LEN + 1]; + + row = (i_s_locks_row_t*) + trx_i_s_cache_get_nth_row( + cache, I_S_INNODB_LOCKS, i); + + /* lock_id */ + trx_i_s_create_lock_id(row, lock_id, sizeof(lock_id)); + OK(field_store_string(fields[IDX_LOCK_ID], + lock_id)); + + /* lock_trx_id */ + ut_snprintf(lock_trx_id, sizeof(lock_trx_id), + TRX_ID_FMT, row->lock_trx_id); + OK(field_store_string(fields[IDX_LOCK_TRX_ID], lock_trx_id)); + + /* lock_mode */ + OK(field_store_string(fields[IDX_LOCK_MODE], + row->lock_mode)); + + /* lock_type */ + OK(field_store_string(fields[IDX_LOCK_TYPE], + row->lock_type)); + + /* lock_table */ + bufend = innobase_convert_name(buf, sizeof(buf), + row->lock_table, + strlen(row->lock_table), + thd, TRUE); + OK(fields[IDX_LOCK_TABLE]->store(buf, bufend - buf, + system_charset_info)); + + /* lock_index */ + if (row->lock_index != NULL) { + + bufend = innobase_convert_name(buf, sizeof(buf), + row->lock_index, + strlen(row->lock_index), + thd, FALSE); + OK(fields[IDX_LOCK_INDEX]->store(buf, bufend - buf, + system_charset_info)); + fields[IDX_LOCK_INDEX]->set_notnull(); + } else { + + fields[IDX_LOCK_INDEX]->set_null(); + } + + /* lock_space */ + OK(field_store_ulint(fields[IDX_LOCK_SPACE], + row->lock_space)); + + /* lock_page */ + OK(field_store_ulint(fields[IDX_LOCK_PAGE], + row->lock_page)); + + /* lock_rec */ + OK(field_store_ulint(fields[IDX_LOCK_REC], + row->lock_rec)); + + /* lock_data */ + OK(field_store_string(fields[IDX_LOCK_DATA], + row->lock_data)); + + OK(schema_table_store_record(thd, table)); + } + + DBUG_RETURN(0); +} + +/*******************************************************************//** +Bind the dynamic table INFORMATION_SCHEMA.innodb_locks +@return 0 on success */ +static +int +innodb_locks_init( +/*==============*/ + void* p) /*!< in/out: table schema object */ +{ + ST_SCHEMA_TABLE* schema; + + DBUG_ENTER("innodb_locks_init"); + + schema = (ST_SCHEMA_TABLE*) p; + + schema->fields_info = innodb_locks_fields_info; + schema->fill_table = trx_i_s_common_fill_table; + + DBUG_RETURN(0); +} + +UNIV_INTERN struct st_mysql_plugin i_s_innodb_locks = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_LOCKS"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB conflicting locks"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, innodb_locks_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* reserved for dependency checking */ + /* void* */ + STRUCT_FLD(__reserved1, NULL) +}; + +/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */ +static ST_FIELD_INFO innodb_lock_waits_fields_info[] = +{ +#define IDX_REQUESTING_TRX_ID 0 + {STRUCT_FLD(field_name, "requesting_trx_id"), + STRUCT_FLD(field_length, TRX_ID_MAX_LEN + 1), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_REQUESTED_LOCK_ID 1 + {STRUCT_FLD(field_name, "requested_lock_id"), + STRUCT_FLD(field_length, TRX_I_S_LOCK_ID_MAX_LEN + 1), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_BLOCKING_TRX_ID 2 + {STRUCT_FLD(field_name, "blocking_trx_id"), + STRUCT_FLD(field_length, TRX_ID_MAX_LEN + 1), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + +#define IDX_BLOCKING_LOCK_ID 3 + {STRUCT_FLD(field_name, "blocking_lock_id"), + STRUCT_FLD(field_length, TRX_I_S_LOCK_ID_MAX_LEN + 1), + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, ""), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + END_OF_ST_FIELD_INFO +}; + +/*******************************************************************//** +Read data from cache buffer and fill the +INFORMATION_SCHEMA.innodb_lock_waits table with it. +@return 0 on success */ +static +int +fill_innodb_lock_waits_from_cache( +/*==============================*/ + trx_i_s_cache_t* cache, /*!< in: cache to read from */ + THD* thd, /*!< in: used to call + schema_table_store_record() */ + TABLE* table) /*!< in/out: fill this table */ +{ + Field** fields; + ulint rows_num; + char requested_lock_id[TRX_I_S_LOCK_ID_MAX_LEN + 1]; + char blocking_lock_id[TRX_I_S_LOCK_ID_MAX_LEN + 1]; + ulint i; + + DBUG_ENTER("fill_innodb_lock_waits_from_cache"); + + fields = table->field; + + rows_num = trx_i_s_cache_get_rows_used(cache, + I_S_INNODB_LOCK_WAITS); + + for (i = 0; i < rows_num; i++) { + + i_s_lock_waits_row_t* row; + + char requesting_trx_id[TRX_ID_MAX_LEN + 1]; + char blocking_trx_id[TRX_ID_MAX_LEN + 1]; + + row = (i_s_lock_waits_row_t*) + trx_i_s_cache_get_nth_row( + cache, I_S_INNODB_LOCK_WAITS, i); + + /* requesting_trx_id */ + ut_snprintf(requesting_trx_id, sizeof(requesting_trx_id), + TRX_ID_FMT, row->requested_lock_row->lock_trx_id); + OK(field_store_string(fields[IDX_REQUESTING_TRX_ID], + requesting_trx_id)); + + /* requested_lock_id */ + OK(field_store_string( + fields[IDX_REQUESTED_LOCK_ID], + trx_i_s_create_lock_id( + row->requested_lock_row, + requested_lock_id, + sizeof(requested_lock_id)))); + + /* blocking_trx_id */ + ut_snprintf(blocking_trx_id, sizeof(blocking_trx_id), + TRX_ID_FMT, row->blocking_lock_row->lock_trx_id); + OK(field_store_string(fields[IDX_BLOCKING_TRX_ID], + blocking_trx_id)); + + /* blocking_lock_id */ + OK(field_store_string( + fields[IDX_BLOCKING_LOCK_ID], + trx_i_s_create_lock_id( + row->blocking_lock_row, + blocking_lock_id, + sizeof(blocking_lock_id)))); + + OK(schema_table_store_record(thd, table)); + } + + DBUG_RETURN(0); +} + +/*******************************************************************//** +Bind the dynamic table INFORMATION_SCHEMA.innodb_lock_waits +@return 0 on success */ +static +int +innodb_lock_waits_init( +/*===================*/ + void* p) /*!< in/out: table schema object */ +{ + ST_SCHEMA_TABLE* schema; + + DBUG_ENTER("innodb_lock_waits_init"); + + schema = (ST_SCHEMA_TABLE*) p; + + schema->fields_info = innodb_lock_waits_fields_info; + schema->fill_table = trx_i_s_common_fill_table; + + DBUG_RETURN(0); +} + +UNIV_INTERN struct st_mysql_plugin i_s_innodb_lock_waits = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_LOCK_WAITS"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, "Innobase Oy"), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB which lock is blocking which"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, innodb_lock_waits_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* reserved for dependency checking */ + /* void* */ + STRUCT_FLD(__reserved1, NULL) +}; + +/*******************************************************************//** +Common function to fill any of the dynamic tables: +INFORMATION_SCHEMA.innodb_trx +INFORMATION_SCHEMA.innodb_locks +INFORMATION_SCHEMA.innodb_lock_waits +@return 0 on success */ +static +int +trx_i_s_common_fill_table( +/*======================*/ + THD* thd, /*!< in: thread */ + TABLE_LIST* tables, /*!< in/out: tables to fill */ + COND* cond) /*!< in: condition (not used) */ +{ + const char* table_name; + int ret; + trx_i_s_cache_t* cache; + + DBUG_ENTER("trx_i_s_common_fill_table"); + + /* deny access to non-superusers */ + if (check_global_access(thd, PROCESS_ACL)) { + + DBUG_RETURN(0); + } + + /* minimize the number of places where global variables are + referenced */ + cache = trx_i_s_cache; + + /* which table we have to fill? */ + table_name = tables->schema_table_name; + /* or table_name = tables->schema_table->table_name; */ + + RETURN_IF_INNODB_NOT_STARTED(table_name); + + /* update the cache */ + trx_i_s_cache_start_write(cache); + trx_i_s_possibly_fetch_data_into_cache(cache); + trx_i_s_cache_end_write(cache); + + if (trx_i_s_cache_is_truncated(cache)) { + + /* XXX show warning to user if possible */ + fprintf(stderr, "Warning: data in %s truncated due to " + "memory limit of %d bytes\n", table_name, + TRX_I_S_MEM_LIMIT); + } + + ret = 0; + + trx_i_s_cache_start_read(cache); + + if (innobase_strcasecmp(table_name, "innodb_trx") == 0) { + + if (fill_innodb_trx_from_cache( + cache, thd, tables->table) != 0) { + + ret = 1; + } + + } else if (innobase_strcasecmp(table_name, "innodb_locks") == 0) { + + if (fill_innodb_locks_from_cache( + cache, thd, tables->table) != 0) { + + ret = 1; + } + + } else if (innobase_strcasecmp(table_name, "innodb_lock_waits") == 0) { + + if (fill_innodb_lock_waits_from_cache( + cache, thd, tables->table) != 0) { + + ret = 1; + } + + } else { + + /* huh! what happened!? */ + fprintf(stderr, + "InnoDB: trx_i_s_common_fill_table() was " + "called to fill unknown table: %s.\n" + "This function only knows how to fill " + "innodb_trx, innodb_locks and " + "innodb_lock_waits tables.\n", table_name); + + ret = 1; + } + + trx_i_s_cache_end_read(cache); + +#if 0 + DBUG_RETURN(ret); +#else + /* if this function returns something else than 0 then a + deadlock occurs between the mysqld server and mysql client, + see http://bugs.mysql.com/29900 ; when that bug is resolved + we can enable the DBUG_RETURN(ret) above */ + DBUG_RETURN(0); +#endif +} + +/* Fields of the dynamic table information_schema.innodb_cmp. */ +static ST_FIELD_INFO i_s_cmp_fields_info[] = +{ + {STRUCT_FLD(field_name, "page_size"), + STRUCT_FLD(field_length, 5), + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Compressed Page Size"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + {STRUCT_FLD(field_name, "compress_ops"), + STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Total Number of Compressions"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + {STRUCT_FLD(field_name, "compress_ops_ok"), + STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Total Number of" + " Successful Compressions"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + {STRUCT_FLD(field_name, "compress_time"), + STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Total Duration of Compressions," + " in Seconds"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + {STRUCT_FLD(field_name, "uncompress_ops"), + STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Total Number of Decompressions"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + {STRUCT_FLD(field_name, "uncompress_time"), + STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Total Duration of Decompressions," + " in Seconds"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + END_OF_ST_FIELD_INFO +}; + + +/*******************************************************************//** +Fill the dynamic table information_schema.innodb_cmp or +innodb_cmp_reset. +@return 0 on success, 1 on failure */ +static +int +i_s_cmp_fill_low( +/*=============*/ + THD* thd, /*!< in: thread */ + TABLE_LIST* tables, /*!< in/out: tables to fill */ + COND* cond, /*!< in: condition (ignored) */ + ibool reset) /*!< in: TRUE=reset cumulated counts */ +{ + TABLE* table = (TABLE *) tables->table; + int status = 0; + + DBUG_ENTER("i_s_cmp_fill_low"); + + /* deny access to non-superusers */ + if (check_global_access(thd, PROCESS_ACL)) { + + DBUG_RETURN(0); + } + + RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); + + for (uint i = 0; i < PAGE_ZIP_NUM_SSIZE - 1; i++) { + page_zip_stat_t* zip_stat = &page_zip_stat[i]; + + table->field[0]->store(PAGE_ZIP_MIN_SIZE << i); + + /* The cumulated counts are not protected by any + mutex. Thus, some operation in page0zip.c could + increment a counter between the time we read it and + clear it. We could introduce mutex protection, but it + could cause a measureable performance hit in + page0zip.c. */ + table->field[1]->store(zip_stat->compressed); + table->field[2]->store(zip_stat->compressed_ok); + table->field[3]->store( + (ulong) (zip_stat->compressed_usec / 1000000)); + table->field[4]->store(zip_stat->decompressed); + table->field[5]->store( + (ulong) (zip_stat->decompressed_usec / 1000000)); + + if (reset) { + memset(zip_stat, 0, sizeof *zip_stat); + } + + if (schema_table_store_record(thd, table)) { + status = 1; + break; + } + } + + DBUG_RETURN(status); +} + +/*******************************************************************//** +Fill the dynamic table information_schema.innodb_cmp. +@return 0 on success, 1 on failure */ +static +int +i_s_cmp_fill( +/*=========*/ + THD* thd, /*!< in: thread */ + TABLE_LIST* tables, /*!< in/out: tables to fill */ + COND* cond) /*!< in: condition (ignored) */ +{ + return(i_s_cmp_fill_low(thd, tables, cond, FALSE)); +} + +/*******************************************************************//** +Fill the dynamic table information_schema.innodb_cmp_reset. +@return 0 on success, 1 on failure */ +static +int +i_s_cmp_reset_fill( +/*===============*/ + THD* thd, /*!< in: thread */ + TABLE_LIST* tables, /*!< in/out: tables to fill */ + COND* cond) /*!< in: condition (ignored) */ +{ + return(i_s_cmp_fill_low(thd, tables, cond, TRUE)); +} + +/*******************************************************************//** +Bind the dynamic table information_schema.innodb_cmp. +@return 0 on success */ +static +int +i_s_cmp_init( +/*=========*/ + void* p) /*!< in/out: table schema object */ +{ + DBUG_ENTER("i_s_cmp_init"); + ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p; + + schema->fields_info = i_s_cmp_fields_info; + schema->fill_table = i_s_cmp_fill; + + DBUG_RETURN(0); +} + +/*******************************************************************//** +Bind the dynamic table information_schema.innodb_cmp_reset. +@return 0 on success */ +static +int +i_s_cmp_reset_init( +/*===============*/ + void* p) /*!< in/out: table schema object */ +{ + DBUG_ENTER("i_s_cmp_reset_init"); + ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p; + + schema->fields_info = i_s_cmp_fields_info; + schema->fill_table = i_s_cmp_reset_fill; + + DBUG_RETURN(0); +} + +UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmp = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMP"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compression"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmp_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* reserved for dependency checking */ + /* void* */ + STRUCT_FLD(__reserved1, NULL) +}; + +UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmp_reset = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMP_RESET"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compression;" + " reset cumulated counts"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmp_reset_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* reserved for dependency checking */ + /* void* */ + STRUCT_FLD(__reserved1, NULL) +}; + +/* Fields of the dynamic table information_schema.innodb_cmpmem. */ +static ST_FIELD_INFO i_s_cmpmem_fields_info[] = +{ + {STRUCT_FLD(field_name, "page_size"), + STRUCT_FLD(field_length, 5), + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Buddy Block Size"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + {STRUCT_FLD(field_name, "pages_used"), + STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Currently in Use"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + {STRUCT_FLD(field_name, "pages_free"), + STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Currently Available"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + {STRUCT_FLD(field_name, "relocation_ops"), + STRUCT_FLD(field_length, MY_INT64_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Total Number of Relocations"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + {STRUCT_FLD(field_name, "relocation_time"), + STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS), + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), + STRUCT_FLD(value, 0), + STRUCT_FLD(field_flags, 0), + STRUCT_FLD(old_name, "Total Duration of Relocations," + " in Seconds"), + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, + + END_OF_ST_FIELD_INFO +}; + +/*******************************************************************//** +Fill the dynamic table information_schema.innodb_cmpmem or +innodb_cmpmem_reset. +@return 0 on success, 1 on failure */ +static +int +i_s_cmpmem_fill_low( +/*================*/ + THD* thd, /*!< in: thread */ + TABLE_LIST* tables, /*!< in/out: tables to fill */ + COND* cond, /*!< in: condition (ignored) */ + ibool reset) /*!< in: TRUE=reset cumulated counts */ +{ + TABLE* table = (TABLE *) tables->table; + int status = 0; + + DBUG_ENTER("i_s_cmpmem_fill_low"); + + /* deny access to non-superusers */ + if (check_global_access(thd, PROCESS_ACL)) { + + DBUG_RETURN(0); + } + + RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); + + buf_pool_mutex_enter(); + + for (uint x = 0; x <= BUF_BUDDY_SIZES; x++) { + buf_buddy_stat_t* buddy_stat = &buf_buddy_stat[x]; + + table->field[0]->store(BUF_BUDDY_LOW << x); + table->field[1]->store(buddy_stat->used); + table->field[2]->store(UNIV_LIKELY(x < BUF_BUDDY_SIZES) + ? UT_LIST_GET_LEN(buf_pool->zip_free[x]) + : 0); + table->field[3]->store((longlong) buddy_stat->relocated, true); + table->field[4]->store( + (ulong) (buddy_stat->relocated_usec / 1000000)); + + if (reset) { + /* This is protected by buf_pool_mutex. */ + buddy_stat->relocated = 0; + buddy_stat->relocated_usec = 0; + } + + if (schema_table_store_record(thd, table)) { + status = 1; + break; + } + } + + buf_pool_mutex_exit(); + DBUG_RETURN(status); +} + +/*******************************************************************//** +Fill the dynamic table information_schema.innodb_cmpmem. +@return 0 on success, 1 on failure */ +static +int +i_s_cmpmem_fill( +/*============*/ + THD* thd, /*!< in: thread */ + TABLE_LIST* tables, /*!< in/out: tables to fill */ + COND* cond) /*!< in: condition (ignored) */ +{ + return(i_s_cmpmem_fill_low(thd, tables, cond, FALSE)); +} + +/*******************************************************************//** +Fill the dynamic table information_schema.innodb_cmpmem_reset. +@return 0 on success, 1 on failure */ +static +int +i_s_cmpmem_reset_fill( +/*==================*/ + THD* thd, /*!< in: thread */ + TABLE_LIST* tables, /*!< in/out: tables to fill */ + COND* cond) /*!< in: condition (ignored) */ +{ + return(i_s_cmpmem_fill_low(thd, tables, cond, TRUE)); +} + +/*******************************************************************//** +Bind the dynamic table information_schema.innodb_cmpmem. +@return 0 on success */ +static +int +i_s_cmpmem_init( +/*============*/ + void* p) /*!< in/out: table schema object */ +{ + DBUG_ENTER("i_s_cmpmem_init"); + ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p; + + schema->fields_info = i_s_cmpmem_fields_info; + schema->fill_table = i_s_cmpmem_fill; + + DBUG_RETURN(0); +} + +/*******************************************************************//** +Bind the dynamic table information_schema.innodb_cmpmem_reset. +@return 0 on success */ +static +int +i_s_cmpmem_reset_init( +/*==================*/ + void* p) /*!< in/out: table schema object */ +{ + DBUG_ENTER("i_s_cmpmem_reset_init"); + ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p; + + schema->fields_info = i_s_cmpmem_fields_info; + schema->fill_table = i_s_cmpmem_reset_fill; + + DBUG_RETURN(0); +} + +UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmpmem = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMPMEM"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compressed buffer pool"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmpmem_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* reserved for dependency checking */ + /* void* */ + STRUCT_FLD(__reserved1, NULL) +}; + +UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmpmem_reset = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMPMEM_RESET"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compressed buffer pool;" + " reset cumulated counts"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmpmem_reset_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* reserved for dependency checking */ + /* void* */ + STRUCT_FLD(__reserved1, NULL) +}; + +/*******************************************************************//** +Unbind a dynamic INFORMATION_SCHEMA table. +@return 0 on success */ +static +int +i_s_common_deinit( +/*==============*/ + void* p) /*!< in/out: table schema object */ +{ + DBUG_ENTER("i_s_common_deinit"); + + /* Do nothing */ + + DBUG_RETURN(0); +} diff --git a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h new file mode 100644 index 00000000000..402c88bbedb --- /dev/null +++ b/storage/innobase/handler/i_s.h @@ -0,0 +1,37 @@ +/***************************************************************************** + +Copyright (c) 2007, 2009, Innobase Oy. 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 + +*****************************************************************************/ + +/**************************************************//** +@file handler/i_s.h +InnoDB INFORMATION SCHEMA tables interface to MySQL. + +Created July 18, 2007 Vasil Dimov +*******************************************************/ + +#ifndef i_s_h +#define i_s_h + +extern struct st_mysql_plugin i_s_innodb_trx; +extern struct st_mysql_plugin i_s_innodb_locks; +extern struct st_mysql_plugin i_s_innodb_lock_waits; +extern struct st_mysql_plugin i_s_innodb_cmp; +extern struct st_mysql_plugin i_s_innodb_cmp_reset; +extern struct st_mysql_plugin i_s_innodb_cmpmem; +extern struct st_mysql_plugin i_s_innodb_cmpmem_reset; + +#endif /* i_s_h */ diff --git a/storage/innobase/handler/mysql_addons.cc b/storage/innobase/handler/mysql_addons.cc new file mode 100644 index 00000000000..eae1fe9fbc2 --- /dev/null +++ b/storage/innobase/handler/mysql_addons.cc @@ -0,0 +1,42 @@ +/***************************************************************************** + +Copyright (c) 2007, 2009, Innobase Oy. 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 + +*****************************************************************************/ + +/**************************************************//** +@file handler/mysql_addons.cc +This file contains functions that need to be added to +MySQL code but have not been added yet. + +Whenever you add a function here submit a MySQL bug +report (feature request) with the implementation. Then +write the bug number in the comment before the +function in this file. + +When MySQL commits the function it can be deleted from +here. In a perfect world this file exists but is empty. + +Created November 07, 2007 Vasil Dimov +*******************************************************/ + +#ifndef MYSQL_SERVER +#define MYSQL_SERVER +#endif /* MYSQL_SERVER */ + +#include <mysql_priv.h> + +#include "mysql_addons.h" +#include "univ.i" |