From: Dmitry Shulga Date: October 18 2010 4:26pm Subject: bzr commit into mysql-trunk-merge branch (Dmitry.Shulga:3274) Bug#36742 List-Archive: http://lists.mysql.com/commits/121000 X-Bug: 36742 Message-Id: <0LAH00DJKV08EP90@fe-emea-10.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_rqTx2N8zdibc4iGN5qoBGg)" --Boundary_(ID_rqTx2N8zdibc4iGN5qoBGg) 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-trunk-merge/ based on revid:dmitry.shulga@stripped 3274 Dmitry Shulga 2010-10-18 [merge] Auto-merge from mysql-5.5-bugteam for bug#36742. 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_rqTx2N8zdibc4iGN5qoBGg) 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-trunk-\ # merge/ # testament_sha1: 0eb63e0984f5298dc20fa6003134d857ddf9f5da # timestamp: 2010-10-18 23:26:29 +0700 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\ # bugteam/ # base_revision_id: dmitry.shulga@stripped\ # jx3xc02bic8hjpzq # # Begin bundle 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 --Boundary_(ID_rqTx2N8zdibc4iGN5qoBGg)--