diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-26 11:50:32 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-26 11:50:32 +0200 |
| commit | 356c149603285086d964c8a51107be97b981c15c (patch) | |
| tree | 932c4199fcd51bcda3052d6fbbfba7877a385330 /mysql-test/suite/parts | |
| parent | e9e1890162c2f75e399229f08dd9924d55d9655b (diff) | |
| parent | 2e67b9f665875928605880661fc5aa1a15175f53 (diff) | |
| download | mariadb-git-356c149603285086d964c8a51107be97b981c15c.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/parts')
| -rw-r--r-- | mysql-test/suite/parts/inc/partition.pre | 4 | ||||
| -rw-r--r-- | mysql-test/suite/parts/inc/partition_engine.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/parts/inc/partition_layout.inc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/parts/inc/partition.pre b/mysql-test/suite/parts/inc/partition.pre index 0fae04dddd4..fba909687a0 100644 --- a/mysql-test/suite/parts/inc/partition.pre +++ b/mysql-test/suite/parts/inc/partition.pre @@ -179,7 +179,7 @@ if (0) # That means statements which # - are most time of low interest and do auxiliary stuff # like generating the next SQL statement to be executed -# - additional statements giving informations about table +# - additional statements giving information about table # contents or the value of some variables # You will get huge differences, because the file with the # expected results was created with $debug = 0 . @@ -221,7 +221,7 @@ if (0) # $ls= 1 (default) # --> Display the table related directory content via # "ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1*" -# if these informations were collected. +# if these information were collected. # This is probably not portable to some OS. # $ls= 0 # --> Omit displaying the directory diff --git a/mysql-test/suite/parts/inc/partition_engine.inc b/mysql-test/suite/parts/inc/partition_engine.inc index 947957d29a9..c964557e69f 100644 --- a/mysql-test/suite/parts/inc/partition_engine.inc +++ b/mysql-test/suite/parts/inc/partition_engine.inc @@ -7,7 +7,7 @@ # This routine is only useful for the partition_<feature>_<engine> tests. # # # # Note: There were some problems in history. # -# It looks like a table holds informations about the storage engine # +# It looks like a table holds information about the storage engine # # for # # "the whole table" -> in statement after column list before partitioning # # a partition -> in statement after definition of partition # diff --git a/mysql-test/suite/parts/inc/partition_layout.inc b/mysql-test/suite/parts/inc/partition_layout.inc index 12fbfb9a46a..c1ab14f974d 100644 --- a/mysql-test/suite/parts/inc/partition_layout.inc +++ b/mysql-test/suite/parts/inc/partition_layout.inc @@ -1,6 +1,6 @@ # inc/partition_layout.inc # -# Print partitioning related informations about the table t1 +# Print partitioning related information about the table t1 # eval SHOW CREATE TABLE t1; |