mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

SQL: remove unneded return value

Browse source
This commit is contained in:
kevg 2016-12-15 13:04:45 +03:00 • committed by Aleksey Midenkov
commit 41d9840850
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/field.cc
View file

@ -4356,12 +4356,11 @@ void Field_longlong::sql_type(String &res) const
add_zerofill_and_unsigned(res);
}
bool Field_longlong::set_max()
void Field_longlong::set_max()
{
ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED;
set_notnull();
int8store(ptr, unsigned_flag ? ULONGLONG_MAX : LONGLONG_MAX);
return FALSE;
}
bool Field_longlong::is_max()
@ -5444,7 +5443,7 @@ void Field_timestampf::store_TIME(my_time_t timestamp, ulong sec_part)
my_timestamp_to_binary(&tm, ptr, dec);
}
bool Field_timestampf::set_max()
void Field_timestampf::set_max()
{
DBUG_ENTER("Field_timestampf::set_max");
ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED;
@ -5453,7 +5452,7 @@ bool Field_timestampf::set_max()
mi_int4store(ptr, TIMESTAMP_MAX_VALUE);
memset(ptr + 4, 0x0, value_length() - 4);
DBUG_RETURN(FALSE);
DBUG_VOID_RETURN;
}
bool Field_timestampf::is_max()

8
sql/field.h
View file

@ -677,8 +677,8 @@ public:
/**
Used by System Versioning.
*/
virtual bool set_max()
{ DBUG_ASSERT(0); return false; }
virtual void set_max()
{ DBUG_ASSERT(0); }
virtual bool is_max()
{ DBUG_ASSERT(0); return false; }
@ -2129,7 +2129,7 @@ public:
return unpack_int64(to, from, from_end);
}
bool set_max();
void set_max();
bool is_max();
};
@ -2540,7 +2540,7 @@ public:
{
return memcmp(a_ptr, b_ptr, pack_length());
}
bool set_max();
void set_max();
bool is_max();
void store_TIME(my_time_t timestamp, ulong sec_part);
my_time_t get_timestamp(const uchar *pos= NULL, ulong *sec_part= NULL) const;

3
sql/table.cc
View file

@ -7602,8 +7602,7 @@ void TABLE::vers_update_fields()
if (vers_start_field()->set_time())
DBUG_ASSERT(0);
if (vers_end_field()->set_max())
DBUG_ASSERT(0);
vers_end_field()->set_max();
DBUG_VOID_RETURN;
}