summaryrefslogtreecommitdiff
path: root/storage/xtradb
diff options
context:
space:
mode:
authorJan Lindström <jplindst@mariadb.org>2015-02-18 06:59:28 +0200
committerJan Lindström <jplindst@mariadb.org>2015-02-18 06:59:28 +0200
commita1a32f8f25e9ccb3363b36794887d3d5c4c788e8 (patch)
tree8c4663d3cd2e5e5c20f67d207be421202e1aa9fa /storage/xtradb
parent454beee5fbd9da8e87a54b46ea716679693361bd (diff)
downloadmariadb-git-a1a32f8f25e9ccb3363b36794887d3d5c4c788e8.tar.gz
Revert file space allocation change on row0merge.cc.
Diffstat (limited to 'storage/xtradb')
-rw-r--r--storage/xtradb/row/row0merge.cc18
1 files changed, 0 insertions, 18 deletions
diff --git a/storage/xtradb/row/row0merge.cc b/storage/xtradb/row/row0merge.cc
index 1d66707736d..5d88d750478 100644
--- a/storage/xtradb/row/row0merge.cc
+++ b/storage/xtradb/row/row0merge.cc
@@ -2401,24 +2401,6 @@ row_merge_insert_index_tuples(
#endif /* UNIV_DEBUG */
ulint* ins_offsets = NULL;
- /* First reserve enough free space for the file segments
- of the index tree, so that the insert will not fail because
- of lack of space */
-
- {
- ulint n_extents = cursor.tree_height / 16 + 3;
- ibool success;
- ulint n_reserved = 0;
-
- success = fsp_reserve_free_extents(&n_reserved, index->space,
- n_extents, FSP_NORMAL, &mtr);
-
- if (!success) {
- error = DB_OUT_OF_FILE_SPACE;
- goto err_exit;
- }
- }
-
error = btr_cur_optimistic_insert(
BTR_NO_UNDO_LOG_FLAG | BTR_NO_LOCKING_FLAG
| BTR_KEEP_SYS_FLAG | BTR_CREATE_FLAG,