mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql-5.1-innodb from bk-internal to my local repo

Browse source
This commit is contained in:
Vasil Dimov 2010-06-18 11:51:55 +03:00
commit c66ce15fe3
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
storage/innodb_plugin/row/row0merge.c
View file

@ -1666,7 +1666,7 @@ row_merge(
return(DB_CORRUPTION);
}
ut_ad(n_run < *num_run);
ut_ad(n_run <= *num_run);
*num_run = n_run;
@ -1714,6 +1714,11 @@ row_merge_sort(
/* Record the number of merge runs we need to perform */
num_runs = file->offset;
/* If num_runs are less than 1, nothing to merge */
if (num_runs <= 1) {
return(error);
}
/* "run_offset" records each run's first offset number */
run_offset = (ulint*) mem_alloc(file->offset * sizeof(ulint));