summaryrefslogtreecommitdiff
path: root/innobase/fil
diff options
context:
space:
mode:
authormarko@hundin.mysql.fi <>2004-06-16 01:55:24 +0300
committermarko@hundin.mysql.fi <>2004-06-16 01:55:24 +0300
commitdfc36c886ce39dc1a0f0a489b511de6a0da8811a (patch)
treec6829ca6b60b6bce32f68eb8ddafb7a8d9b91592 /innobase/fil
parentf4dbb250fd527f390a8f063b4f4175b22cfb248f (diff)
downloadmariadb-git-dfc36c886ce39dc1a0f0a489b511de6a0da8811a.tar.gz
InnoDB: fix bug in call to innobase_invalidate_query_cache(),
introduced in ChangeSet@1.1843.1.25 InnoDB: fix bug in the error exit of fil_create_new_single_table_tablespace(), introduced in ChangeSet@1.1843.1.11
Diffstat (limited to 'innobase/fil')
-rw-r--r--innobase/fil/fil0fil.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c
index a200116797a..8e655492aa6 100644
--- a/innobase/fil/fil0fil.c
+++ b/innobase/fil/fil0fil.c
@@ -2220,6 +2220,7 @@ fil_create_new_single_table_tablespace(
ut_free(buf2);
error_exit:
os_file_close(file);
+ error_exit2:
os_file_delete(path);
mem_free(path);
@@ -2262,10 +2263,7 @@ fil_create_new_single_table_tablespace(
os_file_close(file);
if (*space_id == ULINT_UNDEFINED) {
- os_file_delete(path);
- error_exit2:
- mem_free(path);
- return(DB_ERROR);
+ goto error_exit2;
}
success = fil_space_create(path, *space_id, FIL_TABLESPACE);