svnno****@sourc*****
svnno****@sourc*****
2010年 3月 25日 (木) 12:05:14 JST
Revision: 180
http://sourceforge.jp/projects/tritonn/svn/view?view=rev&revision=180
Author: myuka
Date: 2010-03-25 12:05:13 +0900 (Thu, 25 Mar 2010)
Log Message:
-----------
added a system variable
* senna_score_sort
Modified Paths:
--------------
tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc
tags/tritonn-1.0.12-mysql-5.0.83/sql/set_var.cc
tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_class.h
-------------- next part --------------
Modified: tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc
===================================================================
--- tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc 2010-03-24 04:53:18 UTC (rev 179)
+++ tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc 2010-03-25 03:05:13 UTC (rev 180)
@@ -5107,6 +5107,7 @@
OPT_SENNA_LOG_LEVEL,
OPT_SENNA_2IND,
OPT_SENNA_INDEX_TYPE,
+ OPT_SENNA_SCORE_SORT, /*yuka wrote 100324*/
#endif
OPT_PROFILING,
OPT_INNODB_ROLLBACK_ON_TIMEOUT,
@@ -5813,6 +5814,11 @@
{"senna-log-level", OPT_SENNA_LOG_LEVEL, "Senna log level.",
(gptr*) &opt_senna_log_level, (gptr*) &opt_senna_log_level, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0},
+ {"senna-score-sort", OPT_SENNA_SCORE_SORT,
+ "Enable sen_records_sort function. Default value is ON",
+ (gptr*) &global_system_variables.senna_score_sort,
+ (gptr*) &global_system_variables.senna_score_sort,
+ 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, /* yuka wrote 100324 */
#endif
{"secure-file-priv", OPT_SECURE_FILE_PRIV,
"Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files within specified directory",
@@ -7109,6 +7115,7 @@
opt_senna_log = 0;
senna_log_level_options = senna_logger.max_level;
global_system_variables.senna_2ind = 0;
+ global_system_variables.senna_score_sort = 1; /*yuka wrote 100324*/
#endif
#if defined(__WIN__) || defined(__NETWARE__)
@@ -7757,6 +7764,9 @@
case OPT_SENNA_2IND:
global_system_variables.senna_2ind = 1;
break;
+ case OPT_SENNA_SCORE_SORT: /* yuka wrote 100324 */
+ global_system_variables.senna_score_sort=1;
+ break; /* end yuka wrote 100324 */
#endif
}
return 0;
Modified: tags/tritonn-1.0.12-mysql-5.0.83/sql/set_var.cc
===================================================================
--- tags/tritonn-1.0.12-mysql-5.0.83/sql/set_var.cc 2010-03-24 04:53:18 UTC (rev 179)
+++ tags/tritonn-1.0.12-mysql-5.0.83/sql/set_var.cc 2010-03-25 03:05:13 UTC (rev 180)
@@ -504,6 +504,7 @@
sys_var_enum sys_senna_log_level("senna_log_level",&senna_log_level_options,
&senna_log_level_typelib, fix_senna_log_level);
sys_var_thd_bool sys_senna_2ind("senna_2ind", &SV::senna_2ind, fix_senna_2ind);
+sys_var_thd_bool sys_senna_score_sort("senna_score_sort", &SV::senna_score_sort); /*yuka wrote 100324*/
#endif
/* Condition pushdown to storage engine */
@@ -797,6 +798,7 @@
&sys_senna_2ind,
&sys_senna_index_type,
&sys_senna_log_level,
+ &sys_senna_score_sort, /* yuka wrote 100324 */
#endif
&sys_server_id,
#ifdef HAVE_REPLICATION
@@ -1130,6 +1132,7 @@
{"senna_index_type", (char*) &sys_senna_index_type, SHOW_SYS},
{"senna_log", (char*) &opt_senna_log, SHOW_MY_BOOL},
{"senna_log_level", (char*) &sys_senna_log_level, SHOW_SYS},
+ {"senna_score_sort", (char*) &sys_senna_score_sort, SHOW_SYS}, /*yuka wrote 100324*/
#endif
#ifdef HAVE_SMEM
{"shared_memory", (char*) &opt_enable_shared_memory, SHOW_MY_BOOL},
Modified: tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_class.h
===================================================================
--- tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_class.h 2010-03-24 04:53:18 UTC (rev 179)
+++ tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_class.h 2010-03-25 03:05:13 UTC (rev 180)
@@ -628,6 +628,7 @@
#ifdef ENABLE_SENNA
my_bool senna_2ind;
+ my_bool senna_score_sort; //yuka wrote 100324
#endif
};