database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Oleksandr Byelkin
2018-09-14 08:47:22 +02:00
parent 3866589308 f1bcfbb437
commit 28f08d3753
321 changed files with 6852 additions and 195819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/log_event.cc
View File

@@ -8727,11 +8727,6 @@ User_var_log_event(const char* buf, uint event_len,
we keep the flags set to UNDEF_F.
*/
size_t bytes_read= (val + val_len) - buf_start;
if (bytes_read > size_t(event_len))
{
error= true;
goto err;
}
if ((data_written - bytes_read) > 0)
{
flags= (uint) *(buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE +