File tree Expand file tree Collapse file tree 3 files changed +8
-10
lines changed Expand file tree Collapse file tree 3 files changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -4356,12 +4356,11 @@ void Field_longlong::sql_type(String &res) const
4356
4356
add_zerofill_and_unsigned (res);
4357
4357
}
4358
4358
4359
- bool Field_longlong::set_max ()
4359
+ void Field_longlong::set_max ()
4360
4360
{
4361
4361
ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED;
4362
4362
set_notnull ();
4363
4363
int8store (ptr, unsigned_flag ? ULONGLONG_MAX : LONGLONG_MAX);
4364
- return FALSE ;
4365
4364
}
4366
4365
4367
4366
bool Field_longlong::is_max ()
@@ -5444,7 +5443,7 @@ void Field_timestampf::store_TIME(my_time_t timestamp, ulong sec_part)
5444
5443
my_timestamp_to_binary (&tm, ptr, dec);
5445
5444
}
5446
5445
5447
- bool Field_timestampf::set_max ()
5446
+ void Field_timestampf::set_max ()
5448
5447
{
5449
5448
DBUG_ENTER (" Field_timestampf::set_max" );
5450
5449
ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED;
@@ -5453,7 +5452,7 @@ bool Field_timestampf::set_max()
5453
5452
mi_int4store (ptr, TIMESTAMP_MAX_VALUE);
5454
5453
memset (ptr + 4 , 0x0 , value_length () - 4 );
5455
5454
5456
- DBUG_RETURN ( FALSE ) ;
5455
+ DBUG_VOID_RETURN ;
5457
5456
}
5458
5457
5459
5458
bool Field_timestampf::is_max ()
Original file line number Diff line number Diff line change @@ -677,8 +677,8 @@ class Field: public Value_source
677
677
/* *
678
678
Used by System Versioning.
679
679
*/
680
- virtual bool set_max ()
681
- { DBUG_ASSERT (0 ); return false ; }
680
+ virtual void set_max ()
681
+ { DBUG_ASSERT (0 ); }
682
682
virtual bool is_max ()
683
683
{ DBUG_ASSERT (0 ); return false ; }
684
684
@@ -2129,7 +2129,7 @@ class Field_longlong :public Field_num {
2129
2129
return unpack_int64 (to, from, from_end);
2130
2130
}
2131
2131
2132
- bool set_max ();
2132
+ void set_max ();
2133
2133
bool is_max ();
2134
2134
};
2135
2135
@@ -2540,7 +2540,7 @@ class Field_timestampf :public Field_timestamp_with_dec {
2540
2540
{
2541
2541
return memcmp (a_ptr, b_ptr, pack_length ());
2542
2542
}
2543
- bool set_max ();
2543
+ void set_max ();
2544
2544
bool is_max ();
2545
2545
void store_TIME (my_time_t timestamp, ulong sec_part);
2546
2546
my_time_t get_timestamp (const uchar *pos= NULL , ulong *sec_part= NULL ) const ;
Original file line number Diff line number Diff line change @@ -7602,8 +7602,7 @@ void TABLE::vers_update_fields()
7602
7602
7603
7603
if (vers_start_field ()->set_time ())
7604
7604
DBUG_ASSERT (0 );
7605
- if (vers_end_field ()->set_max ())
7606
- DBUG_ASSERT (0 );
7605
+ vers_end_field ()->set_max ();
7607
7606
7608
7607
DBUG_VOID_RETURN;
7609
7608
}
You can’t perform that action at this time.
0 commit comments