Commit ee7f4192 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents 65ba93fd 68e46c9d

sql/handler.cc

+13 −5
Original line number Diff line number Diff line
@@ -570,6 +570,8 @@ int ha_prepare(THD *thd) 
    {

      int err;

      statistic_increment(thd->status_var.ha_prepare_count,&LOCK_status);

      if ((*ht)->prepare)

      {

        if ((err= (*(*ht)->prepare)(thd, all)))

        {

          my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
@@ -578,6 +580,12 @@ int ha_prepare(THD *thd) 
          break;

        }

      }

      else

      {

        push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,

                            ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA), (*ht)->name);

      }

    }

  }

#endif /* USING_TRANSACTIONS */

  DBUG_RETURN(error);