diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 10:47:52 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 12:19:59 +0200 |
| commit | d2f1c3ed6ccf823babf311970dfa0b7c57850db7 (patch) | |
| tree | 7c3db13f204c0a0c08f48ddaa402e64a2e209192 /sql/item_cmpfunc.cc | |
| parent | 212994f704496d01881f377e34e04bd007e5e298 (diff) | |
| parent | af143474d8925cdbcfc0795a2bc274cbeaad8889 (diff) | |
| download | mariadb-git-d2f1c3ed6ccf823babf311970dfa0b7c57850db7.tar.gz | |
Merge branch '10.5' into bb-10.6-release
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 879b314e624..7ccd44d7408 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -780,7 +780,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); |