1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

post-merge fix

This commit is contained in:
unknown
2004-10-28 14:02:09 +03:00
parent 46ce3d0092
commit 17cf3c633e
4 changed files with 6 additions and 6 deletions

View File

@@ -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;