mirror of
https://github.com/MariaDB/server.git
synced 2026-10-23 18:49:29 +03:00
After-merge fixes. Unit test and windows compile
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
@@ -9044,7 +9044,7 @@ Heartbeat_log_event::Heartbeat_log_event(const uchar *buf, size_t event_len)
|
||||
log_pos= uint8korr(buf + header_size);
|
||||
|
||||
log_ident= buf + all_headers_len;
|
||||
ident_len= event_len - all_headers_len;
|
||||
ident_len= (uint)(event_len - all_headers_len);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1842,7 +1842,7 @@ int main(int ac, char **av)
|
||||
|
||||
MY_INIT(av[0]);
|
||||
|
||||
plan(6);
|
||||
plan(7);
|
||||
diag("Testing my_like_range_xxx() functions");
|
||||
|
||||
for (i= 0; i < array_elements(charset_list); i++)
|
||||
|
||||
Reference in New Issue
Block a user