Commit 2122a3f9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-4.1 

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
parents aa3411f5 367442f7

sql/ha_innodb.cc

+7 −0
Original line number Diff line number Diff line
@@ -513,6 +513,13 @@ convert_error_code_to_mysql( 


    		return(HA_ERR_NO_SAVEPOINT);

  	} else if (error == (int) DB_LOCK_TABLE_FULL) {

          /* Since we rolled back the whole transaction, we must

          tell it also to MySQL so that MySQL knows to empty the

          cached binlog for this transaction */



          if (thd) {

                  ha_rollback(thd);

          }



    		return(HA_ERR_LOCK_TABLE_FULL);

    	} else {