database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä
2016-12-19 17:15:25 +02:00
parent 8e198336c2 9f863a15b0
commit 44da95e5ed
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/innobase/dict/dict0dict.cc
View File

@@ -1643,6 +1643,7 @@ struct dict_foreign_remove_partial
if (table != NULL) {
table->referenced_set.erase(foreign);
}
dict_foreign_free(foreign);
}
};
@@ -3593,8 +3594,7 @@ dict_foreign_add_to_cache(
}
if (for_in_cache) {
/* Free the foreign object */
mem_heap_free(foreign->heap);
dict_foreign_free(foreign);
} else {
for_in_cache = foreign;
}
@@ -3622,7 +3622,7 @@ dict_foreign_add_to_cache(
" the ones in table.");
if (for_in_cache == foreign) {
mem_heap_free(foreign->heap);
dict_foreign_free(foreign);
}
return(DB_CANNOT_ADD_CONSTRAINT);
@@ -3678,7 +3678,7 @@ dict_foreign_add_to_cache(
be one */
}
mem_heap_free(foreign->heap);
dict_foreign_free(foreign);
}
return(DB_CANNOT_ADD_CONSTRAINT);

2
storage/innobase/dict/dict0load.cc
View File

@@ -490,7 +490,7 @@ err_len:
}
/* This recieves a dict_foreign_t* that points to a stack variable.
So mem_heap_free(foreign->heap) is not used as elsewhere.
So dict_foreign_free(foreign) is not used as elsewhere.
Since the heap used here is freed elsewhere, foreign->heap
is not assigned. */
foreign->id = mem_heap_strdupl(heap, (const char*) field, len);

8
storage/xtradb/dict/dict0dict.cc
View File

@@ -1643,6 +1643,7 @@ struct dict_foreign_remove_partial
if (table != NULL) {
table->referenced_set.erase(foreign);
}
dict_foreign_free(foreign);
}
};
@@ -3597,8 +3598,7 @@ dict_foreign_add_to_cache(
}
if (for_in_cache) {
/* Free the foreign object */
mem_heap_free(foreign->heap);
dict_foreign_free(foreign);
} else {
for_in_cache = foreign;
}
@@ -3622,7 +3622,7 @@ dict_foreign_add_to_cache(
" the ones in table.");
if (for_in_cache == foreign) {
mem_heap_free(foreign->heap);
dict_foreign_free(foreign);
}
return(DB_CANNOT_ADD_CONSTRAINT);
@@ -3678,7 +3678,7 @@ dict_foreign_add_to_cache(
be one */
}
mem_heap_free(foreign->heap);
dict_foreign_free(foreign);
}
return(DB_CANNOT_ADD_CONSTRAINT);

2
storage/xtradb/dict/dict0load.cc
View File

@@ -492,7 +492,7 @@ err_len:
}
/* This recieves a dict_foreign_t* that points to a stack variable.
So mem_heap_free(foreign->heap) is not used as elsewhere.
So dict_foreign_free(foreign) is not used as elsewhere.
Since the heap used here is freed elsewhere, foreign->heap
is not assigned. */
foreign->id = mem_heap_strdupl(heap, (const char*) field, len);