database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source 
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
This commit is contained in:
Sergei Golubchik
2015-09-03 12:58:41 +02:00
parent 5088cbf4ed 4b41e3c7f3
commit 530a6e7481
361 changed files with 9490 additions and 4591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_repl.cc
View File

@ -79,8 +79,7 @@ fake_event_header(String* packet, Log_event_type event_type, ulong extra_len,
}
if (*do_checksum)
{
*crc= my_checksum(0L, NULL, 0);
*crc= my_checksum(*crc, (uchar*)header, sizeof(header));
*crc= my_checksum(0, (uchar*)header, sizeof(header));
}
return 0;
}
@ -811,8 +810,8 @@ static int send_heartbeat_event(binlog_send_info *info,
if (do_checksum)
{
char b[BINLOG_CHECKSUM_LEN];
ha_checksum crc= my_checksum(0L, NULL, 0);
crc= my_checksum(crc, (uchar*) header, sizeof(header));
ha_checksum crc;
crc= my_checksum(0, (uchar*) header, sizeof(header));
crc= my_checksum(crc, (uchar*) p, ident_len);
int4store(b, crc);
packet->append(b, sizeof(b));