summaryrefslogtreecommitdiff
path: root/mysql-test/extra/binlog_tests
diff options
context:
space:
mode:
authorunknown <ramil/ram@ramil.myoffice.izhnet.ru>2007-11-29 14:35:15 +0400
committerunknown <ramil/ram@ramil.myoffice.izhnet.ru>2007-11-29 14:35:15 +0400
commitd68d16bb3db00ca4bf09f785e0a39bfa2c202911 (patch)
tree9a34538efdfd3c04c9f706aba37617fc04d67b06 /mysql-test/extra/binlog_tests
parentb9c4817058ea791db0f623b7c50093296e475de2 (diff)
parent3f42e6ff9b98ebefdb684c0370872cb98f3a5aa2 (diff)
downloadmariadb-git-d68d16bb3db00ca4bf09f785e0a39bfa2c202911.tar.gz
Merge mysql.com:/home/ram/work/b32726/b32726.5.0
into mysql.com:/home/ram/work/b32726/b32726.5.1 mysql-test/r/ctype_euckr.result: Auto merged mysql-test/r/ctype_uca.result: Auto merged strings/ctype-cp932.c: Auto merged mysql-test/extra/binlog_tests/ctype_cp932.test: Auto merged mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result: Auto merged
Diffstat (limited to 'mysql-test/extra/binlog_tests')
-rw-r--r--mysql-test/extra/binlog_tests/ctype_cp932.test4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/extra/binlog_tests/ctype_cp932.test b/mysql-test/extra/binlog_tests/ctype_cp932.test
index 0839f5d43aa..3deeea13997 100644
--- a/mysql-test/extra/binlog_tests/ctype_cp932.test
+++ b/mysql-test/extra/binlog_tests/ctype_cp932.test
@@ -8,6 +8,10 @@ drop table if exists t3;
drop table if exists t4;
--enable_warnings
+SET @test_character_set= 'cp932';
+SET @test_collation= 'cp932_japanese_ci';
+-- source include/ctype_common.inc
+
set names cp932;
set character_set_database = cp932;