diff options
| author | Satya Bodapati <satya.bodapati@oracle.com> | 2013-01-07 16:56:16 +0530 |
|---|---|---|
| committer | Satya Bodapati <satya.bodapati@oracle.com> | 2013-01-07 16:56:16 +0530 |
| commit | 1dbc62ce2e049cf29fe4c143c93889d5d310de64 (patch) | |
| tree | 9e1ca70440e40c0beb292605074c64b805724157 | |
| parent | e7c2ae94dd60be1ea1bac0b3645621e60773bf69 (diff) | |
| download | mariadb-git-1dbc62ce2e049cf29fe4c143c93889d5d310de64.tar.gz | |
Post Fix to Bug#14628410 - ASSERTION `! IS_SET()' FAILED IN
DIAGNOSTICS_AREA::SET_OK_STATUS
Use DBUG_RETURN() instead of return() if DBUG_ENTER() is
used in the function. This patch is to fix the Windows
pb2 failure on mysql-5.1
Approved by Marko. rb#1792
| -rw-r--r-- | storage/innodb_plugin/handler/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc index e15c84c8346..51068d26eff 100644 --- a/storage/innodb_plugin/handler/ha_innodb.cc +++ b/storage/innodb_plugin/handler/ha_innodb.cc @@ -1142,7 +1142,7 @@ innobase_mysql_tmpfile(void) DBUG_EXECUTE_IF( "innobase_tmpfile_creation_failure", - return(-1); + DBUG_RETURN(-1); ); tmpdir = my_tmpdir(&mysql_tmpdir_list); |