mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
After merge fixes
Review of new pushed code client/mysqlbinlog.cc: After merge fixes sql/set_var.cc: After merge fixes sql/sql_select.cc: Removed not needed test (field->maybe_null() also tests field->table->maybe_null)
This commit is contained in:
@@ -805,7 +805,7 @@ static my_time_t convert_str_to_timestamp(const char* str)
|
||||
int was_cut;
|
||||
MYSQL_TIME l_time;
|
||||
long dummy_my_timezone;
|
||||
bool dummy_in_dst_time_gap;
|
||||
my_bool dummy_in_dst_time_gap;
|
||||
/* We require a total specification (date AND time) */
|
||||
if (str_to_datetime(str, strlen(str), &l_time, 0, &was_cut) !=
|
||||
MYSQL_TIMESTAMP_DATETIME || was_cut)
|
||||
|
Reference in New Issue
Block a user