From: Dmitry Shulga Date: October 18 2010 4:20pm Subject: bzr commit into mysql-5.5-bugteam branch (Dmitry.Shulga:3249) Bug#36742 List-Archive: http://lists.mysql.com/commits/120998 X-Bug: 36742 Message-Id: <0LAH00DHTUQAEP90@fe-emea-10.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_dlpXa8ZjXriAYak3P1KZ5g)" --Boundary_(ID_dlpXa8ZjXriAYak3P1KZ5g) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline #At file:///Users/shulga/projects/mysql/mysql-5.5-bugteam/ based on revid:dmitry.shulga@stripped 3249 Dmitry Shulga 2010-10-18 Follow-up for bug#36742: changed results for test ipv4_as_ipv6 because hostname is case-insensitive. modified: mysql-test/r/ipv4_as_ipv6.result === modified file 'mysql-test/r/ipv4_as_ipv6.result' --- a/mysql-test/r/ipv4_as_ipv6.result 2009-11-26 08:03:04 +0000 +++ b/mysql-test/r/ipv4_as_ipv6.result 2010-10-18 16:20:26 +0000 @@ -32,9 +32,9 @@ mysqld is alive CREATE USER testuser@'0:0:0:0:0:FFFF:127.0.0.1' identified by '1234'; GRANT ALL ON test.* TO testuser@'0:0:0:0:0:FFFF:127.0.0.1'; SHOW GRANTS FOR testuser@'0:0:0:0:0:FFFF:127.0.0.1'; -Grants for testuser@0:0:0:0:0:FFFF:127.0.0.1 -GRANT USAGE ON *.* TO 'testuser'@'0:0:0:0:0:FFFF:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF' -GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0:0:0:0:0:FFFF:127.0.0.1' +Grants for testuser@0:0:0:0:0:ffff:127.0.0.1 +GRANT USAGE ON *.* TO 'testuser'@'0:0:0:0:0:ffff:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF' +GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0:0:0:0:0:ffff:127.0.0.1' SET @nip= inet_aton('0:0:0:0:0:FFFF:127.0.0.1'); SELECT @nip; @nip @@ -61,9 +61,9 @@ mysqld is alive CREATE USER testuser@'0000:0000:0000:0000:0000:FFFF:127.0.0.1' identified by '1234'; GRANT ALL ON test.* TO testuser@'0000:0000:0000:0000:0000:FFFF:127.0.0.1'; SHOW GRANTS FOR testuser@'0000:0000:0000:0000:0000:FFFF:127.0.0.1'; -Grants for testuser@0000:0000:0000:0000:0000:FFFF:127.0.0.1 -GRANT USAGE ON *.* TO 'testuser'@'0000:0000:0000:0000:0000:FFFF:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF' -GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0000:0000:0000:0000:0000:FFFF:127.0.0.1' +Grants for testuser@0000:0000:0000:0000:0000:ffff:127.0.0.1 +GRANT USAGE ON *.* TO 'testuser'@'0000:0000:0000:0000:0000:ffff:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF' +GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0000:0000:0000:0000:0000:ffff:127.0.0.1' SET @nip= inet_aton('0000:0000:0000:0000:0000:FFFF:127.0.0.1'); SELECT @nip; @nip @@ -90,9 +90,9 @@ mysqld is alive CREATE USER testuser@'0:0000:0000:0:0000:FFFF:127.0.0.1' identified by '1234'; GRANT ALL ON test.* TO testuser@'0:0000:0000:0:0000:FFFF:127.0.0.1'; SHOW GRANTS FOR testuser@'0:0000:0000:0:0000:FFFF:127.0.0.1'; -Grants for testuser@0:0000:0000:0:0000:FFFF:127.0.0.1 -GRANT USAGE ON *.* TO 'testuser'@'0:0000:0000:0:0000:FFFF:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF' -GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0:0000:0000:0:0000:FFFF:127.0.0.1' +Grants for testuser@0:0000:0000:0:0000:ffff:127.0.0.1 +GRANT USAGE ON *.* TO 'testuser'@'0:0000:0000:0:0000:ffff:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF' +GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0:0000:0000:0:0000:ffff:127.0.0.1' SET @nip= inet_aton('0:0000:0000:0:0000:FFFF:127.0.0.1'); SELECT @nip; @nip @@ -119,9 +119,9 @@ mysqld is alive CREATE USER testuser@'0::0000:FFFF:127.0.0.1' identified by '1234'; GRANT ALL ON test.* TO testuser@'0::0000:FFFF:127.0.0.1'; SHOW GRANTS FOR testuser@'0::0000:FFFF:127.0.0.1'; -Grants for testuser@0::0000:FFFF:127.0.0.1 -GRANT USAGE ON *.* TO 'testuser'@'0::0000:FFFF:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF' -GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0::0000:FFFF:127.0.0.1' +Grants for testuser@0::0000:ffff:127.0.0.1 +GRANT USAGE ON *.* TO 'testuser'@'0::0000:ffff:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF' +GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0::0000:ffff:127.0.0.1' SET @nip= inet_aton('0::0000:FFFF:127.0.0.1'); SELECT @nip; @nip @@ -149,9 +149,9 @@ mysqld is alive CREATE USER testuser@'::FFFF:127.0.0.1' identified by '1234'; GRANT ALL ON test.* TO testuser@'::FFFF:127.0.0.1'; SHOW GRANTS FOR testuser@'::FFFF:127.0.0.1'; -Grants for testuser@::FFFF:127.0.0.1 -GRANT USAGE ON *.* TO 'testuser'@'::FFFF:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF' -GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'::FFFF:127.0.0.1' +Grants for testuser@::ffff:127.0.0.1 +GRANT USAGE ON *.* TO 'testuser'@'::ffff:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF' +GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'::ffff:127.0.0.1' SET @nip= inet_aton('::FFFF:127.0.0.1'); SELECT @nip; @nip --Boundary_(ID_dlpXa8ZjXriAYak3P1KZ5g) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/dmitry.shulga@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/dmitry.shulga@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@stripped # target_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\ # bugteam/ # testament_sha1: d4095ee9f74056e0549f100c96be92d7fc21d273 # timestamp: 2010-10-18 23:20:31 +0700 # source_branch: file:///Users/shulga/projects/mysql/5.1-bugteam-\ # bug36742/ # base_revision_id: dmitry.shulga@stripped\ # 54oodgfcutio2xjv # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWav4xOUAAv/fgEAQWPP/93+n 36D////wUAUe7a9unm2a4b3J29esd6EkpoRPUbNTQmIaPU9TCNA000AaA2kaBJJNGmTTST9SPSmx T1HqaaDRoAHqNGgA0EkIk0EzUaGho0GgeoAADQ0AARUkwp6DQnojTTBA0BoAANBkAEkSBqnhDCnp lJ+pqD1GnqeoPUDQAAaCoQdaSZBfnFmD6bP2MHPqaVEEYIqBc0HxMWuNKUtlFYiVaL/ZaYGZZch8 ysNad7rQXbtUUonNptHHB450PROjKjOjvRmRs4xFdG6iWrXl9qnC+5IfjN9ItIw4mM+ibTb3I8h2 F9p0daGRwR6RFYh0js6xECOFHyTFQirQsWMuc1a3e1b37PQKrCzMzMzc6XCq2ZLE8BK9iNjQuyRS YdRRtSiX7wrFGKLPI7yBYqdqGQOkDCrgdHtRHK6YUFTSUqMIEIIiCUSVsNXpJxb7bj3ipFFqFRIR jv0ILjIMR0yealQkvVhUNEAjHe3wxadck/CmlSm1DivGPDdWgw7vbnRQWlldJhDsJVtUWQUCukMm MTREl1OLqoqX2MkptAwK1ttCqKEv5P3KaHkhm5TQjYi31I4OMcslJDA1DUW4UnoxfEakrwIFxthK ppkTpIPJEkUoxhJyLKZ1q6k5SxWUywuXLCzUQi/+7OZ+Q6oWp0mXU+tFqN5SI3wzLNu665Ohsue5 WUDJLVBGSIuryTL3Dn2W6MV5kYzfSCcgoSJZMi1ELbno60XotMLZ7HbdHFYjLKS0I0zKIgR4iOJv Fm7tJgqLeQV5Mk1A7szs6YFDpKqArrLUFWxpBePaTM5wMzq0ac5WDQZNJnloXSavxPLxx3a7GMWf 4uCZUxQghzJ4pQmkTSlctQLiRHIkqQuptplnSNNKYNGlKyYksSpnT2SVOJJk2k4UmStzpYSlWlNV PVPpKUtJVSdPhSAlVJhLNUT7SAlsSZLyTJ9pOl9Jtjj0K1FaETRoIwBuam91A4O+V0rKPaA468T8 sxDn9s7x50FjMKAlyhpskdmF7IkkRsDRqTvJ12uSdQ+Iguu7brtPSBx/L3jDVunI7Hmeq6x3MIxx MF9RYHDLKwjNOenWKGCvUcys1wN4zow+dNfU76P7/etfu58zS/lv5r22fDnyjsbFA+QKYb25TFSW p6MdtpqHTTtZ2QF/IRplAIsXLTkPvQUYJo0mZJbQSsFItZConpKE36xgL7r5jcz1dvyGKCtogrtK +WXfowxISF7bUp14BKbLJSXwhuk5K7t9BBBvyS2ndyKeLoTW4G8WasKfkMIdnaq+C0Bfx4tYELwl 3gp3z/X5QZkQ8W4U5NkDhRjAJVokbq7rIMouccrxG1QWcTrJoNMLrlrg+SQ3Gw2cJhJnnRFQmkh0 6w3XWAVKvfRl0kigOLGqCylUDLz77E7DVXk18mbMoPIYClfc1ANIukjgRzYWYjRkDhx96JUeBbLN zlBGKvfZiKSVtpM4whrXFwKwfXGi+XqdJaulizYgqCaGBUt2/cVmbJW1A6QesQ+u3RWPB374wm8d mU/Yj8CIJQjXZUYrCatFAVFKkSSwakatNvNjMim5K0QzQEjwRRlxXG5EcQEutOemmEXJzCOLcsgt ChUYl0GQfKRVxTDR/i7kinChIVfxico= --Boundary_(ID_dlpXa8ZjXriAYak3P1KZ5g)--