database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-01-30 08:17:58 +01:00
parent 8c5db7a187 25c0806867
commit 14d930db5d
185 changed files with 6011 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/table.h
View File

@@ -861,7 +861,7 @@ struct TABLE_SHARE
/* 1 if frm version cannot be updated as part of upgrade */
bool keep_original_mysql_version;
ulong table_map_id; /* for row-based replication */
ulonglong table_map_id; /* for row-based replication */
/*
Things that are incompatible between the stored version and the
@@ -1023,7 +1023,7 @@ struct TABLE_SHARE
return (table_category == TABLE_CATEGORY_LOG);
}
inline ulong get_table_def_version()
inline ulonglong get_table_def_version()
{
return table_map_id;
}
@@ -1102,7 +1102,7 @@ struct TABLE_SHARE
@sa TABLE_LIST::is_the_same_definition()
*/
ulong get_table_ref_version() const
ulonglong get_table_ref_version() const
{
return (tmp_table == SYSTEM_TMP_TABLE) ? 0 : table_map_id;
}
@@ -2826,7 +2826,7 @@ struct TABLE_LIST
{ set_table_ref_id(s->get_table_ref_type(), s->get_table_ref_version()); }
inline void set_table_ref_id(enum_table_ref_type table_ref_type_arg,
ulong table_ref_version_arg)
ulonglong table_ref_version_arg)
{
m_table_ref_type= table_ref_type_arg;
m_table_ref_version= table_ref_version_arg;
@@ -2981,7 +2981,7 @@ private:
/** See comments for set_table_ref_id() */
enum enum_table_ref_type m_table_ref_type;
/** See comments for set_table_ref_id() */
ulong m_table_ref_version;
ulonglong m_table_ref_version;
};
class Item;