From 38b406cec8ce9bc4ab00b5c849b1154030d9fca1 Mon Sep 17 00:00:00 2001 From: "sven@riska.(none)" <> Date: Tue, 11 Mar 2008 18:43:29 +0100 Subject: [PATCH] Removed pushbuild errors. Problem: rpl_variables_stm.test used a character set and a collation which are not included on all platforms. Fix: replace the character set and collation by ones that are included on all platforms. (rpl_variables_stm does not rely on which character set is used, the only important aspect is the fact that it changes.) --- mysql-test/suite/rpl/r/rpl_variables_stm.result | 4 ++-- mysql-test/suite/rpl/t/rpl_variables_stm.test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_variables_stm.result b/mysql-test/suite/rpl/r/rpl_variables_stm.result index 18b90b1264d..51484187215 100644 --- a/mysql-test/suite/rpl/r/rpl_variables_stm.result +++ b/mysql-test/suite/rpl/r/rpl_variables_stm.result @@ -28,8 +28,8 @@ SET @s_collation_database= @@global.collation_database; SET @@global.pseudo_thread_id= 4711; SET @@global.auto_increment_increment=19; SET @@global.auto_increment_offset=4; -SET @@global.character_set_client='eucjpms'; -SET @@global.collation_connection='eucjpms_bin'; +SET @@global.character_set_client='latin2'; +SET @@global.collation_connection='latin2_bin'; SET @@global.collation_server='geostd8_general_ci'; SET @@global.time_zone='Japan'; SET @@global.lc_time_names='sv_SE'; diff --git a/mysql-test/suite/rpl/t/rpl_variables_stm.test b/mysql-test/suite/rpl/t/rpl_variables_stm.test index 6548b9e90e3..85152ae878a 100644 --- a/mysql-test/suite/rpl/t/rpl_variables_stm.test +++ b/mysql-test/suite/rpl/t/rpl_variables_stm.test @@ -88,8 +88,8 @@ SET @s_collation_database= @@global.collation_database; SET @@global.pseudo_thread_id= 4711; SET @@global.auto_increment_increment=19; SET @@global.auto_increment_offset=4; -SET @@global.character_set_client='eucjpms'; -SET @@global.collation_connection='eucjpms_bin'; +SET @@global.character_set_client='latin2'; +SET @@global.collation_connection='latin2_bin'; SET @@global.collation_server='geostd8_general_ci'; SET @@global.time_zone='Japan'; SET @@global.lc_time_names='sv_SE';