diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-28 14:02:09 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-28 14:02:09 +0300 |
| commit | 17cf3c633eb1db29457cbd62c5fc022d07d5dd6d (patch) | |
| tree | e934afe2ce49581363e182ea64ec3ffb54109e38 /mysql-test/t/rpl_charset.test | |
| parent | 46ce3d00921491398d2e9a00c2b03e67540dee23 (diff) | |
| download | mariadb-git-17cf3c633eb1db29457cbd62c5fc022d07d5dd6d.tar.gz | |
post-merge fix
Diffstat (limited to 'mysql-test/t/rpl_charset.test')
| -rw-r--r-- | mysql-test/t/rpl_charset.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/rpl_charset.test b/mysql-test/t/rpl_charset.test index e49ab7468a3..b270a704eaa 100644 --- a/mysql-test/t/rpl_charset.test +++ b/mysql-test/t/rpl_charset.test @@ -112,10 +112,10 @@ sync_slave_with_master; # Check that we can't change global.collation_server -error 1386; +error 1387; set global character_set_server=latin2; connection master; -error 1386; +error 1387; set global character_set_server=latin2; # Check that SET ONE_SHOT is really one shot @@ -129,7 +129,7 @@ select @@character_set_server; select @@character_set_server; # ONE_SHOT on not charset/collation stuff is not allowed -error 1381; +error 1382; set one_shot max_join_size=10; # Test of wrong character set numbers; |