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 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-28 09:08:58 +03:00
parent 1ad1d78981 a8ded39557
commit d8c6c53a06
37 changed files with 644 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_string.cc
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
Copyright (c) 2016, 2020, MariaDB
Copyright (c) 2016, 2021, MariaDB
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
@ -447,8 +447,8 @@ bool String::copy(const char *str, size_t arg_length,
{
uint32 offset;
DBUG_ASSERT(!str || str != Ptr);
DBUG_ASSERT(!str || str != Ptr || !is_alloced());
if (!needs_conversion(arg_length, from_cs, to_cs, &offset))
{
*errors= 0;