diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/repair.result | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/repair.result')
| -rw-r--r-- | mysql-test/main/repair.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/main/repair.result b/mysql-test/main/repair.result index 75d7525ee71..0be2251e922 100644 --- a/mysql-test/main/repair.result +++ b/mysql-test/main/repair.result @@ -1,3 +1,4 @@ +call mtr.add_suppression("character set is multi-byte"); drop table if exists t1; create table t1 SELECT 1,"table 1"; repair table t1 use_frm; @@ -188,6 +189,8 @@ drop tables t1, t2; # .frm file from MySQL 3.23 # # Test with a saved table from 3.23 +SET @save_global_character_set_server= @@global.character_set_server; +set @@global.character_set_server=@@character_set_server; select count(*) from t1; ERROR HY000: Got error 190 "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump an" from storage engine MyISAM check table t1; @@ -208,6 +211,7 @@ check table t1; Table Op Msg_type Msg_text test.t1 check status OK drop table t1; +set @@global.character_set_server=@save_global_character_set_server; create table t1 (a blob); create view v1 as select * from t1; repair view v1; |