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

fix win32 warnings

Browse Source
This commit is contained in:
Eugene Kosov
2017-10-28 13:51:49 +03:00
committed by Aleksey Midenkov
parent a899e52d08
commit 0d3b8ed048
10 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.cc
View File

@ -3050,7 +3050,7 @@ int handler::update_auto_increment()
int2store(ptr, vers_auto_decrement--); int2store(ptr, vers_auto_decrement--);
break; break;
case 1: case 1:
*ptr= vers_auto_decrement--; *ptr= static_cast<uchar>(vers_auto_decrement--);
break; break;
default: default:
DBUG_ASSERT(false); DBUG_ASSERT(false);

4
sql/partition_info.cc
View File

@ -860,13 +860,13 @@ bool partition_info::vers_set_interval(const INTERVAL & i)
DBUG_ASSERT(vers_info); DBUG_ASSERT(vers_info);
// TODO: INTERVAL conversion to seconds leads to mismatch with calendar intervals (MONTH and YEAR) // TODO: INTERVAL conversion to seconds leads to mismatch with calendar intervals (MONTH and YEAR)
vers_info->interval= vers_info->interval= static_cast<my_time_t>(
i.second + i.second +
i.minute * 60 + i.minute * 60 +
i.hour * 60 * 60 + i.hour * 60 * 60 +
i.day * 24 * 60 * 60 + i.day * 24 * 60 * 60 +
i.month * 30 * 24 * 60 * 60 + i.month * 30 * 24 * 60 * 60 +
i.year * 365 * 30 * 24 * 60 * 60; i.year * 365 * 30 * 24 * 60 * 60);
if (vers_info->interval == 0) if (vers_info->interval == 0)
return true; return true;

2
sql/partition_info.h
View File

@ -515,7 +515,7 @@ public:
if (table->versioned_by_engine()) if (table->versioned_by_engine())
{ {
// transaction is not yet pushed to VTQ, so we use now-time // transaction is not yet pushed to VTQ, so we use now-time
my_time_t end_ts= my_time(0); my_time_t end_ts= my_time_t(0);
uchar buf[8]; uchar buf[8];
Field_timestampf fld(buf, NULL, 0, Field::NONE, &table->vers_end_field()->field_name, NULL, 6); Field_timestampf fld(buf, NULL, 0, Field::NONE, &table->vers_end_field()->field_name, NULL, 6);

6
sql/sql_derived.cc
View File

@ -736,9 +736,6 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived)
} }
// System Versioning: fix system fields of versioned derived table // System Versioning: fix system fields of versioned derived table
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat"
#pragma GCC diagnostic ignored "-Wformat-extra-args"
if ((thd->stmt_arena->is_stmt_prepare() || !thd->stmt_arena->is_stmt_execute()) if ((thd->stmt_arena->is_stmt_prepare() || !thd->stmt_arena->is_stmt_execute())
&& sl->table_list.elements > 0) && sl->table_list.elements > 0)
{ {
@ -799,7 +796,7 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived)
expli_table_err: expli_table_err:
my_printf_error( my_printf_error(
ER_VERS_DERIVED_PROHIBITED, ER_VERS_DERIVED_PROHIBITED,
"Derived table is prohibited: system fields from multiple tables %`s, %`s in query!", MYF(0), "Derived table is prohibited: system fields from multiple tables `%s`, `%s` in query!", MYF(0),
expli_table->alias, expli_table->alias,
table->alias); table->alias);
res= true; res= true;
@ -857,7 +854,6 @@ expli_table_err:
sl->vers_import_outer= true; // FIXME: is needed? sl->vers_import_outer= true; // FIXME: is needed?
} }
} // if (sl->table_list.elements > 0) } // if (sl->table_list.elements > 0)
#pragma GCC diagnostic pop
// System Versioning end // System Versioning end
} }

2
sql/sql_partition.cc
View File

@ -3207,7 +3207,7 @@ int vers_get_partition_id(partition_info *part_info,
mysql_mutex_unlock(&table->s->LOCK_rotation); mysql_mutex_unlock(&table->s->LOCK_rotation);
// transaction is not yet pushed to VTQ, so we use now-time // transaction is not yet pushed to VTQ, so we use now-time
my_time_t end_ts= sys_trx_end->table->versioned_by_engine() ? my_time_t end_ts= sys_trx_end->table->versioned_by_engine() ?
my_time(0) : sys_trx_end->get_timestamp(); my_time_t(0) : sys_trx_end->get_timestamp();
if (part_info->vers_limit_exceed() || part_info->vers_interval_exceed(end_ts)) if (part_info->vers_limit_exceed() || part_info->vers_interval_exceed(end_ts))
{ {
part_info->vers_part_rotate(thd); part_info->vers_part_rotate(thd);

12
sql/sql_view.cc
View File

@ -457,9 +457,6 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
for (SELECT_LEX *sl= select_lex; sl; sl= sl->next_select()) for (SELECT_LEX *sl= select_lex; sl; sl= sl->next_select())
{ /* System Versioning: fix system fields of versioned view */ { /* System Versioning: fix system fields of versioned view */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat"
#pragma GCC diagnostic ignored "-Wformat-extra-args"
// Similar logic as in mysql_derived_prepare() // Similar logic as in mysql_derived_prepare()
// Leading versioning table detected implicitly (first one selected) // Leading versioning table detected implicitly (first one selected)
TABLE_LIST *impli_table= NULL; TABLE_LIST *impli_table= NULL;
@ -480,7 +477,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
{ {
my_printf_error( my_printf_error(
ER_VERS_VIEW_PROHIBITED, ER_VERS_VIEW_PROHIBITED,
"Creating VIEW %`s is prohibited: versioned VIEW %`s in query!", MYF(0), "Creating VIEW `%s` is prohibited: versioned VIEW `%s` in query!", MYF(0),
view->table_name, view->table_name,
table->table_name); table->table_name);
res= true; res= true;
@ -519,7 +516,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
{ {
my_printf_error( my_printf_error(
ER_VERS_VIEW_PROHIBITED, ER_VERS_VIEW_PROHIBITED,
"Creating VIEW %`s is prohibited: multiple start system fields `%s.%s`, `%s.%s` in query!", MYF(0), "Creating VIEW `%s` is prohibited: multiple start system fields `%s.%s`, `%s.%s` in query!", MYF(0),
view->table_name, view->table_name,
expli_table->alias, expli_table->alias,
expli_start->field_name.str, expli_start->field_name.str,
@ -535,7 +532,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
expli_table_err: expli_table_err:
my_printf_error( my_printf_error(
ER_VERS_VIEW_PROHIBITED, ER_VERS_VIEW_PROHIBITED,
"Creating VIEW %`s is prohibited: system fields from multiple tables %`s, %`s in query!", MYF(0), "Creating VIEW `%s` is prohibited: system fields from multiple tables `%s`, `%s` in query!", MYF(0),
view->table_name, view->table_name,
expli_table->alias, expli_table->alias,
table->alias); table->alias);
@ -554,7 +551,7 @@ expli_table_err:
{ {
my_printf_error( my_printf_error(
ER_VERS_VIEW_PROHIBITED, ER_VERS_VIEW_PROHIBITED,
"Creating VIEW %`s is prohibited: multiple end system fields `%s.%s`, `%s.%s` in query!", MYF(0), "Creating VIEW `%s` is prohibited: multiple end system fields `%s.%s`, `%s.%s` in query!", MYF(0),
view->table_name, view->table_name,
expli_table->alias, expli_table->alias,
expli_end->field_name.str, expli_end->field_name.str,
@ -586,7 +583,6 @@ expli_table_err:
if (!expli_end && sl->vers_push_field(thd, impli_table, impli_end)) if (!expli_end && sl->vers_push_field(thd, impli_table, impli_end))
goto err; goto err;
} }
#pragma GCC diagnostic pop
} /* System Versioning end */ } /* System Versioning end */
view= lex->unlink_first_table(&link_to_local); view= lex->unlink_first_table(&link_to_local);

2
sql/sys_vars.ic
View File

@ -2637,7 +2637,7 @@ private:
bool update(set_var *var, st_vers_asof_timestamp &out) bool update(set_var *var, st_vers_asof_timestamp &out)
{ {
bool res= false; bool res= false;
out.type= var->save_result.ulonglong_value; out.type= static_cast<enum_var_type>(var->save_result.ulonglong_value);
if (out.type == FOR_SYSTEM_TIME_AS_OF) if (out.type == FOR_SYSTEM_TIME_AS_OF)
{ {
res= var->value->get_date(&out.ltime, 0); res= var->value->get_date(&out.ltime, 0);

3
sql/table.cc
View File

@ -4766,7 +4766,8 @@ bool TABLE_LIST::create_field_translation(THD *thd)
if (is_view() && get_unit()->prepared && !field_translation_updated) if (is_view() && get_unit()->prepared && !field_translation_updated)
{ {
field_translation_updated= TRUE; field_translation_updated= TRUE;
if (field_translation_end - field_translation < select->item_list.elements) if (static_cast<uint>(field_translation_end - field_translation) <
select->item_list.elements)
goto allocate; goto allocate;
while ((item= it++)) while ((item= it++))
{ {

2
storage/innobase/handler/ha_innodb.cc
View File

@ -1714,7 +1714,7 @@ thd_start_time_in_secs(
/*===================*/ /*===================*/
THD* thd) /*!< in: thread handle, or NULL */ THD* thd) /*!< in: thread handle, or NULL */
{ {
return(thd_start_time(thd)); return(static_cast<ulint>(thd_start_time(thd)));
} }
/** Enter InnoDB engine after checking the max number of user threads /** Enter InnoDB engine after checking the max number of user threads

2
storage/innobase/row/row0ins.cc
View File

@ -4060,7 +4060,7 @@ void vers_notify_vtq(trx_t* trx)
dtuple_t* tuple = dtuple_create(heap, dict_table_get_n_cols(dict_sys->sys_vtq)); dtuple_t* tuple = dtuple_create(heap, dict_table_get_n_cols(dict_sys->sys_vtq));
timeval begin_ts, commit_ts; timeval begin_ts, commit_ts;
begin_ts.tv_sec = trx->start_time; begin_ts.tv_sec = static_cast<long>(trx->start_time);
begin_ts.tv_usec = trx->start_time_micro % 1000000; begin_ts.tv_usec = trx->start_time_micro % 1000000;
mutex_enter(&trx_sys->mutex); mutex_enter(&trx_sys->mutex);