Skip to content

Commit 7a52b6f

Browse files
committed
Minor cleanup of main.partition_innodb
Stop masking the Data_free values, because innodb_file_per_table=1 is the default. Also, do mask Update_time after updating tables, even though for some reason it does appear to matter.
1 parent 2bf4e57 commit 7a52b6f

File tree

2 files changed

+12
-28
lines changed

2 files changed

+12
-28
lines changed

mysql-test/r/partition_innodb.result

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,33 +386,33 @@ DROP TABLE t1;
386386
create table t1 (a int) engine=innodb partition by hash(a) ;
387387
show table status like 't1';
388388
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
389-
t1 InnoDB 10 Dynamic 2 8192 16384 0 0 # NULL # NULL NULL latin1_swedish_ci NULL partitioned
389+
t1 InnoDB 10 Dynamic 2 8192 16384 0 0 0 NULL # NULL NULL latin1_swedish_ci NULL partitioned
390390
drop table t1;
391391
create table t1 (a int)
392392
engine = innodb
393393
partition by key (a);
394394
show table status;
395395
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
396-
t1 InnoDB 10 Dynamic 2 8192 16384 0 0 # NULL # NULL NULL latin1_swedish_ci NULL partitioned
396+
t1 InnoDB 10 Dynamic 2 8192 16384 0 0 0 NULL Create_time NULL NULL latin1_swedish_ci NULL partitioned
397397
insert into t1 values (0), (1), (2), (3);
398398
show table status;
399399
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
400-
t1 InnoDB 10 Dynamic 4 4096 16384 0 0 # NULL # NULL NULL latin1_swedish_ci NULL partitioned
400+
t1 InnoDB 10 Dynamic 4 4096 16384 0 0 0 NULL Create_time Update_time NULL latin1_swedish_ci NULL partitioned
401401
drop table t1;
402402
create table t1 (a int auto_increment primary key)
403403
engine = innodb
404404
partition by key (a);
405405
show table status;
406406
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
407-
t1 InnoDB 10 Dynamic 2 8192 16384 0 0 # 1 # NULL NULL latin1_swedish_ci NULL partitioned
407+
t1 InnoDB 10 Dynamic 2 8192 16384 0 0 0 1 Create_time NULL NULL latin1_swedish_ci NULL partitioned
408408
insert into t1 values (NULL), (NULL), (NULL), (NULL);
409409
show table status;
410410
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
411-
t1 InnoDB 10 Dynamic 4 4096 16384 0 0 # 5 # NULL NULL latin1_swedish_ci NULL partitioned
411+
t1 InnoDB 10 Dynamic 4 4096 16384 0 0 0 5 Create_time Update_time NULL latin1_swedish_ci NULL partitioned
412412
insert into t1 values (NULL), (NULL), (NULL), (NULL);
413413
show table status;
414414
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
415-
t1 InnoDB 10 Dynamic 8 2048 16384 0 0 # 9 # NULL NULL latin1_swedish_ci NULL partitioned
415+
t1 InnoDB 10 Dynamic 8 2048 16384 0 0 0 9 Create_time Update_time NULL latin1_swedish_ci NULL partitioned
416416
drop table t1;
417417
create table t1 (a int)
418418
partition by key (a)

mysql-test/t/partition_innodb.test

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
if (`select plugin_auth_version < "5.6.25" from information_schema.plugins where plugin_name='innodb'`)
2-
{
3-
--skip Not fixed in InnoDB as of 5.6.24 or earlier
4-
}
51
--source include/not_embedded.inc
62
--source include/have_partition.inc
73
--source include/have_innodb.inc
@@ -405,9 +401,7 @@ DROP TABLE t1;
405401
# Bug #14673: Wrong InnoDB default row format
406402
#
407403
create table t1 (a int) engine=innodb partition by hash(a) ;
408-
# Data_free for InnoDB tablespace varies depending on which
409-
# tests have been run before this one
410-
--replace_column 10 # 12 #
404+
--replace_column 12 #
411405
show table status like 't1';
412406
drop table t1;
413407

@@ -417,33 +411,23 @@ drop table t1;
417411
create table t1 (a int)
418412
engine = innodb
419413
partition by key (a);
420-
# Data_free for InnoDB tablespace varies depending on which
421-
# tests have been run before this one
422-
--replace_column 10 # 12 #
414+
--replace_column 12 Create_time
423415
show table status;
424416
insert into t1 values (0), (1), (2), (3);
425-
# Data_free for InnoDB tablespace varies depending on which
426-
# tests have been run before this one
427-
--replace_column 10 # 12 #
417+
--replace_column 12 Create_time 13 Update_time
428418
show table status;
429419
drop table t1;
430420

431421
create table t1 (a int auto_increment primary key)
432422
engine = innodb
433423
partition by key (a);
434-
# Data_free for InnoDB tablespace varies depending on which
435-
# tests have been run before this one
436-
--replace_column 10 # 12 #
424+
--replace_column 12 Create_time
437425
show table status;
438426
insert into t1 values (NULL), (NULL), (NULL), (NULL);
439-
# Data_free for InnoDB tablespace varies depending on which
440-
# tests have been run before this one
441-
--replace_column 10 # 12 #
427+
--replace_column 12 Create_time 13 Update_time
442428
show table status;
443429
insert into t1 values (NULL), (NULL), (NULL), (NULL);
444-
# Data_free for InnoDB tablespace varies depending on which
445-
# tests have been run before this one
446-
--replace_column 10 # 12 #
430+
--replace_column 12 Create_time 13 Update_time
447431
show table status;
448432
drop table t1;
449433

0 commit comments

Comments
 (0)