database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

In table cache code, fix casts from longlong to long for

Browse Source 
'version' variables.

The warnings occur on Windows build, yet they are also are valid
on 32bit Unix.

Fix is to consistently use 64bit integer on all platforms.
This commit is contained in:
Vladislav Vaintroub
2017-09-29 16:44:53 +00:00
parent 8e8a7f85a9
commit 24d9664ad0
5 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_base.cc
View File

@ -325,7 +325,7 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *db, const char *wild)
struct close_cached_tables_arg
{
ulong refresh_version;
tdc_version_t refresh_version;
TDC_element *element;
};
@ -351,7 +351,7 @@ bool close_cached_tables(THD *thd, TABLE_LIST *tables,
{
bool result= FALSE;
struct timespec abstime;
ulong refresh_version;
tdc_version_t refresh_version;
DBUG_ENTER("close_cached_tables");
DBUG_ASSERT(thd || (!wait_for_refresh && !tables));
@ -1192,7 +1192,7 @@ bool wait_while_table_is_used(THD *thd, TABLE *table,
{
DBUG_ENTER("wait_while_table_is_used");
DBUG_ASSERT(!table->s->tmp_table);
DBUG_PRINT("enter", ("table: '%s' share: %p db_stat: %u version: %lu",
DBUG_PRINT("enter", ("table: '%s' share: %p db_stat: %u version: %lld",
table->s->table_name.str, table->s,
table->db_stat, table->s->tdc->version));
@ -1808,7 +1808,7 @@ retry_share:
{
if (share->tdc->flushed)
{
DBUG_PRINT("info", ("Found old share version: %lu current: %lu",
DBUG_PRINT("info", ("Found old share version: %lld current: %lld",
share->tdc->version, tdc_refresh_version()));
/*
We already have an MDL lock. But we have encountered an old