1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge with 3.23:

Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE


innobase/btr/btr0sea.c:
  Auto merged
mysql-test/t/case.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/case.result:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23 (to remove duplicate casedn_str())
This commit is contained in:
unknown
2002-12-21 10:56:40 +02:00
6 changed files with 23 additions and 7 deletions

View File

@ -727,8 +727,9 @@ String *Item_func_case::val_str(String *str)
null_value=1;
return 0;
}
null_value= 0;
if (!(res=item->val_str(str)))
null_value=1;
null_value= 1;
return res;
}