From: Date: May 19 2009 11:05am
Subject: bzr commit into mysql-6.0-bugteam branch (ramil:3300) Bug#40054
List-Archive: http://lists.mysql.com/commits/74465
X-Bug: 40054
Message-Id: <0KJV003DJVXTWV30@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_I/eOw9RYWd7ADL4dCmmUQg)"

--Boundary_(ID_I/eOw9RYWd7ADL4dCmmUQg)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/ram/mysql/mysql-6.0-bugteam/ based on revid:sergey.glukhov@stripped

 3300 Ramil Kalimullin	2009-05-19
      Correction of the fix for bug#40054: 'check table .. for upgrade' 
      doesn't detect collation change made in 6.0.{1, 6}
      
      Check for latin2_czech_cs use prior to 6.0.5 as there's a fix for 
      #33452: Primary difference between capital and small letters U and O
      that has changed the collation in 6.0.5.
     @ sql/handler.cc
        Correction of the fix for bug#40054: 'check table .. for upgrade' 
        doesn't detect collation change made in 6.0.{1, 6}
          - check for latin2_czech_cs use prior to 6.0.5 due to fix for #33452.

    modified:
      sql/handler.cc
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2009-05-07 20:48:24 +0000
+++ b/sql/handler.cc	2009-05-19 09:05:40 +0000
@@ -2846,8 +2846,8 @@ int handler::check_collation_compatibili
             (mysql_version < 50124 &&
              (cs_number == 33 ||   /* utf8_general_ci - bug #27877 */
               cs_number == 35)) || /* ucs2_general_ci - bug #27877 */
-            (mysql_version < 60001 &&
-             (cs_number == 2)) ||  /* latin2_czech_cs - WL #3664 */
+            (mysql_version < 60005 &&
+             (cs_number == 2)) ||  /* latin2_czech_cs - bug #33452 */
             (mysql_version < 60006 &&
              (cs_number == 1 ||    /* big5_chinese_ci - bug #25420 */
               cs_number == 36 ||   /* cp866_general_ci - bug #25420 */


--Boundary_(ID_I/eOw9RYWd7ADL4dCmmUQg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/ramil@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/ramil@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ramil@stripped
# target_branch: file:///home/ram/mysql/mysql-6.0-bugteam/
# testament_sha1: c20372df9a5e3c713878007f57f1b8c010996949
# timestamp: 2009-05-19 14:05:52 +0500
# source_branch: file:///home/ram/mysql/b40757-5.1-bugteam/
# base_revision_id: sergey.glukhov@stripped\
#   xiqkneemx6qce6ih
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWddj8rMAAftfgEBwWff//1oI
0gC////+UATFsng7dcrpy10K7CSUyAU1P01J7JPTSbJqempqZpG0j1GEaA0ElU21J+iTKZ6jSaGm
mhkAAAAAAkiaIJPAqPNKNNNPUH6ppoPUNAGQDQ5hMAmAEwmE0wAACZNNAwkkRoaMkGRoJ6k9NU9T
1P1NlBBiDRk9T1M8Jz+1d2hvHw/hbJTLN0EqsGCltemZ72AjKNjtjszb4j76iAI17coY/TEpn9Zv
qNcculmYl8T8vmdwcDriJcHD+Eafr5YZne1uLliSTwmUtQaXuN4zoPwPY3i5rEp3nG44GMFxOhN4
GXXXaSHkZSKFGJGuvT1dW2XPz80ZdDdm1KC+2p6RgZbjg71bSMNacXce6zs74ahjSurmEatAsBtr
mWfXharlR04lA8U6MEZjSmFsTzGNP7URRYSeqiNgz5C5JMnYkt99hfwWlFWUEOpKOwdhlJQ2Yj4j
Cchwu8/qmIgVFaPU+uIXM1vaVWKtgy+kLZOqq0wYXUccIleBi7hagsjsOy2EJH2RmSx23OaxIjeP
ToD7pElSWWTyco1hxTjEr2Ek5x81Qqq5y3UCi80UjC0t1XOmdQt8iJe0PV16rOU07jaHmxkVzP93
M1uGm3uN40x+o3uQWFaZx6MLIY1lKu0yWIxYVkDtqHzndYt28VxwygqFtKFzKx56suxNuJyNtqnE
aqBn9Ksxgv5NNCmQkYyhbMStELCL+kWybKYBCowEZbZqEWDEykEm05O+4wyooYlaMIpyq9VdsAvN
l4e7riIJDe5b6hT7vicOTo4HNGzoNdWF2qDFhj9Nn0vcrG4LRV3LNxXyacYNfXASXWwcY+wyNhK5
OCH3+EIXr0qSqaZNB4eIvbeK2mHIT3sUaxeNR4HYraqzAgWZULtavHgGgMPI6l5Ij0RTecVxtiFy
1LBuwxUzuMUJrYkNxX+X7oGN6hXQzdcLh5dSpUpzxUhqGkZrIdBFR4LRREwzcx1PMcwwK7o48BPq
KG0ZS6sZi3551UaKZFiYL1NZJQB5IuhMd3yXOH8zBx1TI+N6IzlPRt2BRHcLga4GIVWl0pgWqtVX
2HEMh/QsH0Hx0o8TQtPy8vZ25C6chW7B6RAod/Uo7IzFJiBdapoPSTNeZX6GyvggDAK+dcXhXGEh
V/YU/JWKAqK5Pgk8oVytxAsFLEZGcHKQS1e3vfDZUMyZKw+S3Ad05hiqr9rk8VPFYhzLJtygkRTJ
UYEyvrqXXwDiyoeqNw41YaG5FOlIhUXxmo0rVy3wKAMMbWF+FFZGAqqVq81h6AZwRdNhYmKeEwsl
0UwUwZE+CkSDhnuzrCjI8DqfiTUrDNO9e40HBJWCXOCVgnjEQZfiRetXuWxE7jPPMPKkrFz4G7BT
fC0ttTEefktavBRxkK83MDmBwG8cH+XHRNz4KrULgdz7Ra+mMWT6UQ9dJmtC2/DJZ11CgWAzBNy0
6P0oHlNYznZLkuJt71UxIt4gPRWLbUVm5rPHmgdprATSDVNLEyHnkLm9EGnUuV5rrorsNJAjHi8O
WW0eUi0DlcF4qWU7h4V4YJtoULbdNOuYZh69+dQrXJ30AUyd27yF0VBCtSkWaqNxUOoUnkPasbFY
IevSJpvD3lTZu5V7T+76j/i7kinChIa7H5WY


--Boundary_(ID_I/eOw9RYWd7ADL4dCmmUQg)--