mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Cleanups
Don't use DBUG library for struct st_my_thread_var to make code less complicated. Docs/manual.texi: Cleanup acinclude.m4: Search after openssl in /usr/local client/mysql.cc: Fix prompt client/mysqladmin.c: Cleanup client/mysqltest.c: Cleanup include/my_pthread.h: Move thread variables to the right location include/my_sys.h: Move thread variables to the right location include/mysql.h: Clean up client prototypes libmysql/libmysql.c: Clean up client prototypes mysys/my_static.h: Cleanup mysys/my_thr_init.c: Don't use DBUG library for struct st_my_thread_var to make code less complicated sql/item_cmpfunc.cc: Small optimization sql/net_pkg.cc: Cleanup sql/sql_parse.cc: Allow VARCHAR(0)
This commit is contained in:
@ -790,8 +790,9 @@ String *Item_func_coalesce::val_str(String *str)
|
||||
null_value=0;
|
||||
for (uint i=0 ; i < arg_count ; i++)
|
||||
{
|
||||
if (args[i]->val_str(str) != NULL)
|
||||
return args[i]->val_str(str);
|
||||
String *res;
|
||||
if ((res=args[i]->val_str(str)))
|
||||
return res;
|
||||
}
|
||||
null_value=1;
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user