2005-03-15 23:34:15 +01:00
|
|
|
/* Copyright (C) 2000-2005 MySQL AB && Innobase Oy
|
2000-12-06 00:54:17 +01:00
|
|
|
|
|
|
|
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; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
2001-02-17 13:19:19 +01:00
|
|
|
|
2000-12-06 00:54:17 +01:00
|
|
|
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.
|
2001-02-17 13:19:19 +01:00
|
|
|
|
2000-12-06 00:54:17 +01:00
|
|
|
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 */
|
|
|
|
|
2002-01-12 14:42:54 +01:00
|
|
|
/*
|
|
|
|
This file is based on ha_berkeley.h of MySQL distribution
|
|
|
|
|
|
|
|
This file defines the Innodb handler: the interface between MySQL and
|
|
|
|
Innodb
|
|
|
|
*/
|
|
|
|
|
2000-12-06 00:54:17 +01:00
|
|
|
#ifdef __GNUC__
|
|
|
|
#pragma interface /* gcc class implementation */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
typedef struct st_innobase_share {
|
|
|
|
THR_LOCK lock;
|
|
|
|
pthread_mutex_t mutex;
|
|
|
|
char *table_name;
|
|
|
|
uint table_name_length,use_count;
|
|
|
|
} INNOBASE_SHARE;
|
|
|
|
|
2003-10-07 16:28:59 +02:00
|
|
|
|
sql/ha_innodb.cc
enabled query cache for ndb
modified engine interface somewhat
sql/ha_innodb.h
enabled query cache for ndb
modified engine interface somewhat
sql/ha_ndbcluster.cc
enabled query cache for ndb
modified engine interface somewhat
ndb will only allow caching and retrieval if running autocommit
- return false, but do not invalidate
commit count is used as engine data, i.e.
- store commit count before store of cache
- allow retrieval if commit count has not changed on a table
- invalidate if commit count has changed
sql/ha_ndbcluster.h
enabled query cache for ndb
modified engine interface somewhat
sql/handler.cc
enabled query cache for ndb
modified engine interface somewhat
sql/handler.h
enabled query cache for ndb
modified engine interface somewhat
new virtual handler method cached_table_registration called on each table before alowing store in query cache
- return TRUE - ok to cache, FALSE - not allowed to cache, invalidate queries if engine_data below has changed
- sets ulonglong (engine_data) that is stored in query cache for each table
- sets callback to be called for each table before usage of cached query, callback = 0 -> no check later
sql/mysql_priv.h
enabled query cache for ndb
modified engine interface somewhat
callcack prototype for callback to engine before query cache retrieval
sql/sql_cache.cc
enabled query cache for ndb
modified engine interface somewhat
if callback is set on table in cache, do callback to check if allowed to use cache
if not allowed to use cache, check if engine_data has changed, if so, invalidate all queries with that table
+ changes to store and pass callback and engine_data around
sql/sql_cache.h
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
sql/table.h
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
sql/ha_innodb.cc:
enabled query cache for ndb
modified engine interface somewhat
sql/ha_innodb.h:
enabled query cache for ndb
modified engine interface somewhat
sql/ha_ndbcluster.cc:
enabled query cache for ndb
modified engine interface somewhat
ndb will only allow caching and retrieval if running autocommit
- return false, but do not invalidate
commit count is used as engine data, i.e.
- store commit count before store of cache
- allow retrieval if commit count has not changed on a table
- invalidate if commit count has changed
sql/ha_ndbcluster.h:
enabled query cache for ndb
modified engine interface somewhat
sql/handler.cc:
enabled query cache for ndb
modified engine interface somewhat
sql/handler.h:
enabled query cache for ndb
modified engine interface somewhat
new virtual handler method cached_table_registration called on each table before alowing store in query cache
- return TRUE - ok to cache, FALSE - not allowed to cache, invalidate queries if engine_data below has changed
- sets ulonglong (engine_data) that is stored in query cache for each table
- sets callback to be called for each table before usage of cached query, callback = 0 -> no check later
sql/mysql_priv.h:
enabled query cache for ndb
modified engine interface somewhat
callcack prototype for callback to engine before query cache retrieval
sql/sql_cache.cc:
enabled query cache for ndb
modified engine interface somewhat
if callback is set on table in cache, do callback to check if allowed to use cache
if not allowed to use cache, check if engine_data has changed, if so, invalidate all queries with that table
+ changes to store and pass callback and engine_data around
sql/sql_cache.h:
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
sql/table.h:
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
2004-11-24 12:56:51 +01:00
|
|
|
my_bool innobase_query_caching_of_table_permitted(THD* thd, char* full_name,
|
|
|
|
uint full_name_len,
|
|
|
|
ulonglong *unused);
|
|
|
|
|
2002-01-12 14:42:54 +01:00
|
|
|
/* The class defining a handle to an Innodb table */
|
2000-12-06 00:54:17 +01:00
|
|
|
class ha_innobase: public handler
|
|
|
|
{
|
2005-03-15 23:34:15 +01:00
|
|
|
void* innobase_prebuilt;/* (row_prebuilt_t*) prebuilt
|
|
|
|
struct in InnoDB, used to save
|
|
|
|
CPU time with prebuilt data
|
|
|
|
structures*/
|
2000-12-06 00:54:17 +01:00
|
|
|
THD* user_thd; /* the thread handle of the user
|
|
|
|
currently using the handle; this is
|
|
|
|
set in external_lock function */
|
2005-03-19 01:12:25 +01:00
|
|
|
query_id_t last_query_id; /* the latest query id where the
|
2001-04-10 20:58:07 +02:00
|
|
|
handle was used */
|
2000-12-06 00:54:17 +01:00
|
|
|
THR_LOCK_DATA lock;
|
|
|
|
INNOBASE_SHARE *share;
|
|
|
|
|
|
|
|
gptr alloc_ptr;
|
|
|
|
byte* upd_buff; /* buffer used in updates */
|
|
|
|
byte* key_val_buff; /* buffer used in converting
|
|
|
|
search key values from MySQL format
|
2002-01-12 14:42:54 +01:00
|
|
|
to Innodb format */
|
2003-06-15 00:04:28 +02:00
|
|
|
ulong upd_and_key_val_buff_len;
|
|
|
|
/* the length of each of the previous
|
|
|
|
two buffers */
|
2002-04-12 20:35:46 +02:00
|
|
|
ulong int_table_flags;
|
2000-12-06 00:54:17 +01:00
|
|
|
uint primary_key;
|
2001-02-21 13:16:00 +01:00
|
|
|
uint last_dup_key;
|
2001-02-17 13:19:19 +01:00
|
|
|
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 */
|
2000-12-06 00:54:17 +01:00
|
|
|
uint last_match_mode;/* match mode of the latest search:
|
2001-02-17 13:19:19 +01:00
|
|
|
ROW_SEL_EXACT, ROW_SEL_EXACT_PREFIX,
|
|
|
|
or undefined */
|
2004-11-03 20:32:48 +01:00
|
|
|
uint num_write_row; /* number of write_row() calls */
|
2001-10-30 16:38:44 +01:00
|
|
|
longlong auto_inc_counter_for_this_stat;
|
2004-06-23 12:29:05 +02:00
|
|
|
ulong max_supported_row_length(const byte *buf);
|
2000-12-06 00:54:17 +01:00
|
|
|
|
2003-06-15 22:23:04 +02:00
|
|
|
uint store_key_val_for_row(uint keynr, char* buff, uint buff_len,
|
|
|
|
const byte* record);
|
2000-12-06 00:54:17 +01:00
|
|
|
int update_thd(THD* thd);
|
|
|
|
int change_active_index(uint keynr);
|
|
|
|
int general_fetch(byte* buf, uint direction, uint match_mode);
|
2002-07-30 23:47:20 +02:00
|
|
|
int innobase_read_and_init_auto_inc(longlong* ret);
|
2000-12-06 00:54:17 +01:00
|
|
|
|
|
|
|
/* Init values for the class: */
|
|
|
|
public:
|
|
|
|
ha_innobase(TABLE *table): handler(table),
|
2002-04-12 20:35:46 +02:00
|
|
|
int_table_flags(HA_REC_NOT_IN_SEQ |
|
2005-03-15 23:34:15 +01:00
|
|
|
HA_NULL_IN_KEY |
|
2004-06-23 12:29:05 +02:00
|
|
|
HA_CAN_INDEX_BLOBS |
|
2003-06-15 00:04:28 +02:00
|
|
|
HA_CAN_SQL_HANDLER |
|
2001-12-21 14:28:51 +01:00
|
|
|
HA_NOT_EXACT_COUNT |
|
2001-03-10 16:05:10 +01:00
|
|
|
HA_PRIMARY_KEY_IN_READ_INDEX |
|
2003-03-18 23:45:44 +01:00
|
|
|
HA_TABLE_SCAN_ON_INDEX),
|
2001-03-10 16:05:10 +01:00
|
|
|
last_dup_key((uint) -1),
|
2004-11-03 20:32:48 +01:00
|
|
|
start_of_scan(0),
|
|
|
|
num_write_row(0)
|
2000-12-06 00:54:17 +01:00
|
|
|
{
|
|
|
|
}
|
|
|
|
~ha_innobase() {}
|
2005-02-08 12:35:10 +01:00
|
|
|
/*
|
|
|
|
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;
|
2000-12-06 00:54:17 +01:00
|
|
|
|
2001-05-09 22:02:36 +02:00
|
|
|
const char* table_type() const { return("InnoDB");}
|
2002-01-02 20:29:41 +01:00
|
|
|
const char *index_type(uint key_number) { return "BTREE"; }
|
2000-12-06 00:54:17 +01:00
|
|
|
const char** bas_ext() const;
|
2002-04-12 20:35:46 +02:00
|
|
|
ulong table_flags() const { return int_table_flags; }
|
2004-07-08 14:45:25 +02:00
|
|
|
ulong index_flags(uint idx, uint part, bool all_parts) const
|
2002-04-12 20:35:46 +02:00
|
|
|
{
|
2005-03-15 23:34:15 +01:00
|
|
|
return (HA_READ_NEXT |
|
|
|
|
HA_READ_PREV |
|
|
|
|
HA_READ_ORDER |
|
|
|
|
HA_READ_RANGE |
|
2004-06-23 12:29:05 +02:00
|
|
|
HA_KEYREAD_ONLY);
|
2002-04-12 20:35:46 +02:00
|
|
|
}
|
2004-06-23 12:29:05 +02:00
|
|
|
uint max_supported_keys() const { return MAX_KEY; }
|
2001-12-22 10:18:22 +01:00
|
|
|
/* 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
|
2001-12-23 12:06:48 +01:00
|
|
|
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 */
|
2004-06-23 12:29:05 +02:00
|
|
|
uint max_supported_key_length() const { return 3500; }
|
|
|
|
uint max_supported_key_part_length() const { return 3500; }
|
2003-10-24 22:44:48 +02:00
|
|
|
const key_map *keys_to_use_for_scanning() { return &key_map_full; }
|
2000-12-06 00:54:17 +01:00
|
|
|
bool has_transactions() { return 1;}
|
|
|
|
|
2001-01-12 12:53:06 +01:00
|
|
|
int open(const char *name, int mode, uint test_if_locked);
|
2000-12-06 00:54:17 +01:00
|
|
|
int close(void);
|
|
|
|
double scan_time();
|
2003-04-23 20:52:16 +02:00
|
|
|
double read_time(uint index, uint ranges, ha_rows rows);
|
2000-12-06 00:54:17 +01:00
|
|
|
|
|
|
|
int write_row(byte * buf);
|
|
|
|
int update_row(const byte * old_data, byte * new_data);
|
|
|
|
int delete_row(const byte * buf);
|
2004-11-08 13:52:15 +01:00
|
|
|
void unlock_row();
|
2000-12-06 00:54:17 +01:00
|
|
|
|
|
|
|
int index_init(uint index);
|
|
|
|
int index_end();
|
|
|
|
int index_read(byte * buf, const byte * key,
|
2002-01-12 14:42:54 +01:00
|
|
|
uint key_len, enum ha_rkey_function find_flag);
|
2000-12-06 00:54:17 +01:00
|
|
|
int index_read_idx(byte * buf, uint index, const byte * key,
|
2002-01-12 14:42:54 +01:00
|
|
|
uint key_len, enum ha_rkey_function find_flag);
|
|
|
|
int index_read_last(byte * buf, const byte * key, uint key_len);
|
2000-12-06 00:54:17 +01:00
|
|
|
int index_next(byte * buf);
|
|
|
|
int index_next_same(byte * buf, const byte *key, uint keylen);
|
|
|
|
int index_prev(byte * buf);
|
|
|
|
int index_first(byte * buf);
|
|
|
|
int index_last(byte * buf);
|
|
|
|
|
2004-06-25 17:49:36 +02:00
|
|
|
int rnd_init(bool scan);
|
2000-12-06 00:54:17 +01:00
|
|
|
int rnd_end();
|
|
|
|
int rnd_next(byte *buf);
|
|
|
|
int rnd_pos(byte * buf, byte *pos);
|
|
|
|
|
|
|
|
void position(const byte *record);
|
|
|
|
void info(uint);
|
2003-04-24 14:34:43 +02:00
|
|
|
int analyze(THD* thd,HA_CHECK_OPT* check_opt);
|
2003-06-23 12:03:04 +02:00
|
|
|
int optimize(THD* thd,HA_CHECK_OPT* check_opt);
|
2003-10-13 10:20:19 +02:00
|
|
|
int discard_or_import_tablespace(my_bool discard);
|
2000-12-06 00:54:17 +01:00
|
|
|
int extra(enum ha_extra_function operation);
|
|
|
|
int external_lock(THD *thd, int lock_type);
|
2004-12-09 10:10:45 +01:00
|
|
|
int transactional_table_lock(THD *thd, int lock_type);
|
2002-09-20 22:26:21 +02:00
|
|
|
int start_stmt(THD *thd);
|
|
|
|
|
2000-12-06 00:54:17 +01:00
|
|
|
void position(byte *record);
|
2005-03-15 23:34:15 +01:00
|
|
|
ha_rows records_in_range(uint inx, key_range *min_key, key_range
|
|
|
|
*max_key);
|
2004-09-13 04:14:25 +02:00
|
|
|
ha_rows estimate_rows_upper_bound();
|
2000-12-06 00:54:17 +01:00
|
|
|
|
|
|
|
int create(const char *name, register TABLE *form,
|
|
|
|
HA_CREATE_INFO *create_info);
|
2005-01-11 15:28:07 +01:00
|
|
|
int delete_all_rows();
|
2000-12-06 00:54:17 +01:00
|
|
|
int delete_table(const char *name);
|
|
|
|
int rename_table(const char* from, const char* to);
|
manual.texi website address change
row0sel.c CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.c CHECK TABLE now also for InnoDB, a join speed optimization
rem0cmp.c CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.c CHECK TABLE now also for InnoDB, a join speed optimization
page0page.c CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.h CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.ic CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.c CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.c CHECK TABLE now also for InnoDB, a join speed optimization
btr0sea.c CHECK TABLE now also for InnoDB, a join speed optimization
innodb.result CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.cc CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.h CHECK TABLE now also for InnoDB, a join speed optimization
sql/ha_innobase.cc:
CHECK TABLE now also for InnoDB, a join speed optimization
sql/ha_innobase.h:
CHECK TABLE now also for InnoDB, a join speed optimization
mysql-test/r/innodb.result:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0btr.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0cur.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0sea.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0btr.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0cur.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.ic:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/row0mysql.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/trx0trx.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/page/page0page.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/rem/rem0cmp.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0mysql.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0sel.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/trx/trx0trx.c:
CHECK TABLE now also for InnoDB, a join speed optimization
Docs/manual.texi:
website address change
2001-06-03 21:58:03 +02:00
|
|
|
int check(THD* thd, HA_CHECK_OPT* check_opt);
|
2001-02-17 13:19:19 +01:00
|
|
|
char* update_table_comment(const char* comment);
|
2002-03-21 17:03:09 +01:00
|
|
|
char* get_foreign_key_create_info();
|
2004-11-13 11:56:39 +01:00
|
|
|
int get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
|
2005-04-07 11:16:41 +02:00
|
|
|
bool can_switch_engines();
|
2004-02-09 22:57:29 +01:00
|
|
|
uint referenced_by_foreign_key();
|
2002-03-21 17:03:09 +01:00
|
|
|
void free_foreign_key_create_info(char* str);
|
2000-12-06 00:54:17 +01:00
|
|
|
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
|
|
|
|
enum thr_lock_type lock_type);
|
2002-08-21 22:55:34 +02:00
|
|
|
void init_table_handle_for_HANDLER();
|
2004-09-15 21:10:31 +02:00
|
|
|
ulonglong get_auto_increment();
|
2003-10-07 16:28:59 +02:00
|
|
|
uint8 table_cache_type() { return HA_CACHE_TBL_ASKTRANSACT; }
|
sql/ha_innodb.cc
enabled query cache for ndb
modified engine interface somewhat
sql/ha_innodb.h
enabled query cache for ndb
modified engine interface somewhat
sql/ha_ndbcluster.cc
enabled query cache for ndb
modified engine interface somewhat
ndb will only allow caching and retrieval if running autocommit
- return false, but do not invalidate
commit count is used as engine data, i.e.
- store commit count before store of cache
- allow retrieval if commit count has not changed on a table
- invalidate if commit count has changed
sql/ha_ndbcluster.h
enabled query cache for ndb
modified engine interface somewhat
sql/handler.cc
enabled query cache for ndb
modified engine interface somewhat
sql/handler.h
enabled query cache for ndb
modified engine interface somewhat
new virtual handler method cached_table_registration called on each table before alowing store in query cache
- return TRUE - ok to cache, FALSE - not allowed to cache, invalidate queries if engine_data below has changed
- sets ulonglong (engine_data) that is stored in query cache for each table
- sets callback to be called for each table before usage of cached query, callback = 0 -> no check later
sql/mysql_priv.h
enabled query cache for ndb
modified engine interface somewhat
callcack prototype for callback to engine before query cache retrieval
sql/sql_cache.cc
enabled query cache for ndb
modified engine interface somewhat
if callback is set on table in cache, do callback to check if allowed to use cache
if not allowed to use cache, check if engine_data has changed, if so, invalidate all queries with that table
+ changes to store and pass callback and engine_data around
sql/sql_cache.h
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
sql/table.h
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
sql/ha_innodb.cc:
enabled query cache for ndb
modified engine interface somewhat
sql/ha_innodb.h:
enabled query cache for ndb
modified engine interface somewhat
sql/ha_ndbcluster.cc:
enabled query cache for ndb
modified engine interface somewhat
ndb will only allow caching and retrieval if running autocommit
- return false, but do not invalidate
commit count is used as engine data, i.e.
- store commit count before store of cache
- allow retrieval if commit count has not changed on a table
- invalidate if commit count has changed
sql/ha_ndbcluster.h:
enabled query cache for ndb
modified engine interface somewhat
sql/handler.cc:
enabled query cache for ndb
modified engine interface somewhat
sql/handler.h:
enabled query cache for ndb
modified engine interface somewhat
new virtual handler method cached_table_registration called on each table before alowing store in query cache
- return TRUE - ok to cache, FALSE - not allowed to cache, invalidate queries if engine_data below has changed
- sets ulonglong (engine_data) that is stored in query cache for each table
- sets callback to be called for each table before usage of cached query, callback = 0 -> no check later
sql/mysql_priv.h:
enabled query cache for ndb
modified engine interface somewhat
callcack prototype for callback to engine before query cache retrieval
sql/sql_cache.cc:
enabled query cache for ndb
modified engine interface somewhat
if callback is set on table in cache, do callback to check if allowed to use cache
if not allowed to use cache, check if engine_data has changed, if so, invalidate all queries with that table
+ changes to store and pass callback and engine_data around
sql/sql_cache.h:
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
sql/table.h:
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
2004-11-24 12:56:51 +01:00
|
|
|
/*
|
|
|
|
ask handler about permission to cache table during query registration
|
|
|
|
*/
|
2005-02-04 10:56:53 +01:00
|
|
|
my_bool register_query_cache_table(THD *thd, char *table_key,
|
|
|
|
uint key_length,
|
|
|
|
qc_engine_callback *call_back,
|
|
|
|
ulonglong *engine_data)
|
sql/ha_innodb.cc
enabled query cache for ndb
modified engine interface somewhat
sql/ha_innodb.h
enabled query cache for ndb
modified engine interface somewhat
sql/ha_ndbcluster.cc
enabled query cache for ndb
modified engine interface somewhat
ndb will only allow caching and retrieval if running autocommit
- return false, but do not invalidate
commit count is used as engine data, i.e.
- store commit count before store of cache
- allow retrieval if commit count has not changed on a table
- invalidate if commit count has changed
sql/ha_ndbcluster.h
enabled query cache for ndb
modified engine interface somewhat
sql/handler.cc
enabled query cache for ndb
modified engine interface somewhat
sql/handler.h
enabled query cache for ndb
modified engine interface somewhat
new virtual handler method cached_table_registration called on each table before alowing store in query cache
- return TRUE - ok to cache, FALSE - not allowed to cache, invalidate queries if engine_data below has changed
- sets ulonglong (engine_data) that is stored in query cache for each table
- sets callback to be called for each table before usage of cached query, callback = 0 -> no check later
sql/mysql_priv.h
enabled query cache for ndb
modified engine interface somewhat
callcack prototype for callback to engine before query cache retrieval
sql/sql_cache.cc
enabled query cache for ndb
modified engine interface somewhat
if callback is set on table in cache, do callback to check if allowed to use cache
if not allowed to use cache, check if engine_data has changed, if so, invalidate all queries with that table
+ changes to store and pass callback and engine_data around
sql/sql_cache.h
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
sql/table.h
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
sql/ha_innodb.cc:
enabled query cache for ndb
modified engine interface somewhat
sql/ha_innodb.h:
enabled query cache for ndb
modified engine interface somewhat
sql/ha_ndbcluster.cc:
enabled query cache for ndb
modified engine interface somewhat
ndb will only allow caching and retrieval if running autocommit
- return false, but do not invalidate
commit count is used as engine data, i.e.
- store commit count before store of cache
- allow retrieval if commit count has not changed on a table
- invalidate if commit count has changed
sql/ha_ndbcluster.h:
enabled query cache for ndb
modified engine interface somewhat
sql/handler.cc:
enabled query cache for ndb
modified engine interface somewhat
sql/handler.h:
enabled query cache for ndb
modified engine interface somewhat
new virtual handler method cached_table_registration called on each table before alowing store in query cache
- return TRUE - ok to cache, FALSE - not allowed to cache, invalidate queries if engine_data below has changed
- sets ulonglong (engine_data) that is stored in query cache for each table
- sets callback to be called for each table before usage of cached query, callback = 0 -> no check later
sql/mysql_priv.h:
enabled query cache for ndb
modified engine interface somewhat
callcack prototype for callback to engine before query cache retrieval
sql/sql_cache.cc:
enabled query cache for ndb
modified engine interface somewhat
if callback is set on table in cache, do callback to check if allowed to use cache
if not allowed to use cache, check if engine_data has changed, if so, invalidate all queries with that table
+ changes to store and pass callback and engine_data around
sql/sql_cache.h:
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
sql/table.h:
enabled query cache for ndb
modified engine interface somewhat
changes to store callback and engine_data
2004-11-24 12:56:51 +01:00
|
|
|
{
|
|
|
|
*call_back= innobase_query_caching_of_table_permitted;
|
|
|
|
*engine_data= 0;
|
|
|
|
return innobase_query_caching_of_table_permitted(thd, table_key,
|
|
|
|
key_length,
|
|
|
|
engine_data);
|
|
|
|
}
|
2004-07-07 10:29:39 +02:00
|
|
|
static char *get_mysql_bin_log_name();
|
Robustness feature.
Won't be pushed as is - separate email sent for internal review.
WL#1717 "binlog-innodb consistency".
Now when mysqld starts, if InnoDB does a crash recovery, we use the binlog name
and position retrieved from InnoDB (corresponding to the last transaction
successfully committed by InnoDB) to cut any rolled back transaction from
the binary log. This is triggered by the --innodb-safe-binlog option.
Provided you configure mysqld to fsync() InnoDB at every commit (using
flush_log_at_trx_commit) and to fsync() the binlog at every write
(using --sync-binlog=1), this behaviour guarantees that a master always has
consistency between binlog and InnoDB, whenever the crash happens.
6 tests to verify that it works.
client/mysqltest.c:
New command require_os (only "unix" accepted for now).
innobase/include/trx0sys.h:
when InnoDB does crash recovery, we now save the binlog coords it prints, into variables for later use.
innobase/trx/trx0sys.c:
when InnoDB does crash recovery, we now save the binlog coords it prints, into variables for later use.
mysql-test/mysql-test-run.sh:
The tests which check that the binlog is cut at restart, need to not delete those binlogs, of course.
And not delete replication info, so that we can test that the slave does not receive anything
wrong from the cut binlog.
sql/ha_innodb.cc:
methods to read from InnoDB the binlog coords stored into it
sql/ha_innodb.h:
ethods to read from InnoDB the binlog coords stored into it
sql/log.cc:
Added my_sync() when we create a binlog (my_sync of the binlog and of the index file);
this is always done, whether --sync-binlog or not (binlog creation is rare, so no speed
problem, and I like to have the existence of the binlog always reliably recorded, even if
later content is not).
If --crash-binlog-innodb, crash between the binlog write and the InnoDB commit.
New methods:
- report_pos_in_innodb() to store the binlog name and position into InnoDB (used only when
we create a new binlog: at startup and at FLUSH LOGS)
- cut_spurious_tail() to possibly cut the tail of a binlog based on the info we read
from InnoDB (does something only if InnoDB has just done a crash recovery).
sql/mysql_priv.h:
new option, to crash (use for testing only)
sql/mysqld.cc:
New option --innodb-safe-binlog and --crash-binlog-innodb (the latter is for testing, it makes mysqld crash).
Just after opening the logs and opening the storage engines, cut any wrong statement from the binlog, based
on info read from InnoDB.
sql/sql_class.h:
new methods for MYSQL_LOG.
2004-06-20 19:11:02 +02:00
|
|
|
static ulonglong get_mysql_bin_log_pos();
|
2003-12-18 04:08:00 +01:00
|
|
|
bool primary_key_is_clustered() { return true; }
|
2004-05-12 23:38:40 +02:00
|
|
|
int cmp_ref(const byte *ref1, const byte *ref2);
|
2000-12-06 00:54:17 +01:00
|
|
|
};
|
|
|
|
|
2004-11-18 11:00:42 +01:00
|
|
|
extern struct show_var_st innodb_status_variables[];
|
2000-12-06 00:54:17 +01:00
|
|
|
extern uint innobase_init_flags, innobase_lock_type;
|
2002-09-11 05:40:08 +02:00
|
|
|
extern uint innobase_flush_log_at_trx_commit;
|
2000-12-06 00:54:17 +01:00
|
|
|
extern ulong innobase_cache_size;
|
2004-12-14 20:26:31 +01:00
|
|
|
extern ulong innobase_large_page_size;
|
2000-12-06 00:54:17 +01:00
|
|
|
extern char *innobase_home, *innobase_tmpdir, *innobase_logdir;
|
|
|
|
extern long innobase_lock_scan_time;
|
2001-01-12 12:53:06 +01:00
|
|
|
extern long innobase_mirrored_log_groups, innobase_log_files_in_group;
|
2000-12-06 00:54:17 +01:00
|
|
|
extern long innobase_log_file_size, innobase_log_buffer_size;
|
2003-10-07 16:28:59 +02:00
|
|
|
extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size;
|
|
|
|
extern long innobase_buffer_pool_awe_mem_mb;
|
2001-02-17 13:19:19 +01:00
|
|
|
extern long innobase_file_io_threads, innobase_lock_wait_timeout;
|
2001-10-30 16:38:44 +01:00
|
|
|
extern long innobase_force_recovery, innobase_thread_concurrency;
|
2003-10-07 16:28:59 +02:00
|
|
|
extern long innobase_open_files;
|
2000-12-06 00:54:17 +01:00
|
|
|
extern char *innobase_data_home_dir, *innobase_data_file_path;
|
|
|
|
extern char *innobase_log_group_home_dir, *innobase_log_arch_dir;
|
2001-05-23 17:04:49 +02:00
|
|
|
extern char *innobase_unix_file_flush_method;
|
2002-02-07 20:34:35 +01:00
|
|
|
/* The following variables have to be my_bool for SHOW VARIABLES to work */
|
2002-09-11 05:40:08 +02:00
|
|
|
extern my_bool innobase_log_archive,
|
2004-12-14 20:26:31 +01:00
|
|
|
innobase_use_doublewrite,
|
|
|
|
innobase_use_checksums,
|
|
|
|
innobase_use_large_pages,
|
2003-10-07 16:28:59 +02:00
|
|
|
innobase_use_native_aio, innobase_fast_shutdown,
|
2004-08-18 19:57:55 +02:00
|
|
|
innobase_file_per_table, innobase_locks_unsafe_for_binlog,
|
2004-08-06 14:55:50 +02:00
|
|
|
innobase_create_status_file;
|
2004-10-13 19:04:52 +02:00
|
|
|
extern my_bool innobase_very_fast_shutdown; /* set this to 1 just before
|
|
|
|
calling innobase_end() if you want
|
|
|
|
InnoDB to shut down without
|
|
|
|
flushing the buffer pool: this
|
|
|
|
is equivalent to a 'crash' */
|
2003-05-16 15:27:50 +02:00
|
|
|
extern "C" {
|
|
|
|
extern ulong srv_max_buf_pool_modified_pct;
|
2004-10-27 12:33:11 +02:00
|
|
|
extern ulong srv_max_purge_lag;
|
2004-09-30 11:31:41 +02:00
|
|
|
extern ulong srv_auto_extend_increment;
|
2005-01-05 12:43:48 +01:00
|
|
|
extern ulong srv_n_spin_wait_rounds;
|
2005-01-08 15:01:37 +01:00
|
|
|
extern ulong srv_n_free_tickets_to_enter;
|
|
|
|
extern ulong srv_thread_sleep_delay;
|
|
|
|
extern ulong srv_thread_concurrency;
|
2003-05-16 15:27:50 +02:00
|
|
|
}
|
2000-12-06 00:54:17 +01:00
|
|
|
|
|
|
|
extern TYPELIB innobase_lock_typelib;
|
|
|
|
|
XA (not completely polished out yet)
include/my_pthread.h:
cleanup. don't use gcc extensions
innobase/include/trx0sys.ic:
Jan's fix for innobase_xa_prepare
innobase/read/read0read.c:
Jan's fix for innobase_xa_prepare
innobase/trx/trx0trx.c:
Jan's fix for innobase_xa_prepare
mysql-test/include/varchar.inc:
test fix
mysql-test/r/ctype_ucs.result:
new log event - all binlog positions are changed :(
mysql-test/r/drop_temp_table.result:
new log event - all binlog positions are changed :(
mysql-test/r/insert_select.result:
new log event - all binlog positions are changed :(
mysql-test/r/mix_innodb_myisam_binlog.result:
new log event - all binlog positions are changed :(
mysql-test/r/myisam.result:
test fix
mysql-test/r/rpl000015.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_change_master.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_charset.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_error_ignored_table.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_flush_log_loop.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_flush_tables.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata_rule_m.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata_rule_s.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_log.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_log_pos.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_max_relay_size.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_relayrotate.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_replicate_do.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_reset_slave.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_rotate_logs.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_server_id1.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_server_id2.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_temporary.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_timezone.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_until.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_user_variables.result:
new log event - all binlog positions are changed :(
mysql-test/r/user_var.result:
new log event - all binlog positions are changed :(
mysql-test/t/ctype_ucs.test:
new log event - all binlog positions are changed :(
mysql-test/t/mix_innodb_myisam_binlog.test:
new log event - all binlog positions are changed :(
mysql-test/t/mysqlbinlog.test:
new log event - all binlog positions are changed :(
mysql-test/t/mysqlbinlog2.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_charset.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_error_ignored_table.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_loaddata_rule_m.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_loaddata_rule_s.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_log.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_log_pos.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_user_variables.test:
new log event - all binlog positions are changed :(
mysql-test/t/user_var.test:
new log event - all binlog positions are changed :(
mysys/hash.c:
typo fixed
sql/ha_berkeley.cc:
handlerton framework
sql/ha_berkeley.h:
handlerton framework
sql/ha_innodb.cc:
handlerton framework
sql/ha_innodb.h:
handlerton framework
sql/handler.cc:
new transaction handling, handlerton framework, two-phase commit, XA support
sql/handler.h:
new transaction handling, handlerton framework, two-phase commit, XA support
sql/lex.h:
XA commands
sql/log.cc:
new transaction handling, handlerton framework, two-phase commit,
XA support, tc-logging, TC_LOG_MMAP class
sql/log_event.cc:
Xid_log_event
sql/log_event.h:
Xid_log_event, LOG_EVENT_BINLOG_CLOSED_F flag
sql/mysql_priv.h:
wrapper for query_id++
sql/mysqld.cc:
new command-line options --log-tc, --log-tc-size, --tc-heuristic-recover,
new status variables Tc_log_page_size, Tc_log_max_pages_used, Tc_log_page_waits.
init/stop tc logging
sql/set_var.h:
warning fixed
sql/share/errmsg.txt:
XA error messages
sql/sp_head.cc:
s/query_id++/next_query_id()/
sql/sql_base.cc:
typo fixed. new transaction handling.
sql/sql_class.cc:
cleanup of THD.transaction
sql/sql_class.h:
TC_LOG classes, new status variables, new savepoint handling, XA support
sql/sql_insert.cc:
comments
sql/sql_lex.cc:
s/found_colon/found_semicolon/
sql/sql_lex.h:
SQLCOM_XA_xxx, XA related changes in Lex
sql/sql_parse.cc:
cleanup, XA commands, new savepoint handling
sql/sql_repl.cc:
two functions moved to log.cc
sql/sql_repl.h:
two functions moved to log.cc
sql/sql_trigger.cc:
s/lex.name_and_length/lex.ident/
sql/sql_yacc.yy:
XA commands, cleanup
2005-01-16 13:16:23 +01:00
|
|
|
handlerton *innobase_init(void);
|
2000-12-06 00:54:17 +01:00
|
|
|
bool innobase_end(void);
|
|
|
|
bool innobase_flush_logs(void);
|
2001-02-17 13:19:19 +01:00
|
|
|
uint innobase_get_free_space(void);
|
2000-12-06 00:54:17 +01:00
|
|
|
|
XA (not completely polished out yet)
include/my_pthread.h:
cleanup. don't use gcc extensions
innobase/include/trx0sys.ic:
Jan's fix for innobase_xa_prepare
innobase/read/read0read.c:
Jan's fix for innobase_xa_prepare
innobase/trx/trx0trx.c:
Jan's fix for innobase_xa_prepare
mysql-test/include/varchar.inc:
test fix
mysql-test/r/ctype_ucs.result:
new log event - all binlog positions are changed :(
mysql-test/r/drop_temp_table.result:
new log event - all binlog positions are changed :(
mysql-test/r/insert_select.result:
new log event - all binlog positions are changed :(
mysql-test/r/mix_innodb_myisam_binlog.result:
new log event - all binlog positions are changed :(
mysql-test/r/myisam.result:
test fix
mysql-test/r/rpl000015.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_change_master.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_charset.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_error_ignored_table.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_flush_log_loop.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_flush_tables.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata_rule_m.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata_rule_s.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_log.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_log_pos.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_max_relay_size.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_relayrotate.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_replicate_do.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_reset_slave.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_rotate_logs.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_server_id1.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_server_id2.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_temporary.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_timezone.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_until.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_user_variables.result:
new log event - all binlog positions are changed :(
mysql-test/r/user_var.result:
new log event - all binlog positions are changed :(
mysql-test/t/ctype_ucs.test:
new log event - all binlog positions are changed :(
mysql-test/t/mix_innodb_myisam_binlog.test:
new log event - all binlog positions are changed :(
mysql-test/t/mysqlbinlog.test:
new log event - all binlog positions are changed :(
mysql-test/t/mysqlbinlog2.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_charset.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_error_ignored_table.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_loaddata_rule_m.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_loaddata_rule_s.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_log.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_log_pos.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_user_variables.test:
new log event - all binlog positions are changed :(
mysql-test/t/user_var.test:
new log event - all binlog positions are changed :(
mysys/hash.c:
typo fixed
sql/ha_berkeley.cc:
handlerton framework
sql/ha_berkeley.h:
handlerton framework
sql/ha_innodb.cc:
handlerton framework
sql/ha_innodb.h:
handlerton framework
sql/handler.cc:
new transaction handling, handlerton framework, two-phase commit, XA support
sql/handler.h:
new transaction handling, handlerton framework, two-phase commit, XA support
sql/lex.h:
XA commands
sql/log.cc:
new transaction handling, handlerton framework, two-phase commit,
XA support, tc-logging, TC_LOG_MMAP class
sql/log_event.cc:
Xid_log_event
sql/log_event.h:
Xid_log_event, LOG_EVENT_BINLOG_CLOSED_F flag
sql/mysql_priv.h:
wrapper for query_id++
sql/mysqld.cc:
new command-line options --log-tc, --log-tc-size, --tc-heuristic-recover,
new status variables Tc_log_page_size, Tc_log_max_pages_used, Tc_log_page_waits.
init/stop tc logging
sql/set_var.h:
warning fixed
sql/share/errmsg.txt:
XA error messages
sql/sp_head.cc:
s/query_id++/next_query_id()/
sql/sql_base.cc:
typo fixed. new transaction handling.
sql/sql_class.cc:
cleanup of THD.transaction
sql/sql_class.h:
TC_LOG classes, new status variables, new savepoint handling, XA support
sql/sql_insert.cc:
comments
sql/sql_lex.cc:
s/found_colon/found_semicolon/
sql/sql_lex.h:
SQLCOM_XA_xxx, XA related changes in Lex
sql/sql_parse.cc:
cleanup, XA commands, new savepoint handling
sql/sql_repl.cc:
two functions moved to log.cc
sql/sql_repl.h:
two functions moved to log.cc
sql/sql_trigger.cc:
s/lex.name_and_length/lex.ident/
sql/sql_yacc.yy:
XA commands, cleanup
2005-01-16 13:16:23 +01:00
|
|
|
/*
|
|
|
|
don't delete it - it may be re-enabled later
|
|
|
|
as an optimization for the most common case InnoDB+binlog
|
|
|
|
*/
|
|
|
|
#if 0
|
2002-01-22 21:57:56 +01:00
|
|
|
int innobase_report_binlog_offset_and_commit(
|
|
|
|
THD* thd,
|
|
|
|
void* trx_handle,
|
|
|
|
char* log_file_name,
|
|
|
|
my_off_t end_offset);
|
XA (not completely polished out yet)
include/my_pthread.h:
cleanup. don't use gcc extensions
innobase/include/trx0sys.ic:
Jan's fix for innobase_xa_prepare
innobase/read/read0read.c:
Jan's fix for innobase_xa_prepare
innobase/trx/trx0trx.c:
Jan's fix for innobase_xa_prepare
mysql-test/include/varchar.inc:
test fix
mysql-test/r/ctype_ucs.result:
new log event - all binlog positions are changed :(
mysql-test/r/drop_temp_table.result:
new log event - all binlog positions are changed :(
mysql-test/r/insert_select.result:
new log event - all binlog positions are changed :(
mysql-test/r/mix_innodb_myisam_binlog.result:
new log event - all binlog positions are changed :(
mysql-test/r/myisam.result:
test fix
mysql-test/r/rpl000015.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_change_master.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_charset.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_error_ignored_table.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_flush_log_loop.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_flush_tables.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata_rule_m.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata_rule_s.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_log.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_log_pos.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_max_relay_size.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_relayrotate.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_replicate_do.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_reset_slave.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_rotate_logs.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_server_id1.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_server_id2.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_temporary.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_timezone.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_until.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_user_variables.result:
new log event - all binlog positions are changed :(
mysql-test/r/user_var.result:
new log event - all binlog positions are changed :(
mysql-test/t/ctype_ucs.test:
new log event - all binlog positions are changed :(
mysql-test/t/mix_innodb_myisam_binlog.test:
new log event - all binlog positions are changed :(
mysql-test/t/mysqlbinlog.test:
new log event - all binlog positions are changed :(
mysql-test/t/mysqlbinlog2.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_charset.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_error_ignored_table.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_loaddata_rule_m.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_loaddata_rule_s.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_log.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_log_pos.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_user_variables.test:
new log event - all binlog positions are changed :(
mysql-test/t/user_var.test:
new log event - all binlog positions are changed :(
mysys/hash.c:
typo fixed
sql/ha_berkeley.cc:
handlerton framework
sql/ha_berkeley.h:
handlerton framework
sql/ha_innodb.cc:
handlerton framework
sql/ha_innodb.h:
handlerton framework
sql/handler.cc:
new transaction handling, handlerton framework, two-phase commit, XA support
sql/handler.h:
new transaction handling, handlerton framework, two-phase commit, XA support
sql/lex.h:
XA commands
sql/log.cc:
new transaction handling, handlerton framework, two-phase commit,
XA support, tc-logging, TC_LOG_MMAP class
sql/log_event.cc:
Xid_log_event
sql/log_event.h:
Xid_log_event, LOG_EVENT_BINLOG_CLOSED_F flag
sql/mysql_priv.h:
wrapper for query_id++
sql/mysqld.cc:
new command-line options --log-tc, --log-tc-size, --tc-heuristic-recover,
new status variables Tc_log_page_size, Tc_log_max_pages_used, Tc_log_page_waits.
init/stop tc logging
sql/set_var.h:
warning fixed
sql/share/errmsg.txt:
XA error messages
sql/sp_head.cc:
s/query_id++/next_query_id()/
sql/sql_base.cc:
typo fixed. new transaction handling.
sql/sql_class.cc:
cleanup of THD.transaction
sql/sql_class.h:
TC_LOG classes, new status variables, new savepoint handling, XA support
sql/sql_insert.cc:
comments
sql/sql_lex.cc:
s/found_colon/found_semicolon/
sql/sql_lex.h:
SQLCOM_XA_xxx, XA related changes in Lex
sql/sql_parse.cc:
cleanup, XA commands, new savepoint handling
sql/sql_repl.cc:
two functions moved to log.cc
sql/sql_repl.h:
two functions moved to log.cc
sql/sql_trigger.cc:
s/lex.name_and_length/lex.ident/
sql/sql_yacc.yy:
XA commands, cleanup
2005-01-16 13:16:23 +01:00
|
|
|
int innobase_commit_complete(void* trx_handle);
|
2005-02-14 21:50:09 +01:00
|
|
|
void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset);
|
XA (not completely polished out yet)
include/my_pthread.h:
cleanup. don't use gcc extensions
innobase/include/trx0sys.ic:
Jan's fix for innobase_xa_prepare
innobase/read/read0read.c:
Jan's fix for innobase_xa_prepare
innobase/trx/trx0trx.c:
Jan's fix for innobase_xa_prepare
mysql-test/include/varchar.inc:
test fix
mysql-test/r/ctype_ucs.result:
new log event - all binlog positions are changed :(
mysql-test/r/drop_temp_table.result:
new log event - all binlog positions are changed :(
mysql-test/r/insert_select.result:
new log event - all binlog positions are changed :(
mysql-test/r/mix_innodb_myisam_binlog.result:
new log event - all binlog positions are changed :(
mysql-test/r/myisam.result:
test fix
mysql-test/r/rpl000015.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_change_master.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_charset.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_error_ignored_table.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_flush_log_loop.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_flush_tables.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata_rule_m.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata_rule_s.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_log.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_log_pos.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_max_relay_size.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_relayrotate.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_replicate_do.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_reset_slave.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_rotate_logs.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_server_id1.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_server_id2.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_temporary.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_timezone.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_until.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_user_variables.result:
new log event - all binlog positions are changed :(
mysql-test/r/user_var.result:
new log event - all binlog positions are changed :(
mysql-test/t/ctype_ucs.test:
new log event - all binlog positions are changed :(
mysql-test/t/mix_innodb_myisam_binlog.test:
new log event - all binlog positions are changed :(
mysql-test/t/mysqlbinlog.test:
new log event - all binlog positions are changed :(
mysql-test/t/mysqlbinlog2.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_charset.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_error_ignored_table.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_loaddata_rule_m.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_loaddata_rule_s.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_log.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_log_pos.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_user_variables.test:
new log event - all binlog positions are changed :(
mysql-test/t/user_var.test:
new log event - all binlog positions are changed :(
mysys/hash.c:
typo fixed
sql/ha_berkeley.cc:
handlerton framework
sql/ha_berkeley.h:
handlerton framework
sql/ha_innodb.cc:
handlerton framework
sql/ha_innodb.h:
handlerton framework
sql/handler.cc:
new transaction handling, handlerton framework, two-phase commit, XA support
sql/handler.h:
new transaction handling, handlerton framework, two-phase commit, XA support
sql/lex.h:
XA commands
sql/log.cc:
new transaction handling, handlerton framework, two-phase commit,
XA support, tc-logging, TC_LOG_MMAP class
sql/log_event.cc:
Xid_log_event
sql/log_event.h:
Xid_log_event, LOG_EVENT_BINLOG_CLOSED_F flag
sql/mysql_priv.h:
wrapper for query_id++
sql/mysqld.cc:
new command-line options --log-tc, --log-tc-size, --tc-heuristic-recover,
new status variables Tc_log_page_size, Tc_log_max_pages_used, Tc_log_page_waits.
init/stop tc logging
sql/set_var.h:
warning fixed
sql/share/errmsg.txt:
XA error messages
sql/sp_head.cc:
s/query_id++/next_query_id()/
sql/sql_base.cc:
typo fixed. new transaction handling.
sql/sql_class.cc:
cleanup of THD.transaction
sql/sql_class.h:
TC_LOG classes, new status variables, new savepoint handling, XA support
sql/sql_insert.cc:
comments
sql/sql_lex.cc:
s/found_colon/found_semicolon/
sql/sql_lex.h:
SQLCOM_XA_xxx, XA related changes in Lex
sql/sql_parse.cc:
cleanup, XA commands, new savepoint handling
sql/sql_repl.cc:
two functions moved to log.cc
sql/sql_repl.h:
two functions moved to log.cc
sql/sql_trigger.cc:
s/lex.name_and_length/lex.ident/
sql/sql_yacc.yy:
XA commands, cleanup
2005-01-16 13:16:23 +01:00
|
|
|
#endif
|
|
|
|
|
2001-10-10 21:47:08 +02:00
|
|
|
int innobase_drop_database(char *path);
|
2004-10-20 03:04:37 +02:00
|
|
|
bool innodb_show_status(THD* thd);
|
2004-12-24 12:13:32 +01:00
|
|
|
bool innodb_mutex_show_status(THD* thd);
|
2004-11-18 11:00:42 +01:00
|
|
|
void innodb_export_status(void);
|
2001-10-10 21:47:08 +02:00
|
|
|
|
XA (not completely polished out yet)
include/my_pthread.h:
cleanup. don't use gcc extensions
innobase/include/trx0sys.ic:
Jan's fix for innobase_xa_prepare
innobase/read/read0read.c:
Jan's fix for innobase_xa_prepare
innobase/trx/trx0trx.c:
Jan's fix for innobase_xa_prepare
mysql-test/include/varchar.inc:
test fix
mysql-test/r/ctype_ucs.result:
new log event - all binlog positions are changed :(
mysql-test/r/drop_temp_table.result:
new log event - all binlog positions are changed :(
mysql-test/r/insert_select.result:
new log event - all binlog positions are changed :(
mysql-test/r/mix_innodb_myisam_binlog.result:
new log event - all binlog positions are changed :(
mysql-test/r/myisam.result:
test fix
mysql-test/r/rpl000015.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_change_master.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_charset.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_error_ignored_table.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_flush_log_loop.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_flush_tables.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata_rule_m.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_loaddata_rule_s.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_log.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_log_pos.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_max_relay_size.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_relayrotate.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_replicate_do.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_reset_slave.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_rotate_logs.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_server_id1.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_server_id2.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_temporary.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_timezone.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_until.result:
new log event - all binlog positions are changed :(
mysql-test/r/rpl_user_variables.result:
new log event - all binlog positions are changed :(
mysql-test/r/user_var.result:
new log event - all binlog positions are changed :(
mysql-test/t/ctype_ucs.test:
new log event - all binlog positions are changed :(
mysql-test/t/mix_innodb_myisam_binlog.test:
new log event - all binlog positions are changed :(
mysql-test/t/mysqlbinlog.test:
new log event - all binlog positions are changed :(
mysql-test/t/mysqlbinlog2.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_charset.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_error_ignored_table.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_loaddata_rule_m.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_loaddata_rule_s.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_log.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_log_pos.test:
new log event - all binlog positions are changed :(
mysql-test/t/rpl_user_variables.test:
new log event - all binlog positions are changed :(
mysql-test/t/user_var.test:
new log event - all binlog positions are changed :(
mysys/hash.c:
typo fixed
sql/ha_berkeley.cc:
handlerton framework
sql/ha_berkeley.h:
handlerton framework
sql/ha_innodb.cc:
handlerton framework
sql/ha_innodb.h:
handlerton framework
sql/handler.cc:
new transaction handling, handlerton framework, two-phase commit, XA support
sql/handler.h:
new transaction handling, handlerton framework, two-phase commit, XA support
sql/lex.h:
XA commands
sql/log.cc:
new transaction handling, handlerton framework, two-phase commit,
XA support, tc-logging, TC_LOG_MMAP class
sql/log_event.cc:
Xid_log_event
sql/log_event.h:
Xid_log_event, LOG_EVENT_BINLOG_CLOSED_F flag
sql/mysql_priv.h:
wrapper for query_id++
sql/mysqld.cc:
new command-line options --log-tc, --log-tc-size, --tc-heuristic-recover,
new status variables Tc_log_page_size, Tc_log_max_pages_used, Tc_log_page_waits.
init/stop tc logging
sql/set_var.h:
warning fixed
sql/share/errmsg.txt:
XA error messages
sql/sp_head.cc:
s/query_id++/next_query_id()/
sql/sql_base.cc:
typo fixed. new transaction handling.
sql/sql_class.cc:
cleanup of THD.transaction
sql/sql_class.h:
TC_LOG classes, new status variables, new savepoint handling, XA support
sql/sql_insert.cc:
comments
sql/sql_lex.cc:
s/found_colon/found_semicolon/
sql/sql_lex.h:
SQLCOM_XA_xxx, XA related changes in Lex
sql/sql_parse.cc:
cleanup, XA commands, new savepoint handling
sql/sql_repl.cc:
two functions moved to log.cc
sql/sql_repl.h:
two functions moved to log.cc
sql/sql_trigger.cc:
s/lex.name_and_length/lex.ident/
sql/sql_yacc.yy:
XA commands, cleanup
2005-01-16 13:16:23 +01:00
|
|
|
void innobase_release_temporary_latches(THD *thd);
|
2004-06-10 14:01:16 +02:00
|
|
|
|
|
|
|
void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset);
|
2004-09-03 14:26:29 +02:00
|
|
|
|
2004-10-13 19:04:52 +02:00
|
|
|
int innobase_start_trx_and_assign_read_view(THD* thd);
|
2004-11-30 10:45:02 +01:00
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
This function is used to prepare X/Open XA distributed transaction */
|
|
|
|
|
|
|
|
int innobase_xa_prepare(
|
|
|
|
/*====================*/
|
|
|
|
/* out: 0 or error number */
|
|
|
|
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 */
|
|
|
|
|
|
|
|
int innobase_xa_recover(
|
|
|
|
/*====================*/
|
|
|
|
/* out: number of prepared transactions
|
|
|
|
stored in xid_list */
|
|
|
|
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 */
|
|
|
|
|
|
|
|
int innobase_commit_by_xid(
|
|
|
|
/*=======================*/
|
|
|
|
/* out: 0 or error number */
|
|
|
|
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 */
|
|
|
|
|
|
|
|
int innobase_rollback_by_xid(
|
|
|
|
/* out: 0 or error number */
|
|
|
|
XID *xid); /* in : X/Open XA Transaction Idenfification */
|
|
|
|
|
|
|
|
|
|
|
|
int innobase_xa_end(THD *thd);
|
|
|
|
|
|
|
|
|