@@ -5026,16 +5026,16 @@ int Field_timestamp::save_in_field(Field *to)
5026
5026
return to->store_timestamp_dec (Timeval (ts, sec_part), decimals ());
5027
5027
}
5028
5028
5029
- my_time_t Field_timestamp ::get_timestamp (const uchar *pos,
5030
- ulong *sec_part) const
5029
+ my_time_t Field_timestamp0 ::get_timestamp (const uchar *pos,
5030
+ ulong *sec_part) const
5031
5031
{
5032
5032
DBUG_ASSERT (marked_for_read ());
5033
5033
*sec_part= 0 ;
5034
5034
return sint4korr (pos);
5035
5035
}
5036
5036
5037
5037
5038
- bool Field_timestamp ::val_native (Native *to)
5038
+ bool Field_timestamp0 ::val_native (Native *to)
5039
5039
{
5040
5040
DBUG_ASSERT (marked_for_read ());
5041
5041
my_time_t sec= (my_time_t ) sint4korr (ptr);
@@ -5200,12 +5200,6 @@ int Field_timestamp::store_native(const Native &value)
5200
5200
}
5201
5201
5202
5202
5203
- double Field_timestamp::val_real (void )
5204
- {
5205
- return (double ) Field_timestamp::val_int ();
5206
- }
5207
-
5208
-
5209
5203
longlong Field_timestamp::val_int (void )
5210
5204
{
5211
5205
MYSQL_TIME ltime;
@@ -5309,15 +5303,15 @@ bool Field_timestamp::get_date(MYSQL_TIME *ltime, date_mode_t fuzzydate)
5309
5303
}
5310
5304
5311
5305
5312
- bool Field_timestamp ::send_binary (Protocol *protocol)
5306
+ bool Field_timestamp0 ::send_binary (Protocol *protocol)
5313
5307
{
5314
5308
MYSQL_TIME ltime;
5315
- Field_timestamp ::get_date (<ime, date_mode_t (0 ));
5309
+ Field_timestamp0 ::get_date (<ime, date_mode_t (0 ));
5316
5310
return protocol->store (<ime, 0 );
5317
5311
}
5318
5312
5319
5313
5320
- int Field_timestamp ::cmp (const uchar *a_ptr, const uchar *b_ptr) const
5314
+ int Field_timestamp0 ::cmp (const uchar *a_ptr, const uchar *b_ptr) const
5321
5315
{
5322
5316
int32 a,b;
5323
5317
a=sint4korr (a_ptr);
@@ -5326,7 +5320,7 @@ int Field_timestamp::cmp(const uchar *a_ptr, const uchar *b_ptr) const
5326
5320
}
5327
5321
5328
5322
5329
- void Field_timestamp ::sort_string (uchar *to,uint length __attribute__ ((unused)))
5323
+ void Field_timestamp0 ::sort_string (uchar *to,uint length __attribute__ ((unused)))
5330
5324
{
5331
5325
to[0 ] = ptr[3 ];
5332
5326
to[1 ] = ptr[2 ];
@@ -5348,7 +5342,7 @@ void Field_timestamp::sql_type(String &res) const
5348
5342
}
5349
5343
5350
5344
5351
- int Field_timestamp ::set_time ()
5345
+ int Field_timestamp0 ::set_time ()
5352
5346
{
5353
5347
set_notnull ();
5354
5348
store_TIMESTAMP (Timestamp (get_thd ()->query_start (), 0 ));
@@ -5808,7 +5802,7 @@ int Field_time::store_TIME_with_warning(const Time *t,
5808
5802
}
5809
5803
5810
5804
5811
- void Field_time ::store_TIME (const MYSQL_TIME *ltime)
5805
+ void Field_time0 ::store_TIME (const MYSQL_TIME *ltime)
5812
5806
{
5813
5807
DBUG_ASSERT (ltime->year == 0 );
5814
5808
DBUG_ASSERT (ltime->month == 0 );
@@ -5896,14 +5890,14 @@ Field *Field_time::new_key_field(MEM_ROOT *root, TABLE *new_table,
5896
5890
}
5897
5891
5898
5892
5899
- double Field_time ::val_real (void )
5893
+ double Field_time0 ::val_real (void )
5900
5894
{
5901
5895
DBUG_ASSERT (marked_for_read ());
5902
5896
uint32 j= (uint32) uint3korr (ptr);
5903
5897
return (double ) j;
5904
5898
}
5905
5899
5906
- longlong Field_time ::val_int (void )
5900
+ longlong Field_time0 ::val_int (void )
5907
5901
{
5908
5902
DBUG_ASSERT (marked_for_read ());
5909
5903
return (longlong) sint3korr (ptr);
@@ -5952,7 +5946,7 @@ bool Field_time::check_zero_in_date_with_warn(date_mode_t fuzzydate)
5952
5946
DATE_FORMAT(time, "%l.%i %p")
5953
5947
*/
5954
5948
5955
- bool Field_time ::get_date (MYSQL_TIME *ltime, date_mode_t fuzzydate)
5949
+ bool Field_time0 ::get_date (MYSQL_TIME *ltime, date_mode_t fuzzydate)
5956
5950
{
5957
5951
if (check_zero_in_date_with_warn (fuzzydate))
5958
5952
return true ;
@@ -5982,15 +5976,15 @@ bool Field_time::send_binary(Protocol *protocol)
5982
5976
}
5983
5977
5984
5978
5985
- int Field_time ::cmp (const uchar *a_ptr, const uchar *b_ptr) const
5979
+ int Field_time0 ::cmp (const uchar *a_ptr, const uchar *b_ptr) const
5986
5980
{
5987
5981
int32 a,b;
5988
5982
a=(int32) sint3korr (a_ptr);
5989
5983
b=(int32) sint3korr (b_ptr);
5990
5984
return (a < b) ? -1 : (a > b) ? 1 : 0 ;
5991
5985
}
5992
5986
5993
- void Field_time ::sort_string (uchar *to,uint length __attribute__ ((unused)))
5987
+ void Field_time0 ::sort_string (uchar *to,uint length __attribute__ ((unused)))
5994
5988
{
5995
5989
to[0 ] = (uchar) (ptr[2 ] ^ 128 );
5996
5990
to[1 ] = ptr[1 ];
@@ -6695,7 +6689,7 @@ Item *Field_newdate::get_equal_const_item(THD *thd, const Context &ctx,
6695
6689
** Stored as a 8 byte unsigned int. Should sometimes be change to a 6 byte int.
6696
6690
****************************************************************************/
6697
6691
6698
- void Field_datetime ::store_TIME (const MYSQL_TIME *ltime)
6692
+ void Field_datetime0 ::store_TIME (const MYSQL_TIME *ltime)
6699
6693
{
6700
6694
ulonglong tmp= TIME_to_ulonglong_datetime (ltime);
6701
6695
int8store (ptr,tmp);
@@ -6710,20 +6704,15 @@ Field_datetime::conversion_depends_on_sql_mode(THD *thd, Item *expr) const
6710
6704
}
6711
6705
6712
6706
6713
- bool Field_datetime ::send_binary (Protocol *protocol)
6707
+ bool Field_datetime0 ::send_binary (Protocol *protocol)
6714
6708
{
6715
6709
MYSQL_TIME tm;
6716
- Field_datetime ::get_date (&tm, date_mode_t (0 ));
6710
+ Field_datetime0 ::get_date (&tm, date_mode_t (0 ));
6717
6711
return protocol->store (&tm, 0 );
6718
6712
}
6719
6713
6720
6714
6721
- double Field_datetime::val_real (void )
6722
- {
6723
- return (double ) Field_datetime::val_int ();
6724
- }
6725
-
6726
- longlong Field_datetime::val_int (void )
6715
+ longlong Field_datetime0::val_int (void )
6727
6716
{
6728
6717
DBUG_ASSERT (marked_for_read ());
6729
6718
longlong j;
@@ -6732,8 +6721,8 @@ longlong Field_datetime::val_int(void)
6732
6721
}
6733
6722
6734
6723
6735
- String *Field_datetime ::val_str (String *val_buffer,
6736
- String *val_ptr __attribute__ ((unused)))
6724
+ String *Field_datetime0 ::val_str (String *val_buffer,
6725
+ String *val_ptr __attribute__ ((unused)))
6737
6726
{
6738
6727
val_buffer->alloc (field_length);
6739
6728
val_buffer->length (field_length);
@@ -6744,7 +6733,7 @@ String *Field_datetime::val_str(String *val_buffer,
6744
6733
char *pos;
6745
6734
int part3;
6746
6735
6747
- tmp= Field_datetime ::val_int ();
6736
+ tmp= Field_datetime0 ::val_int ();
6748
6737
6749
6738
/*
6750
6739
Avoid problem with slow longlong arithmetic and sprintf
@@ -6778,8 +6767,8 @@ String *Field_datetime::val_str(String *val_buffer,
6778
6767
return val_buffer;
6779
6768
}
6780
6769
6781
- bool Field_datetime ::get_TIME (MYSQL_TIME *ltime, const uchar *pos,
6782
- date_mode_t fuzzydate) const
6770
+ bool Field_datetime0 ::get_TIME (MYSQL_TIME *ltime, const uchar *pos,
6771
+ date_mode_t fuzzydate) const
6783
6772
{
6784
6773
DBUG_ASSERT (marked_for_read ());
6785
6774
longlong tmp= sint8korr (pos);
@@ -6800,7 +6789,7 @@ bool Field_datetime::get_TIME(MYSQL_TIME *ltime, const uchar *pos,
6800
6789
}
6801
6790
6802
6791
6803
- int Field_datetime ::cmp (const uchar *a_ptr, const uchar *b_ptr) const
6792
+ int Field_datetime0 ::cmp (const uchar *a_ptr, const uchar *b_ptr) const
6804
6793
{
6805
6794
longlong a,b;
6806
6795
a=sint8korr (a_ptr);
@@ -6809,7 +6798,7 @@ int Field_datetime::cmp(const uchar *a_ptr, const uchar *b_ptr) const
6809
6798
((ulonglong) a > (ulonglong) b) ? 1 : 0 ;
6810
6799
}
6811
6800
6812
- void Field_datetime ::sort_string (uchar *to,uint length __attribute__ ((unused)))
6801
+ void Field_datetime0 ::sort_string (uchar *to,uint length __attribute__ ((unused)))
6813
6802
{
6814
6803
to[0 ] = ptr[7 ];
6815
6804
to[1 ] = ptr[6 ];
0 commit comments