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

Merge mysql-5.1 -> mysql-5.5

Browse Source
This commit is contained in:
Vasil Dimov 2012-10-09 16:41:13 +03:00
commit f75957b173
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storage/innobase/os/os0file.c
View File

@ -1397,6 +1397,13 @@ os_file_create_func(
DWORD create_flag; DWORD create_flag;
DWORD attributes; DWORD attributes;
ibool retry; ibool retry;
DBUG_EXECUTE_IF(
"ib_create_table_fail_disk_full",
*success = FALSE;
SetLastError(ERROR_DISK_FULL);
return((os_file_t) -1);
);
try_again: try_again:
ut_a(name); ut_a(name);
@ -1512,6 +1519,12 @@ try_again:
ibool retry; ibool retry;
const char* mode_str = NULL; const char* mode_str = NULL;
DBUG_EXECUTE_IF(
"ib_create_table_fail_disk_full",
*success = FALSE;
errno = ENOSPC;
return((os_file_t) -1);
);
try_again: try_again:
ut_a(name); ut_a(name);

5
storage/innobase/row/row0mysql.c
View File

@ -1855,7 +1855,8 @@ Creates a table for MySQL. If the name of the table ends in
one of "innodb_monitor", "innodb_lock_monitor", "innodb_tablespace_monitor", one of "innodb_monitor", "innodb_lock_monitor", "innodb_tablespace_monitor",
"innodb_table_monitor", then this will also start the printing of monitor "innodb_table_monitor", then this will also start the printing of monitor
output by the master thread. If the table name ends in "innodb_mem_validate", output by the master thread. If the table name ends in "innodb_mem_validate",
InnoDB will try to invoke mem_validate(). InnoDB will try to invoke mem_validate(). On failure the transaction will
be rolled back and the 'table' object will be freed.
@return error code or DB_SUCCESS */ @return error code or DB_SUCCESS */
UNIV_INTERN UNIV_INTERN
int int
@ -1993,6 +1994,8 @@ err_exit:
row_drop_table_for_mysql(table->name, trx, FALSE); row_drop_table_for_mysql(table->name, trx, FALSE);
trx_commit_for_mysql(trx); trx_commit_for_mysql(trx);
} else {
dict_mem_table_free(table);
} }
break; break;