svnno****@sourc*****
svnno****@sourc*****
2007年 11月 16日 (金) 17:35:05 JST
Revision: 49
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=49
Author: mir
Date: 2007-11-16 17:35:04 +0900 (Fri, 16 Nov 2007)
Log Message:
-----------
fixed kwic sql function regarding to null value.
Modified Paths:
--------------
mysql-5.0.45-tritonn-1.1.0/sql/item_strfunc.cc
Modified: mysql-5.0.45-tritonn-1.1.0/sql/item_strfunc.cc
===================================================================
--- mysql-5.0.45-tritonn-1.1.0/sql/item_strfunc.cc 2007-11-16 08:33:11 UTC (rev 48)
+++ mysql-5.0.45-tritonn-1.1.0/sql/item_strfunc.cc 2007-11-16 08:35:04 UTC (rev 49)
@@ -3423,10 +3423,7 @@
uint result_len;
int i;
- if (str == NULL) {
- SEN_LOG(sen_log_warning, "Item_func_senna_snipet::val_str(null) is called");
- goto err_null;
- }
+ null_value=0;
if (arg_count < 9 || arg_count % 3 != 0) {
SEN_LOG(sen_log_warning, "Incorrect number of arguments for kwic: %d", arg_count);
@@ -3434,7 +3431,7 @@
}
for (i = 0; i < arg_count; i++) {
- if (args[i]->null_value) {
+ if (!(args[i]->val_str(str))) {
SEN_LOG(sen_log_warning, "kwic argument #%d is null", i+1);
goto err_null;
}