From: kevin.lewis
Date: February 4 2011 2:59pm
Subject: bzr commit into mysql-5.5-innodb branch (kevin.lewis:3303) Bug#59699
List-Archive: http://lists.mysql.com/commits/130427
X-Bug: 59699
Message-Id: <20110204145941.65CACA46A1A@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1421284074=="

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

#At file:///Users/kevinlewis/Work/Mysql/Bug59699/mysql-5.5-innodb/ based on revid:marko.makela@stripped

 3303 kevin.lewis@stripped	2011-02-04
      Bug#59699 - Hidden bug would cause a crash for unknown tablespace flags.
      
      The bug would cause a crash of InnoDB if a non-standard or unknown table
      flags existed in a SYS_TABLES record. This is important because the next
      file version, Cheetah, will identify itself by expanding this field.  So
      unless this is fixed, an older engine that tries to open a table in a
      tablespace with a newer file version will crash instead of report an error
      and refuse to open the table, as it should do.
      
      Reviewed at RB://583.    Approved by Marko.

    modified:
      storage/innobase/dict/dict0load.c
=== modified file 'storage/innobase/dict/dict0load.c'
--- a/storage/innobase/dict/dict0load.c	revid:marko.makela@stripped
+++ b/storage/innobase/dict/dict0load.c	revid:kevin.lewis@stripped
@@ -1552,7 +1552,7 @@ err_len:
 				"InnoDB: in InnoDB data dictionary"
 				" has unknown type %lx.\n",
 				(ulong) flags);
-			return(NULL);
+			return("incorrect flags in SYS_TABLES");
 		}
 	} else {
 		flags = 0;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kevin.lewis@stripped
# target_branch: file:///Users/kevinlewis/Work/Mysql/Bug59699/mysql-\
#   5.5-innodb/
# testament_sha1: 706001d21616af87d634c8cfffd55d256c39b3f4
# timestamp: 2011-02-04 08:59:41 -0600
# base_revision_id: marko.makela@stripped\
#   z3c3wcszrh5l566h
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYnELpMAAbbfgEAwWmf//39m
HCC////wUARu73oKr0JAABKmRSbU/RTyjanqeCT00mmjQGg0PU9TTTIAyplPU9NU/NKbST0hmQ0m
gMgBoGgYQqbSm8plPKaaANMgaBoAAZAGQRT01TGoGNQDRiaZAGgZNDQxNMQSSAQEyNTamCANJ6TU
9MkPUAYmajWtI4iOulL9P2YKoBOKaI2IBtbqqV2OtV8pONkpHknlxCIhLIkiwqIOoISJzP4qOi2w
wYMQejkraCQxKEmIWZRNlH4w6HASFHyKtZKOQEhobKxO2K7ZgYXVDqDOklQUDAYP8uHyrHEcXSNe
0m7stv80PbxYprVC3n7sX6tHNK9fQRk+zitORDCK6gYVstNlee+Jw5RvkiLXEzHuw9uBkZ5Z4iuw
0Cf8pcRl8BHWplGQPUGFEqes37oKSqvFaVwdl4LYtApLg3NRBmU3xQOe5XNfNzjJ2pRO9cRwvrVG
9Yu6/mublyyxyNDLLtKdeMecRkCxc+2eG/dGC2DrJzeGHS3qh8jp0FvSKBi+Sic2S3lFl7qA+xWV
FWhy0qoToNE4WPFIrHEYDZHMqh4175SuKibiqtYulRxzFT3mwy4pA+PAaq4RF485RbYoH4ZCGBpo
M7azTRWBaqRzaFFvW1thRUpZZYqGc9DZ6b7Fja4OcuVPFjoOR4XKko8FxocFCkMUx7kuQCBq0aEm
eqfBokrFdBUcmo0iQTo1yh5+Z21YGk7nZ77l+MlyS+hquhjREE+ri/Nl04dhIwcZBB8AptE3Dl9g
pfQgS+ECSTg2roMyZx1d3eug+NqPVeaRVsTS44xCpU/RemT8iWt9zabXo+1apRdr35uPJcGXmm5I
8XeQ1Lr0bXh6aQYkFFX5r5KZtguB33LqvI/jbugzJGhIxsjavZPmLP7i6hQOlMWb63wfBas+rItr
K1FNsjFaykevtWChI+CBm5h45iiGffifiORbEUwuGjkYMdwjbm+7vTRnrtNCwwBnHPfYW9Mm9/dc
/M9Hq+aGTKlkql7KqcdqcsQ2Zig61sttJzKVGxXF1vzvScEsZpVjrlV0Sk7PBb9XbDnPEzHJ8iFZ
f9m4jDMYMvgc0oclehzLVsTurWmeEOXs48i1v+eQoKehXxIFuYvL1X31P1zp1xoPtkjtHkIokl5d
YeOErZ/TdrleLv8JjGhK8PGD246acbxb51i4bE3Qv5MxtJuCRtC09+zoDAPVRelpXancvKjMNikO
HFv5JS0xN9XJTtsEVLSsVXB9Zse6EBzegnBcQOcdKjKKTbBMbpwZgYZ7xxLdgL0944k+8fXUJzJl
n7eBxmFWtNjYtoKtQZesYjDWfVIsCj03FPWWs7ttdw7qLe/e5lAqWPM+7Z/U315MKqhzuHJkl16l
B92DPQ3vZ2POdBX350CtYvhha0ZphmimXxxTMVYyhBKUIVg++aY6rb4XFYQmuFZ2YCcq9lLUZLZc
XShKDk9k50S8Mq8SqLjRI2WORXlSy4iVA9OZ6hN6azHM/etcKKswt0XqU72vVC4FwR6pzmeMk3wk
OHCxgLA0WMZJdGtaKFMVEUhf+LuSKcKEhE4hdJg=


--===============1421284074==--