diff options
| author | pem@mysql.com <> | 2003-10-22 16:10:22 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-10-22 16:10:22 +0200 |
| commit | 337238b78ac9f131b3082f987c812216e6247dad (patch) | |
| tree | 162a59c221392dfbcde183e7fdd33da1159e8bd9 /sql/ha_myisam.cc | |
| parent | 2918e5d529502f0c10c720f1360ab39d6d83bb48 (diff) | |
| parent | 70ea50366231ac471a894ab4e91f2322cdacb796 (diff) | |
| download | mariadb-git-337238b78ac9f131b3082f987c812216e6247dad.tar.gz | |
Merging 4.1->5.0
Diffstat (limited to 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 864ee55a85f..53c1e89df4a 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -89,9 +89,9 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type, extern "C" { -volatile bool *killed_ptr(MI_CHECK *param) +int *killed_ptr(void *thd) { - return &(((THD *)(param->thd))->killed); + return (int*)&((THD *)thd)->killed; } void mi_check_print_error(MI_CHECK *param, const char *fmt,...) @@ -390,7 +390,7 @@ int ha_myisam::analyze(THD *thd, HA_CHECK_OPT* check_opt) int ha_myisam::restore(THD* thd, HA_CHECK_OPT *check_opt) { HA_CHECK_OPT tmp_check_opt; - char* backup_dir = thd->lex.backup_dir; + char* backup_dir = thd->lex->backup_dir; char src_path[FN_REFLEN], dst_path[FN_REFLEN]; char* table_name = table->real_name; int error; @@ -430,7 +430,7 @@ int ha_myisam::restore(THD* thd, HA_CHECK_OPT *check_opt) int ha_myisam::backup(THD* thd, HA_CHECK_OPT *check_opt) { - char* backup_dir = thd->lex.backup_dir; + char* backup_dir = thd->lex->backup_dir; char src_path[FN_REFLEN], dst_path[FN_REFLEN]; char* table_name = table->real_name; int error; |