svnno****@sourc*****
svnno****@sourc*****
2007年 10月 9日 (火) 16:52:12 JST
Revision: 25
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=25
Author: mir
Date: 2007-10-09 16:52:12 +0900 (Tue, 09 Oct 2007)
Log Message:
-----------
bugfix for kwic sql function: got signal 11 if column data is null.
Modified Paths:
--------------
mysql-5.0.45-tritonn-1.0.7/mysql-test/suite/senna/r/senna_kwic.result
mysql-5.0.45-tritonn-1.0.7/mysql-test/suite/senna/t/senna_kwic.test
mysql-5.0.45-tritonn-1.0.7/sql/item_strfunc.cc
Modified: mysql-5.0.45-tritonn-1.0.7/mysql-test/suite/senna/r/senna_kwic.result
===================================================================
--- mysql-5.0.45-tritonn-1.0.7/mysql-test/suite/senna/r/senna_kwic.result 2007-10-09 07:33:55 UTC (rev 24)
+++ mysql-5.0.45-tritonn-1.0.7/mysql-test/suite/senna/r/senna_kwic.result 2007-10-09 07:52:12 UTC (rev 25)
@@ -147,3 +147,9 @@
kwic(c1, 20, 5, 0, "(", ")", "埼玉", "[", "]")
(日は[埼玉]ああ)(日も[埼玉]ああ)(日も[埼玉]ああ)(でも[埼玉]ああ)
drop table t1;
+CREATE TABLE t1 (c1 int, c2 TEXT) DEFAULT CHARSET utf8;
+INSERT INTO t1 (c1) VALUES (100);
+SELECT KWIC(c1, 30, 1, 0, "","", "東京", "<span class='word'>", "</span>") FROM t1;
+KWIC(c1, 30, 1, 0, "","", "東京", "<span class='word'>", "</span>")
+
+DROP TABLE t1;
Modified: mysql-5.0.45-tritonn-1.0.7/mysql-test/suite/senna/t/senna_kwic.test
===================================================================
--- mysql-5.0.45-tritonn-1.0.7/mysql-test/suite/senna/t/senna_kwic.test 2007-10-09 07:33:55 UTC (rev 24)
+++ mysql-5.0.45-tritonn-1.0.7/mysql-test/suite/senna/t/senna_kwic.test 2007-10-09 07:52:12 UTC (rev 25)
@@ -98,3 +98,10 @@
select kwic(c1, 20, 5, 0, "(", ")", "埼玉", "[", "]") from t1;
drop table t1;
+
+# bugfix colmun data is null
+CREATE TABLE t1 (c1 int, c2 TEXT) DEFAULT CHARSET utf8;
+INSERT INTO t1 (c1) VALUES (100);
+SELECT KWIC(c1, 30, 1, 0, "","", "東京", "<span class='word'>", "</span>") FROM t1;
+DROP TABLE t1;
+
Modified: mysql-5.0.45-tritonn-1.0.7/sql/item_strfunc.cc
===================================================================
--- mysql-5.0.45-tritonn-1.0.7/sql/item_strfunc.cc 2007-10-09 07:33:55 UTC (rev 24)
+++ mysql-5.0.45-tritonn-1.0.7/sql/item_strfunc.cc 2007-10-09 07:52:12 UTC (rev 25)
@@ -3457,6 +3457,7 @@
return &my_empty_string;
}
+ if (target == NULL) return &my_empty_string;
encoding = senna_enc_senna(target->charset()->csname);
if (html_encoding == 1) {
mapping = (sen_snip_mapping *) -1;