From: Alexander Nozdrin
Date: October 13 2010 8:57am
Subject: bzr commit into mysql-5.5-bugteam branch (alexander.nozdrin:3239) Bug#48874
List-Archive: http://lists.mysql.com/commits/120638
X-Bug: 48874
Message-Id: <201010130859.o9D8314C031451@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7175000415044166011=="

--===============7175000415044166011==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/alik/MySQL/bzr/00.build/mysql-5.5-bugteam/ based on revid:dmitry.shulga@stripped

 3239 Alexander Nozdrin	2010-10-13
      A patch for Bug#48874 (Test "is_triggers" fails because of wrong charset info).
      
      The thing is that the following attributes are fixed (remembered) when a trigger
      is created:
        - character_set_client
        - character_set_results
        - collation_connection
      
      There are two triggers created in mysql-test/include/mtr_warnings.sql.
      They were created using "current default" character set / collation.
      is_triggers.test shows definition of these triggers including recorded
      character set information.
      
      The problem was that if "current default" changed, the recorded character
      set information was not accurate.
      
      There might be two ways to fix that:
        a) update is_triggers.test so that it does not put character-set information
           into result-file;
        b) update mtr_warnings.sql so that the triggers are created using
           hard-coded character sets.
      
      This patch implements option b).

    modified:
      mysql-test/include/mtr_warnings.sql
=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2010-06-02 16:08:06 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2010-10-13 08:57:23 +0000
@@ -16,6 +16,12 @@ CREATE TABLE test_suppressions (
 -- no invalid patterns can be inserted
 -- into test_suppressions
 --
+SET @character_set_client_saved = @@character_set_client||
+SET @character_set_results_saved = @@character_set_results||
+SET @collation_connection_saved = @@collation_connection||
+SET @@character_set_client = latin1||
+SET @@character_set_results = latin1||
+SET @@collation_connection = latin1_swedish_ci||
 /*!50002
 CREATE DEFINER=root@localhost TRIGGER ts_insert
 BEFORE INSERT ON test_suppressions
@@ -24,6 +30,9 @@ FOR EACH ROW BEGIN
   SELECT "" REGEXP NEW.pattern INTO dummy;
 END
 */||
+SET @@character_set_client = @character_set_client_saved||
+SET @@character_set_results = @character_set_results_saved||
+SET @@collation_connection = @collation_connection_saved||
 
 
 --
@@ -38,6 +47,12 @@ CREATE TABLE global_suppressions (
 -- no invalid patterns can be inserted
 -- into global_suppressions
 --
+SET @character_set_client_saved = @@character_set_client||
+SET @character_set_results_saved = @@character_set_results||
+SET @collation_connection_saved = @@collation_connection||
+SET @@character_set_client = latin1||
+SET @@character_set_results = latin1||
+SET @@collation_connection = latin1_swedish_ci||
 /*!50002
 CREATE DEFINER=root@localhost TRIGGER gs_insert
 BEFORE INSERT ON global_suppressions
@@ -46,6 +61,9 @@ FOR EACH ROW BEGIN
   SELECT "" REGEXP NEW.pattern INTO dummy;
 END
 */||
+SET @@character_set_client = @character_set_client_saved||
+SET @@character_set_results = @character_set_results_saved||
+SET @@collation_connection = @collation_connection_saved||
 
 
 


--===============7175000415044166011==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/alexander.nozdrin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   3i7tg001cj3l1bru
# target_branch: file:///home/alik/MySQL/bzr/00.build/mysql-5.5-\
#   bugteam/
# testament_sha1: e12bdf8eaa4fcbaab13f2831454058a1d9c66b98
# timestamp: 2010-10-13 12:57:32 +0400
# base_revision_id: dmitry.shulga@stripped\
#   4g7xt4a7za2cnonp
# 
# Begin bundle
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


--===============7175000415044166011==--