summaryrefslogtreecommitdiff
path: root/myisam/mi_update.c
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-12-31 03:47:56 +0200
committermonty@mysql.com <>2004-12-31 03:47:56 +0200
commit5e03ebbcad59ec472af59ce9973bfefcddfe056f (patch)
treedd3c89af5e01f80d9172adc65e8df542cd91cb5b /myisam/mi_update.c
parent34d5331cee44cdcb62245779ad486ccbef6bf4c2 (diff)
downloadmariadb-git-5e03ebbcad59ec472af59ce9973bfefcddfe056f.tar.gz
After merge fixes
Cleanup of mi_print_error() handling Deleted 'merge' directory
Diffstat (limited to 'myisam/mi_update.c')
-rw-r--r--myisam/mi_update.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/myisam/mi_update.c b/myisam/mi_update.c
index 2936e29a01c..cda60694008 100644
--- a/myisam/mi_update.c
+++ b/myisam/mi_update.c
@@ -35,7 +35,7 @@ int mi_update(register MI_INFO *info, const byte *oldrec, byte *newrec)
LINT_INIT(old_checksum);
DBUG_EXECUTE_IF("myisam_pretend_crashed_table_on_usage",
- mi_print_error(info, HA_ERR_CRASHED);
+ mi_print_error(info->s, HA_ERR_CRASHED);
DBUG_RETURN(my_errno= HA_ERR_CRASHED););
if (!(info->update & HA_STATE_AKTIV))
{
@@ -209,7 +209,7 @@ err:
}
else
{
- mi_print_error(info, HA_ERR_CRASHED);
+ mi_print_error(info->s, HA_ERR_CRASHED);
mi_mark_crashed(info);
}
info->update= (HA_STATE_CHANGED | HA_STATE_AKTIV | HA_STATE_ROW_CHANGED |
@@ -221,7 +221,7 @@ err:
allow_break(); /* Allow SIGHUP & SIGINT */
if (save_errno == HA_ERR_KEY_NOT_FOUND)
{
- mi_print_error(info, HA_ERR_CRASHED);
+ mi_print_error(info->s, HA_ERR_CRASHED);
save_errno=HA_ERR_CRASHED;
}
DBUG_RETURN(my_errno=save_errno);