diff options
| author | unknown <monty@mishka.local> | 2005-07-31 22:56:24 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-07-31 22:56:24 +0300 |
| commit | a560a9f3b3452b0c7960af86d85da1f5a9b5df21 (patch) | |
| tree | 38c12fc8fc89dbdbd9c48d36c8b65e6139e5e7ee /client/mysqlbinlog.cc | |
| parent | 4dbc076e1e4a9264121a3da34b653591b7ce0688 (diff) | |
| download | mariadb-git-a560a9f3b3452b0c7960af86d85da1f5a9b5df21.tar.gz | |
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)
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 1a628bd08c7..d074fa19122 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -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) |