summaryrefslogtreecommitdiff
path: root/mysql-test/main/frm_bad_row_type-7333.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-20 16:53:20 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-20 16:53:20 +0300
commit44fd2c4b24b35cdb5f573395fe07800d05b7c8b6 (patch)
tree13c130d521c7c1dea3bc9b8b26d9057a1c268668 /mysql-test/main/frm_bad_row_type-7333.result
parent5d9d379329abcbb661ed6c027efbb9fd763958c6 (diff)
parent0792aff161132fb953510555fe45544991dec95d (diff)
downloadmariadb-git-44fd2c4b24b35cdb5f573395fe07800d05b7c8b6.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/frm_bad_row_type-7333.result')
-rw-r--r--mysql-test/main/frm_bad_row_type-7333.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/frm_bad_row_type-7333.result b/mysql-test/main/frm_bad_row_type-7333.result
index f1ce23bc457..91974bfa863 100644
--- a/mysql-test/main/frm_bad_row_type-7333.result
+++ b/mysql-test/main/frm_bad_row_type-7333.result
@@ -7,7 +7,7 @@ bad_row_type CREATE TABLE `bad_row_type` (
`category_id` int(11) NOT NULL AUTO_INCREMENT,
`category_name` varchar(255) DEFAULT NULL,
PRIMARY KEY (`category_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 /* `compression`='tokudb_zlib' */
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci /* `compression`='tokudb_zlib' */
show table status like 'bad_row_type';
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 Max_index_length Temporary
bad_row_type MyISAM 10 Dynamic 0 0 0 281474976710655 1024 0 1 x x NULL utf8mb3_general_ci NULL `compression`='tokudb_zlib' x N