added a system variable
@@ -628,6 +628,7 @@ | ||
628 | 628 | |
629 | 629 | #ifdef ENABLE_SENNA |
630 | 630 | my_bool senna_2ind; |
631 | + my_bool senna_score_sort; //yuka wrote 100324 | |
631 | 632 | #endif |
632 | 633 | }; |
633 | 634 |
@@ -5107,6 +5107,7 @@ | ||
5107 | 5107 | OPT_SENNA_LOG_LEVEL, |
5108 | 5108 | OPT_SENNA_2IND, |
5109 | 5109 | OPT_SENNA_INDEX_TYPE, |
5110 | + OPT_SENNA_SCORE_SORT, /*yuka wrote 100324*/ | |
5110 | 5111 | #endif |
5111 | 5112 | OPT_PROFILING, |
5112 | 5113 | OPT_INNODB_ROLLBACK_ON_TIMEOUT, |
@@ -5813,6 +5814,11 @@ | ||
5813 | 5814 | {"senna-log-level", OPT_SENNA_LOG_LEVEL, "Senna log level.", |
5814 | 5815 | (gptr*) &opt_senna_log_level, (gptr*) &opt_senna_log_level, 0, GET_STR, REQUIRED_ARG, |
5815 | 5816 | 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 */ | |
5816 | 5822 | #endif |
5817 | 5823 | {"secure-file-priv", OPT_SECURE_FILE_PRIV, |
5818 | 5824 | "Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files within specified directory", |
@@ -7109,6 +7115,7 @@ | ||
7109 | 7115 | opt_senna_log = 0; |
7110 | 7116 | senna_log_level_options = senna_logger.max_level; |
7111 | 7117 | global_system_variables.senna_2ind = 0; |
7118 | + global_system_variables.senna_score_sort = 1; /*yuka wrote 100324*/ | |
7112 | 7119 | #endif |
7113 | 7120 | |
7114 | 7121 | #if defined(__WIN__) || defined(__NETWARE__) |
@@ -7757,6 +7764,9 @@ | ||
7757 | 7764 | case OPT_SENNA_2IND: |
7758 | 7765 | global_system_variables.senna_2ind = 1; |
7759 | 7766 | break; |
7767 | + case OPT_SENNA_SCORE_SORT: /* yuka wrote 100324 */ | |
7768 | + global_system_variables.senna_score_sort=1; | |
7769 | + break; /* end yuka wrote 100324 */ | |
7760 | 7770 | #endif |
7761 | 7771 | } |
7762 | 7772 | return 0; |
@@ -504,6 +504,7 @@ | ||
504 | 504 | sys_var_enum sys_senna_log_level("senna_log_level",&senna_log_level_options, |
505 | 505 | &senna_log_level_typelib, fix_senna_log_level); |
506 | 506 | 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*/ | |
507 | 508 | #endif |
508 | 509 | |
509 | 510 | /* Condition pushdown to storage engine */ |
@@ -797,6 +798,7 @@ | ||
797 | 798 | &sys_senna_2ind, |
798 | 799 | &sys_senna_index_type, |
799 | 800 | &sys_senna_log_level, |
801 | + &sys_senna_score_sort, /* yuka wrote 100324 */ | |
800 | 802 | #endif |
801 | 803 | &sys_server_id, |
802 | 804 | #ifdef HAVE_REPLICATION |
@@ -1130,6 +1132,7 @@ | ||
1130 | 1132 | {"senna_index_type", (char*) &sys_senna_index_type, SHOW_SYS}, |
1131 | 1133 | {"senna_log", (char*) &opt_senna_log, SHOW_MY_BOOL}, |
1132 | 1134 | {"senna_log_level", (char*) &sys_senna_log_level, SHOW_SYS}, |
1135 | + {"senna_score_sort", (char*) &sys_senna_score_sort, SHOW_SYS}, /*yuka wrote 100324*/ | |
1133 | 1136 | #endif |
1134 | 1137 | #ifdef HAVE_SMEM |
1135 | 1138 | {"shared_memory", (char*) &opt_enable_shared_memory, SHOW_MY_BOOL}, |