diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 12:23:57 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 12:23:57 +0400 |
| commit | c7fbc8c67c6739b900e19e0091b28adc11bd5d58 (patch) | |
| tree | 703aceeb455a79b6ec6291bdc71ff13ffa24a2c0 /sql/table.cc | |
| parent | 5ef2bdea81a68a5440235bb5c841fff5dcc2b2c7 (diff) | |
| parent | df0b6707dabf49ed09e798c6ace1d860320ab11c (diff) | |
| download | mariadb-git-c7fbc8c67c6739b900e19e0091b28adc11bd5d58.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Text conflict in sql/log.cc
Text conflict in sql/log.h
Text conflict in sql/sql_class.cc
Text conflict in sql/sql_load.cc
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sql/table.cc b/sql/table.cc index 5e648f5097a..95a683d554b 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -311,13 +311,6 @@ TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, char *key, share->version= refresh_version; /* - This constant is used to mark that no table map version has been - assigned. No arithmetic is done on the value: it will be - overwritten with a value taken from MYSQL_BIN_LOG. - */ - share->table_map_version= ~(ulonglong)0; - - /* Since alloc_table_share() can be called without any locking (for example, ha_create_table... functions), we do not assign a table map id here. Instead we assign a value that is not used @@ -383,11 +376,6 @@ void init_tmp_table_share(THD *thd, TABLE_SHARE *share, const char *key, share->path.length= share->normalized_path.length= strlen(path); share->frm_version= FRM_VER_TRUE_VARCHAR; - /* - Temporary tables are not replicated, but we set up these fields - anyway to be able to catch errors. - */ - share->table_map_version= ~(ulonglong)0; share->cached_row_logging_check= -1; /* |