Commit cc656e4d authored by Jan Lindström's avatar Jan Lindström

Enhance row-merge sort progress logging.

parent c3db4459
...@@ -2251,6 +2251,7 @@ row_merge_sort( ...@@ -2251,6 +2251,7 @@ row_merge_sort(
ut_ad(file->offset > 0); ut_ad(file->offset > 0);
thd_progress_init(trx->mysql_thd, num_runs); thd_progress_init(trx->mysql_thd, num_runs);
sql_print_information("InnoDB: Online DDL : merge-sorting has estimated %lu runs", num_runs);
/* Merge the runs until we have one big run */ /* Merge the runs until we have one big run */
do { do {
...@@ -2259,6 +2260,7 @@ row_merge_sort( ...@@ -2259,6 +2260,7 @@ row_merge_sort(
/* Report progress of merge sort to MySQL for /* Report progress of merge sort to MySQL for
show processlist progress field */ show processlist progress field */
thd_progress_report(trx->mysql_thd, cur_run, num_runs); thd_progress_report(trx->mysql_thd, cur_run, num_runs);
sql_print_information("InnoDB: Online DDL : merge-sorting current run %lu estimated %lu runs", cur_run, num_runs);
error = row_merge(trx, dup, file, block, tmpfd, error = row_merge(trx, dup, file, block, tmpfd,
&num_runs, run_offset); &num_runs, run_offset);
......
...@@ -2257,6 +2257,7 @@ row_merge_sort( ...@@ -2257,6 +2257,7 @@ row_merge_sort(
ut_ad(file->offset > 0); ut_ad(file->offset > 0);
thd_progress_init(trx->mysql_thd, num_runs); thd_progress_init(trx->mysql_thd, num_runs);
sql_print_information("InnoDB: Online DDL : merge-sorting has estimated %lu runs", num_runs);
/* Merge the runs until we have one big run */ /* Merge the runs until we have one big run */
do { do {
...@@ -2265,6 +2266,7 @@ row_merge_sort( ...@@ -2265,6 +2266,7 @@ row_merge_sort(
/* Report progress of merge sort to MySQL for /* Report progress of merge sort to MySQL for
show processlist progress field */ show processlist progress field */
thd_progress_report(trx->mysql_thd, cur_run, num_runs); thd_progress_report(trx->mysql_thd, cur_run, num_runs);
sql_print_information("InnoDB: Online DDL : merge-sorting current run %lu estimated %lu runs", cur_run, num_runs);
error = row_merge(trx, dup, file, block, tmpfd, error = row_merge(trx, dup, file, block, tmpfd,
&num_runs, run_offset); &num_runs, run_offset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment