diff options
author | unknown <monty@hundin.mysql.fi> | 2002-03-15 21:30:50 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-03-15 21:30:50 +0200 |
commit | 3a50325497e92ce617c92f1b85713bae2afb25f1 (patch) | |
tree | f68ff2fec11e835dfd8644c7bcaf714ece0cce79 /sql/ha_myisam.cc | |
parent | 567c8a2d97bd9840a98362a19de630e371db66b1 (diff) | |
download | mariadb-git-3a50325497e92ce617c92f1b85713bae2afb25f1.tar.gz |
Fixed problem with WHERE key=const ORDER BY key DESC
Docs/manual.texi:
Changelog
myisam/ft_boolean_search.c:
Portability fix
sql/ha_myisam.cc:
Cleanup
sql/sql_union.cc:
cleanup
Diffstat (limited to 'sql/ha_myisam.cc')
-rw-r--r-- | sql/ha_myisam.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 127519d20f4..df55cdd0033 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -583,14 +583,14 @@ int ha_myisam::repair(THD *thd, MI_CHECK ¶m, bool optimize) thd->proc_info="Repair by sorting"; statistics_done=1; error = mi_repair_by_sort(¶m, file, fixed_name, - param.testflag & T_QUICK); + param.testflag & T_QUICK); } else { thd->proc_info="Repair with keycache"; param.testflag &= ~T_REP_BY_SORT; error= mi_repair(¶m, file, fixed_name, - param.testflag & T_QUICK); + param.testflag & T_QUICK); } param.testflag=testflag; optimize_done=1; @@ -725,10 +725,10 @@ bool ha_myisam::check_and_repair(THD *thd) { sql_print_error("Warning: Recovering table: '%s'",table->path); check_opt.flags= - (myisam_recover_options & HA_RECOVER_BACKUP ? T_BACKUP_DATA : 0) - | (marked_crashed ? 0 : T_QUICK) - | (myisam_recover_options & HA_RECOVER_FORCE ? 0 : T_SAFE_REPAIR) - | T_AUTO_REPAIR; + ((myisam_recover_options & HA_RECOVER_BACKUP ? T_BACKUP_DATA : 0) | + (marked_crashed ? 0 : T_QUICK) | + (myisam_recover_options & HA_RECOVER_FORCE ? 0 : T_SAFE_REPAIR) | + T_AUTO_REPAIR); if (repair(thd, &check_opt)) error=1; } |