diff options
author | unknown <monty@hundin.mysql.fi> | 2002-04-02 17:54:57 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-04-02 17:54:57 +0300 |
commit | c95270b8c4b320c1080acc03da99e2a33c80440b (patch) | |
tree | 0918e7f417ac64ab19af6ea441c12c97e897c1b9 /sql/item_cmpfunc.cc | |
parent | 546b6a679ff5f42e5ee5433982a2fb4daa256344 (diff) | |
download | mariadb-git-c95270b8c4b320c1080acc03da99e2a33c80440b.tar.gz |
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)
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r-- | sql/item_cmpfunc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 0c83698e60a..bb773af1ddf 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -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; |