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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-11-08 17:01:28 +02:00
parent fe330b63fe 8fb176c3c1
commit a732d5e2ba
47 changed files with 475 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/handler.cc
View File

@@ -6967,8 +6967,13 @@ int handler::check_duplicate_long_entries_update(const uchar *new_rec)
{
int error;
field= keypart->field;
/* Compare fields if they are different then check for duplicates */
if (field->cmp_binary_offset(reclength))
/*
Compare fields if they are different then check for duplicates
cmp_binary_offset cannot differentiate between null and empty string
So also check for that too
*/
if((field->is_null(0) != field->is_null(reclength)) ||
field->cmp_binary_offset(reclength))
{
if((error= check_duplicate_long_entry_key(new_rec, i)))
return error;