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 | e47ab5a604954b0019ea9fe90cdb91023e55be07 (patch) | |
| tree | 703aceeb455a79b6ec6291bdc71ff13ffa24a2c0 /sql/table.h | |
| parent | ad43230e3bd5a419709a2559478be5cfb2cae3d2 (diff) | |
| parent | 455f754e6ba4de3d3b527aad6ac317b7e5994b86 (diff) | |
| download | mariadb-git-e47ab5a604954b0019ea9fe90cdb91023e55be07.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.h')
| -rw-r--r-- | sql/table.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index affdd3ebb25..8498bff4a72 100644 --- a/sql/table.h +++ b/sql/table.h @@ -617,7 +617,6 @@ struct TABLE_SHARE bool crashed; bool is_view; ulong table_map_id; /* for row-based replication */ - ulonglong table_map_version; /* Cache for row-based replication table share checks that does not |