diff options
| author | unknown <monty@mysql.com> | 2006-03-29 17:04:00 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-03-29 17:04:00 +0300 |
| commit | 8ac1d552861a673bb01b5deb5c9009c312494149 (patch) | |
| tree | 3996c6060eb4637b4c7cd6abca72920ec567a9fb /sql/item_func.cc | |
| parent | 59eaf292de3ab637be34fb5199da98a6192fa650 (diff) | |
| download | mariadb-git-8ac1d552861a673bb01b5deb5c9009c312494149.tar.gz | |
Remove compiler warnings
Add missing DBUG_RETURN
Fixed stack overflow in NdbBlob (found by ndb_gis.test)
Fixed access to freed memory in ndb_cluster_real_free_share()
mysys/mf_keycache.c:
Add missing DBUG_RETURN
sql/ha_ndbcluster.cc:
Move free_root to after share handling, as otherwise we will free things needed by free_table_share()
sql/item_func.cc:
Add missing DBUG_RETURN
sql/item_strfunc.cc:
Add missing DBUG_RETURN
sql/sp_head.cc:
Add missing DBUG_RETURN
sql/sql_base.cc:
Add missing DBUG_RETURN
storage/csv/ha_tina.cc:
Add missing DBUG_RETURN
storage/myisam/mi_key.c:
Add missing DBUG_RETURN
storage/myisam/mi_keycache.c:
Add missing DBUG_RETURN
storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp:
Remove compiler warning
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
Remove compiler warning
storage/ndb/include/transporter/TransporterDefinitions.hpp:
Remove compiler warning
storage/ndb/include/util/SimpleProperties.hpp:
Remove compiler warning
storage/ndb/include/util/SocketServer.hpp:
Remove compiler warning
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Remove compiler warning
storage/ndb/src/ndbapi/NdbBlob.cpp:
Fix stack overflow
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Remove compiler warning
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Remove compiler warning
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 30b2c44c453..99b49d5686e 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4463,7 +4463,7 @@ double Item_func_match::val_real() DBUG_RETURN(-1.0); if (table->null_row) /* NULL row from an outer join */ - return 0.0; + DBUG_RETURN(0.0); if (join_key) { @@ -4480,9 +4480,8 @@ double Item_func_match::val_real() DBUG_RETURN(ft_handler->please->find_relevance(ft_handler, (byte *)a->ptr(), a->length())); } - else - DBUG_RETURN(ft_handler->please->find_relevance(ft_handler, - table->record[0], 0)); + DBUG_RETURN(ft_handler->please->find_relevance(ft_handler, + table->record[0], 0)); } void Item_func_match::print(String *str) |