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

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-29 22:21:19 +03:00
parent 19da9a51ae 38ea795bb6
commit e9aaa10c11
27 changed files with 304 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.h
View File

@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2016, Oracle and/or its affiliates.
Copyright (c) 2009, 2019, MariaDB Corporation.
Copyright (c) 2009, 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -4003,7 +4003,8 @@ public:
The worst things that can happen is that we get
a suboptimal error message.
*/
if (likely((killed_err= (err_info*) alloc(sizeof(*killed_err)))))
killed_err= (err_info*) alloc_root(&main_mem_root, sizeof(*killed_err));
if (likely(killed_err))
{
killed_err->no= killed_errno_arg;
::strmake((char*) killed_err->msg, killed_err_msg_arg,