@@ -18707,13 +18707,31 @@ static void test_progress_reporting()
18707
18707
rc= mysql_query(conn, "insert into t1 (f2) select f2 from t2");
18708
18708
myquery(rc);
18709
18709
}
18710
- rc= mysql_query(conn, "alter table t1 add f1 int primary key auto_increment, add key (f2), order by f2");
18710
+
18711
+ progress_stage= progress_max_stage= progress_count= 0;
18712
+ rc= mysql_query(conn, "alter table t1 add f1 int primary key auto_increment, order by f2");
18711
18713
myquery(rc);
18712
18714
if (!opt_silent)
18713
18715
printf("Got progress_count: %u stage: %u max_stage: %u\n",
18714
18716
progress_count, progress_stage, progress_max_stage);
18715
18717
DIE_UNLESS(progress_count > 0 && progress_stage >=2 && progress_max_stage == 3);
18718
+
18719
+ progress_stage= progress_max_stage= progress_count= 0;
18720
+ rc= mysql_query(conn, "create index f2 on t1 (f2)");
18716
18721
myquery(rc);
18722
+ if (!opt_silent)
18723
+ printf("Got progress_count: %u stage: %u max_stage: %u\n",
18724
+ progress_count, progress_stage, progress_max_stage);
18725
+ DIE_UNLESS(progress_count > 0 && progress_stage >=2 && progress_max_stage == 2);
18726
+
18727
+ progress_stage= progress_max_stage= progress_count= 0;
18728
+ rc= mysql_query(conn, "drop index f2 on t1");
18729
+ myquery(rc);
18730
+ if (!opt_silent)
18731
+ printf("Got progress_count: %u stage: %u max_stage: %u\n",
18732
+ progress_count, progress_stage, progress_max_stage);
18733
+ DIE_UNLESS(progress_count > 0 && progress_stage >=2 && progress_max_stage == 2);
18734
+
18717
18735
rc= mysql_query(conn, "set @@global.progress_report_time=@save");
18718
18736
myquery(rc);
18719
18737
mysql_close(conn);
0 commit comments