From: Tor Didriksen
Date: August 27 2010 6:37am
Subject: bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3255 to 3256)
 Bug#52312
List-Archive: http://lists.mysql.com/commits/116951
X-Bug: 52312
Message-Id: <20100827063712.C2741372D@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5538883645844635589=="

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

 3256 Tor Didriksen	2010-08-27
      Bug#52312 lost Handler_read_last status variable
      
      Post-push fix: adjust more test results.

    modified:
      mysql-test/r/join_optimizer.result
      mysql-test/r/null_key_none.result
      mysql-test/r/select_none.result
      mysql-test/r/subquery_none.result
 3255 Marc Alff	2010-08-26 [merge]
      Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

    added:
      mysql-test/r/handler_read_last.result
      mysql-test/t/handler_read_last.test
    modified:
      mysql-test/r/create.result
      mysql-test/r/insert_select.result
      mysql-test/r/join.result
      mysql-test/r/join_outer.result
      mysql-test/r/null_key_all.result
      mysql-test/r/partition.result
      mysql-test/r/select_all.result
      mysql-test/r/single_delete_update.result
      mysql-test/r/update.result
      sql/mysqld.cc
=== modified file 'mysql-test/r/join_optimizer.result'
--- a/mysql-test/r/join_optimizer.result	2010-07-06 20:37:12 +0000
+++ b/mysql-test/r/join_optimizer.result	2010-08-27 06:36:54 +0000
@@ -60,6 +60,7 @@ SHOW STATUS LIKE 'Handler_read_%';
 Variable_name	Value
 Handler_read_first	0
 Handler_read_key	1
+Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
 Handler_read_rnd	0

=== modified file 'mysql-test/r/null_key_none.result'
--- a/mysql-test/r/null_key_none.result	2010-07-04 15:07:55 +0000
+++ b/mysql-test/r/null_key_none.result	2010-08-27 06:36:54 +0000
@@ -424,6 +424,7 @@ SHOW STATUS LIKE "handler_read%";
 Variable_name	Value
 Handler_read_first	0
 Handler_read_key	6
+Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
 Handler_read_rnd	0

=== modified file 'mysql-test/r/select_none.result'
--- a/mysql-test/r/select_none.result	2010-07-23 17:51:11 +0000
+++ b/mysql-test/r/select_none.result	2010-08-27 06:36:54 +0000
@@ -4338,6 +4338,7 @@ SHOW STATUS LIKE 'Handler_read%';
 Variable_name	Value
 Handler_read_first	0
 Handler_read_key	2
+Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
 Handler_read_rnd	0

=== modified file 'mysql-test/r/subquery_none.result'
--- a/mysql-test/r/subquery_none.result	2010-08-16 07:21:40 +0000
+++ b/mysql-test/r/subquery_none.result	2010-08-27 06:36:54 +0000
@@ -4310,6 +4310,7 @@ show status like '%Handler_read%';
 Variable_name	Value
 Handler_read_first	0
 Handler_read_key	0
+Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
 Handler_read_rnd	0


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   i6b10del0hkunok8
# target_branch: file:///export/home/didrik/repo/next-mr-bf/
# testament_sha1: 0be7f0626857ed1e030e4a97e7703ffbd4f0603e
# timestamp: 2010-08-27 08:37:12 +0200
# base_revision_id: marc.alff@stripped\
#   g4h4f0skktqsg0mx
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT1YWyAAAzZfgAAwWGP/91ZA
RAC////wYAY/egKKB2MDoUPoAMpNR6gYj1NGAah5QAB6gGEqk00PU9Gk9Tag0xANGIMTIyBgAAAA
BoNAGgGgEppNJqJ6ZGKYTTI0GgBoAAyk0NI0eppk0YgGhphDTED1BJICAJhNAJpk00E1PRMRp6n6
Dzuyyz3IwD75BA0ZyJMTwpeFqEZRNkY1udKiUJ3loneG8JgmEkkkuHiwYRVrxOpSRYrIlIsYtZTj
F5CVX5q46B8fP/fFU8gpYHMhqHAfu6TakSDMNW0Mty8knskH35vrv3N+Gc539lovykF8yN1K3nEF
wp4jbQ4ZP30lYbarNiwVu8AmAMg1hSEKoB1DGsmkDMZOc5AvxASWY/NkGOffiTbITIUhhxxaaiOS
CxKQPYcZn1+oCUmp0BclFWBgjVW4J3OT3xCnnWgXSJSwTJHS0x3H6BOOkqzXfGjeS2K2TigvYpMW
3x/qJuTk5nbxOqNdc0fOXPCxj1VHHA52ZRoLIKyJ88pEasL1cFWMz3BsImzqUHkc6664lzMz2xG4
j2QLQjmOcoaSNKSqLg3C1FRKyspIJzAmIj30Fulaik8o7BVwfvywNthU/EbUOvHOiRXgygqigu3K
VQKZLIdQfwXMqYOsgabCQNi0pJtCC42RURbIlDZhDTHvuwM43jBSeBNH+0EyU2oRrLDIeGispKw6
J9Pg52dLlo0Y3avhyuosBU2E8WreSGmZQMD6CBeXk9/kSCBjoTro1NKyDtgrIkB7lWPzgC20GogC
whtzOYxKg00FhM0OgLEqKU0ydVpXg1oMOBXq0YUWKivHKq6oqKg1BVC4cU3SqcTkJ5IuIjr7j1J0
5l7Im9WjwZVmovHpJqyRXnbXEyKKIlqlsM6kj4vaIjEQCB8U7JrWOCRbZqYPDDG5lgHTC0Uww3bq
F+UzOWmyVeBlTvkkzqlsDzqa6TFQ4yopsTZqUVPBjVrwDiC1xJMJdwK/gG9o2smG21mJCGR8abIg
HUpNYCpyM7NYxvmkIJs4eaPt4vAxcI4m05G1G/aMcCI88CkoPfA8vr3wAIC2zMYJfZbadYa4/4ij
wViR78EPU+4fg9dACk1HA8DbxNCfcrIHtwrPpbeqFcGxeJRTaWeJ6kCQ51x728eT9TmAPAEYWhiE
sXGNtzHtQV2C8jAqFyhTRRQgvRYWyBP0MTBC5ohrCxGwrSXG9D2AIIGD3xMgzND5P6aTkS7h1CX2
8mB1YTSaIyN8g0hRbSK9EC0RGp0wQAZVqQx8AaVjPGEgmRHdMLruVrTzRcdg3FXR68eNCGsBGb0H
woXeK56OyL6HmsJGR1O3ADpA0WKOP7DmHui0NbjI17Ny9Vhq3B2Agdyu8rKe1BsvXwQiIlmdgXLq
G8zsNEHQ5GQLVFYv+kH85IT5uRfMS2gt5pJHC+goJyr+WTJnJukuiZcAScjg8Cxmx/UV0KE4pEoB
18lPnqelgvIJCW9ewKBWYroAQglr1BAHKpHcqDAAYCKkjunjHCwH83CLQrdwDMSKjkuqrB1RmyjK
uUkbIndfxPCiFFjIe9Cc5UhS5JkPQOal1tGLUgskFQEmFv4M9bQx9TL2PleABmJA7hAxEpIHZQWW
VEGUABBOtZ5JOpiZoFcQ5cWBhPRH0nv4SYIrj63HYLEnLmuxPpHzGv2BFCuSGSRRNPHwQ9I/sFjq
7uRMV5J07RKlXPxjAGWMS/0JBHt5t5iWr0VTlsYtDqkweixLxYVh6pVF2QZPe97kZ2pTwaCF4woN
YUsHMR27v8yMA7qARAYa7C+kGAbnTHvacFiYoYH+9qV68jknW1OFwtmtv3DwX58T8kilezgVoJqg
2Z+h6yLB+6pcQ3c0v37Hc+cNwPDbFYlAjcsyL3pi8+ZpbqJgS8TAP/F3JFOFCQPVhbIA


--===============5538883645844635589==--