• R/O
  • SSH
  • HTTPS

tritonn: Commit


Commit MetaInfo

Revision180 (tree)
Time2010-03-25 12:05:13
Authormyuka

Log Message

added a system variable

  • senna_score_sort

Change Summary

Incremental Difference

--- tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_class.h (revision 179)
+++ tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_class.h (revision 180)
@@ -628,6 +628,7 @@
628628
629629 #ifdef ENABLE_SENNA
630630 my_bool senna_2ind;
631+ my_bool senna_score_sort; //yuka wrote 100324
631632 #endif
632633 };
633634
--- tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc (revision 179)
+++ tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc (revision 180)
@@ -5107,6 +5107,7 @@
51075107 OPT_SENNA_LOG_LEVEL,
51085108 OPT_SENNA_2IND,
51095109 OPT_SENNA_INDEX_TYPE,
5110+ OPT_SENNA_SCORE_SORT, /*yuka wrote 100324*/
51105111 #endif
51115112 OPT_PROFILING,
51125113 OPT_INNODB_ROLLBACK_ON_TIMEOUT,
@@ -5813,6 +5814,11 @@
58135814 {"senna-log-level", OPT_SENNA_LOG_LEVEL, "Senna log level.",
58145815 (gptr*) &opt_senna_log_level, (gptr*) &opt_senna_log_level, 0, GET_STR, REQUIRED_ARG,
58155816 0, 0, 0, 0, 0, 0},
5817+ {"senna-score-sort", OPT_SENNA_SCORE_SORT,
5818+ "Enable sen_records_sort function. Default value is ON",
5819+ (gptr*) &global_system_variables.senna_score_sort,
5820+ (gptr*) &global_system_variables.senna_score_sort,
5821+ 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, /* yuka wrote 100324 */
58165822 #endif
58175823 {"secure-file-priv", OPT_SECURE_FILE_PRIV,
58185824 "Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files within specified directory",
@@ -7109,6 +7115,7 @@
71097115 opt_senna_log = 0;
71107116 senna_log_level_options = senna_logger.max_level;
71117117 global_system_variables.senna_2ind = 0;
7118+ global_system_variables.senna_score_sort = 1; /*yuka wrote 100324*/
71127119 #endif
71137120
71147121 #if defined(__WIN__) || defined(__NETWARE__)
@@ -7757,6 +7764,9 @@
77577764 case OPT_SENNA_2IND:
77587765 global_system_variables.senna_2ind = 1;
77597766 break;
7767+ case OPT_SENNA_SCORE_SORT: /* yuka wrote 100324 */
7768+ global_system_variables.senna_score_sort=1;
7769+ break; /* end yuka wrote 100324 */
77607770 #endif
77617771 }
77627772 return 0;
--- tags/tritonn-1.0.12-mysql-5.0.83/sql/set_var.cc (revision 179)
+++ tags/tritonn-1.0.12-mysql-5.0.83/sql/set_var.cc (revision 180)
@@ -504,6 +504,7 @@
504504 sys_var_enum sys_senna_log_level("senna_log_level",&senna_log_level_options,
505505 &senna_log_level_typelib, fix_senna_log_level);
506506 sys_var_thd_bool sys_senna_2ind("senna_2ind", &SV::senna_2ind, fix_senna_2ind);
507+sys_var_thd_bool sys_senna_score_sort("senna_score_sort", &SV::senna_score_sort); /*yuka wrote 100324*/
507508 #endif
508509
509510 /* Condition pushdown to storage engine */
@@ -797,6 +798,7 @@
797798 &sys_senna_2ind,
798799 &sys_senna_index_type,
799800 &sys_senna_log_level,
801+ &sys_senna_score_sort, /* yuka wrote 100324 */
800802 #endif
801803 &sys_server_id,
802804 #ifdef HAVE_REPLICATION
@@ -1130,6 +1132,7 @@
11301132 {"senna_index_type", (char*) &sys_senna_index_type, SHOW_SYS},
11311133 {"senna_log", (char*) &opt_senna_log, SHOW_MY_BOOL},
11321134 {"senna_log_level", (char*) &sys_senna_log_level, SHOW_SYS},
1135+ {"senna_score_sort", (char*) &sys_senna_score_sort, SHOW_SYS}, /*yuka wrote 100324*/
11331136 #endif
11341137 #ifdef HAVE_SMEM
11351138 {"shared_memory", (char*) &opt_enable_shared_memory, SHOW_MY_BOOL},
Show on old repository browser