diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 07:12:27 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 07:12:27 +0200 |
| commit | af143474d8925cdbcfc0795a2bc274cbeaad8889 (patch) | |
| tree | 790022e64c90ce37310d20f1de25af35b0f722c9 /sql/item_cmpfunc.cc | |
| parent | 7b500f04fb0baf56b02583f82982508203e58d38 (diff) | |
| parent | 48e35b8cf61cbedb515787762708afe7bd75386b (diff) | |
| download | mariadb-git-af143474d8925cdbcfc0795a2bc274cbeaad8889.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index f49d17a6ded..8461de9cd36 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -789,7 +789,9 @@ int Arg_comparator::compare_e_string() { String *res1,*res2; res1= (*a)->val_str(&value1); + DBUG_ASSERT((res1 == NULL) == (*a)->null_value); res2= (*b)->val_str(&value2); + DBUG_ASSERT((res2 == NULL) == (*b)->null_value); if (!res1 || !res2) return MY_TEST(res1 == res2); return MY_TEST(sortcmp(res1, res2, compare_collation()) == 0); |