svnno****@sourc*****
svnno****@sourc*****
2007年 10月 26日 (金) 16:04:14 JST
Revision: 35
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=35
Author: mir
Date: 2007-10-26 16:04:14 +0900 (Fri, 26 Oct 2007)
Log Message:
-----------
added new macro MECAB_STATIC and some code in mysqld.cc.
If this macro is enabled, mysqld checks if environment
variable MECABRC is defined, and if not, mysqld sets
MECABRC sets as basedir/etc/mecabrc.
This code are added for using libmecab.a.
Modified Paths:
--------------
mysql-5.0.45-tritonn-1.0.8/sql/mysqld.cc
Modified: mysql-5.0.45-tritonn-1.0.8/sql/mysqld.cc
===================================================================
--- mysql-5.0.45-tritonn-1.0.8/sql/mysqld.cc 2007-10-26 07:03:40 UTC (rev 34)
+++ mysql-5.0.45-tritonn-1.0.8/sql/mysqld.cc 2007-10-26 07:04:14 UTC (rev 35)
@@ -3584,6 +3584,16 @@
senna_logger.max_level = (sen_log_level) senna_log_level_options;
sen_logger_info_set(&senna_logger);
}
+#ifdef MECAB_STATIC
+ const char *mecabrc = getenv("MECABRC");
+ if (!mecabrc) {
+ char *mecabrc_rpath = "etc/mecabrc";
+ int mecabrc_len = strlen(mysql_home) + strlen(mecabrc_rpath) + 1;
+ char *mecabrc_path = my_malloc(mecabrc_len, MYF(MY_WME));
+ my_snprintf(mecabrc_path, mecabrc_len, "%s%s", mysql_home, mecabrc_rpath);
+ setenv("MECABRC", mecabrc_path, 1);
+ }
+#endif /* MECAB_STATIC */
#endif /* ENABLE_SENNA */
select_thread=pthread_self();