database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.0
This commit is contained in:
elliot@mysql.com
2006-03-17 10:50:01 +01:00
parent c5337540af 56fca811bb
commit a37fa18a69
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/ha_innodb.cc
View File

@@ -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 {