1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
This commit is contained in:
unknown 2005-09-09 08:34:21 +02:00
commit ee7f419264
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sql/handler.cc
View File

@ -570,12 +570,20 @@ int ha_prepare(THD *thd)
{ {
int err; int err;
statistic_increment(thd->status_var.ha_prepare_count,&LOCK_status); statistic_increment(thd->status_var.ha_prepare_count,&LOCK_status);
if ((err= (*(*ht)->prepare)(thd, all))) if ((*ht)->prepare)
{ {
my_error(ER_ERROR_DURING_COMMIT, MYF(0), err); if ((err= (*(*ht)->prepare)(thd, all)))
ha_rollback_trans(thd, all); {
error=1; my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
break; ha_rollback_trans(thd, all);
error=1;
break;
}
}
else
{
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA), (*ht)->name);
} }
} }
} }