From: Dmitry Lenev
Date: February 2 2011 1:17pm
Subject: bzr commit into mysql-5.1 branch (Dmitry.Lenev:3572) Bug#58650
List-Archive: http://lists.mysql.com/commits/130217
X-Bug: 58650
Message-Id: <20110202131801.5C38674047A@bandersnatch>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0602995359=="

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

#At file:///home/dlenev/src/bzr/mysql-5.1-58650/ based on revid:ole.john.aske@stripped

 3572 Dmitry Lenev	2011-02-02
      Fix for bug #58650 "Failing assertion: primary_key_no == -1 ||
      primary_key_no == 0".
      
      Attempt to create InnoDB table with non-nullable column of
      geometry type having an unique key with length 12 on it and
      with some other candidate key led to server crash due to
      assertion failure in both non-debug and debug builds.
      
      The problem was that such a non-candidate key could have
      been sorted as the first key in table/.FRM, before any legit
      candidate keys. This resulted in assertion failure in InnoDB
      engine which assumes that primary key should either be the
      first key in table/.FRM or should not exist at all.
      
      The reason behind such an incorrect sorting was an wrong
      value of Create_field::key_length member for geometry field
      (which was set to its pack_length == 12) which confused code
      in mysql_prepare_create_table(), so it would skip marking
      such key as a key with partial segments.
      
      This patch fixes the problem by ensuring that this member
      gets the same value of Create_field::key_length member as 
      for other blob fields (from which geometry field class is
      inherited), and as result unique keys on geometry fields
      are correctly marked as having partial segments.
     @ mysql-test/include/gis_keys.inc
        Added test case for bug #58650 "Failing assertion:
        primary_key_no == -1 || primary_key_no == 0".
     @ mysql-test/r/gis.result
        Added test case for bug #58650 "Failing assertion:
        primary_key_no == -1 || primary_key_no == 0".
     @ mysql-test/suite/innodb/r/innodb_gis.result
        Added test case for bug #58650 "Failing assertion:
        primary_key_no == -1 || primary_key_no == 0".
     @ mysql-test/suite/innodb_plugin/r/innodb_gis.result
        Added test case for bug #58650 "Failing assertion:
        primary_key_no == -1 || primary_key_no == 0".
     @ sql/field.cc
        Changed Create_field::create_length_to_internal_length() to
        correctly set Create_field::key_length member for geometry
        fields. Similar to the blob types key_length for such fields
        should be the same as length and not field's packed length
        (which is always 12 for geometry).
        
        As result of this change code handling table creation now
        always correctly identifies btree/unique keys on geometry
        fields as partial keys, so such keys can't be erroneously
        treated as candidate keys and sorted in keys array in .FRM
        before legit candidate keys.
        
        This fixes bug #58650 "Failing assertion: primary_key_no ==
        -1 || primary_key_no == 0" in which incorrect candidate key
        sorting led to assertion failure in InnoDB code.

    modified:
      mysql-test/include/gis_keys.inc
      mysql-test/r/gis.result
      mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/suite/innodb_plugin/r/innodb_gis.result
      sql/field.cc
=== modified file 'mysql-test/include/gis_keys.inc'
--- a/mysql-test/include/gis_keys.inc	2007-11-01 14:03:09 +0000
+++ b/mysql-test/include/gis_keys.inc	2011-02-02 13:17:48 +0000
@@ -44,3 +44,19 @@ SELECT COUNT(*) FROM t2 IGNORE INDEX(p) 
 DROP TABLE t1, t2;
 
 --echo End of 5.0 tests
+
+
+--echo #
+--echo # Test for bug #58650 "Failing assertion: primary_key_no == -1 ||
+--echo #                      primary_key_no == 0".
+--echo #
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+--echo # The minimal test case.
+create table t1 (a int not null, b linestring not null, unique key b (b(12)), unique key a (a));
+drop table t1;
+--echo # The original test case.
+create table t1 (a int not null, b linestring not null, unique key b (b(12)));
+create unique index a on t1(a);
+drop table t1;

=== modified file 'mysql-test/r/gis.result'
--- a/mysql-test/r/gis.result	2011-01-12 13:02:41 +0000
+++ b/mysql-test/r/gis.result	2011-02-02 13:17:48 +0000
@@ -960,6 +960,18 @@ COUNT(*)
 2
 DROP TABLE t1, t2;
 End of 5.0 tests
+#
+# Test for bug #58650 "Failing assertion: primary_key_no == -1 ||
+#                      primary_key_no == 0".
+#
+drop table if exists t1;
+# The minimal test case.
+create table t1 (a int not null, b linestring not null, unique key b (b(12)), unique key a (a));
+drop table t1;
+# The original test case.
+create table t1 (a int not null, b linestring not null, unique key b (b(12)));
+create unique index a on t1(a);
+drop table t1;
 create table `t1` (`col002` point)engine=myisam;
 insert into t1 values (),(),();
 select min(`col002`) from t1 union select `col002` from t1;

=== modified file 'mysql-test/suite/innodb/r/innodb_gis.result'
--- a/mysql-test/suite/innodb/r/innodb_gis.result	2010-06-03 09:50:32 +0000
+++ b/mysql-test/suite/innodb/r/innodb_gis.result	2011-02-02 13:17:48 +0000
@@ -585,5 +585,17 @@ COUNT(*)
 2
 DROP TABLE t1, t2;
 End of 5.0 tests
+#
+# Test for bug #58650 "Failing assertion: primary_key_no == -1 ||
+#                      primary_key_no == 0".
+#
+drop table if exists t1;
+# The minimal test case.
+create table t1 (a int not null, b linestring not null, unique key b (b(12)), unique key a (a));
+drop table t1;
+# The original test case.
+create table t1 (a int not null, b linestring not null, unique key b (b(12)));
+create unique index a on t1(a);
+drop table t1;
 create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
 ERROR HY000: The used table type doesn't support SPATIAL indexes

=== modified file 'mysql-test/suite/innodb_plugin/r/innodb_gis.result'
--- a/mysql-test/suite/innodb_plugin/r/innodb_gis.result	2010-06-03 09:48:59 +0000
+++ b/mysql-test/suite/innodb_plugin/r/innodb_gis.result	2011-02-02 13:17:48 +0000
@@ -585,5 +585,17 @@ COUNT(*)
 2
 DROP TABLE t1, t2;
 End of 5.0 tests
+#
+# Test for bug #58650 "Failing assertion: primary_key_no == -1 ||
+#                      primary_key_no == 0".
+#
+drop table if exists t1;
+# The minimal test case.
+create table t1 (a int not null, b linestring not null, unique key b (b(12)), unique key a (a));
+drop table t1;
+# The original test case.
+create table t1 (a int not null, b linestring not null, unique key b (b(12)));
+create unique index a on t1(a);
+drop table t1;
 create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
 ERROR HY000: The used table type doesn't support SPATIAL indexes

=== modified file 'sql/field.cc'
--- a/sql/field.cc	2010-12-28 23:47:05 +0000
+++ b/sql/field.cc	2011-02-02 13:17:48 +0000
@@ -9476,6 +9476,7 @@ void Create_field::create_length_to_inte
   case MYSQL_TYPE_MEDIUM_BLOB:
   case MYSQL_TYPE_LONG_BLOB:
   case MYSQL_TYPE_BLOB:
+  case MYSQL_TYPE_GEOMETRY:
   case MYSQL_TYPE_VAR_STRING:
   case MYSQL_TYPE_STRING:
   case MYSQL_TYPE_VARCHAR:


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.lenev@stripped
# target_branch: file:///home/dlenev/src/bzr/mysql-5.1-58650/
# testament_sha1: d832fd7d693f63e1ebd9b391ee94324b3a281bc2
# timestamp: 2011-02-02 16:18:01 +0300
# base_revision_id: ole.john.aske@stripped\
#   8ngficfn0a1358hw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWnlvJAABlZ/gEAQEABY5///
f6b8IL////RgDXL3w+jru73vKtaMutCu57Fz1rRXV68j3vc97PdtV6zlTXsdeEkhAk9NMij8jQR6
U00/TRQ9RoAZNAzKCShNKeNDQmmjKZoaiGmQBoGgADQ5gTE0GEyZMmRhME00yMTAEMAkJIKngU9I
9Rp6mmyJkNADQ0aAAaBFIhoIEwmJqZk1MmmpmymiZGmhoAaCSICNCYgTSfqaJ6jJkk8UeoDQ0AGj
13uqMWBhca79wSjDJvz7e77T+xxzxkgq13rBUi7qXPuld+OY6aBSnGA2nfrcH8ov2+h6S/UloEQk
AsUzgIYcim+/Y+i7u2R1tuYpmIWTNTXH1Bplip72bXSEGBVhdvE2DQTrA/QOIF0+CH8+CfVL0gIY
CIZoiI/2S98qQVfOkufun4kOW0puyUDvZ7MUYkxt/3iCMenjo2p12btsCaAcrvzC6ENnh9YRjc3a
uJGLmGVRFb6gXgPfWFYXvfAGZF3+4Vi7+9gT3FfNsIvhXGFJtKFdAxUSDT8pivg4SDOxwl87r5EX
euDX3wHUG3DiwwuDjAwtbSXIpoM48XhhML4ftnCg9pUzAl/yEVMLsUWiXGAFgJuANQepnUPnIM2a
RZDWve71F6oqoqgnNDXSTWz6GOkMRpVvAkDBcmBstQgAwHORUMQMhFStbnjmsnfwmeNjprjCoFRI
+eq1/Q6OaDSPuEYbS192TVVHS89mb13PhO+5F3mZ5SQewE+whwF804wmZNDBDAlufVd0AVg4ggSh
4eepDWHcGKqYbICwNG0DknCwoDIA8qIwnU99ZxLuiirgqgtKEcIjNa0yZOgrc52gQVyDRDolT4LH
nPXplnVWMsQ559nTi9g0KwGqrU6QIbe0qitUUTDqWiClDKYlt5kUlEvRScEUze9vKA8O+kggR7ai
LxdUDEDshCccXW1QwkJpsZD0sVDayEJQwsOM8ZoExapNQXmkKmja8oKNlC2zCANogxJRUQiTLl4g
0b4qsUVrJJyShqrZERiWMsvr6Wf2sN+ddIEMhL4Jhj8srieuBzMOQjiywggMlBcfk67zwxIxvYSO
kp6i9ALOdgdU6R0dRAfBxgRSUoYrrHJkHJVOXZZfwfsnKFwIqmGlBKO3uoe/fFbX7Fz5+ALgiJuI
hnhPgoBQPOr18NtAcgsYYnUdkyZthDCgIXuNgXNdZMWjIZgOL18trTpvNqEFWJxIpvDEhIyzLhjn
ndh3MgpiH0W4cxWAvzbSpIJ9y55wzL+UqKrAprWAlfA+8tZkw6wOHc5vksUUwIbgwIQmyuOHnCJp
TItEbYtLtS1rRRzXgp1VvjUxKuI3aNGljNeDNhkylTj1BJM3BWW0HJGQpA2jeY9KvUO/JbQ3rW82
c9Qi6phNR05wpVeEtqc7LjcYr8OZA2qrWN7LbdgfcQ/gFpqWmStOYiKllo6pTzvfxtWu5damKyVx
BliWYsWlHaFSDdHB9TO401dTLyu3IqHJIzop7qYOXWKFqhtfMFGMEop5HMiTSG5F649admrtU5PF
oxw5W7tTtrQKGvrxuG42cSxbxXOrHPXkaGJEwNDAekM0Ty93tGe50tSaxNlou/rcnXf7ZVbjbMjl
oJTTRlyLG9hoL5RxYuIha85WgkTGC4lvrvhjkFDW8HXoJesV3L8LsS7IuzYGoNCDhlDvCHtwcKyk
NvCuk6faNkwGF9D28B1nHLP/NEPjO1ZBkii6RRwvsa9FKNSlzVU6jCmJ47ikU0kqIeTOJ5TjdZBe
8WA8gdHMfNE37GyCAzpnmkCURNvuTjb6yRbklhu0BkO5Mo2GSY74YwwTvvH4fH++1ZhEnPEvFovJ
eT6Ozl4rm+KLE4FmBpo8kfPKj2CGR0tqQwNZ7gRzosB0UHqqAjGsL/lBF8ZpD6AMTAv5hzOTQGgc
voyeR86guPV7yWRB05qWn0fiCYe4sGYHASj7Xkfq4BIPnKeysjjeVplqaYSSQ6mV7len3aMVQtYf
mUmzRJE4SCLkb/F03Vl0JGLzKZL+cTSCIqdFwsmY2Lp3ZQO+wHOIDOfb7OHAkHgfichszE0DmTD+
Xxcu6qhQgYJFhga4yMjRUid0GbmEMP6aglwJk10Xug9tIJGAxSkt8c2JqtCXQtGkZZC9FkDBipYh
bTkrggzlrzxmZGq+CmON2dONRsLC0rFiLAi5TIBgJGuUM0tMFXnrjyo5VOTGybg5CA42QVdi1bJ0
X98jE3maL0muVWvuSlEJIDmWBkjuBw/odRvEnmxjH8Q3X5hDGsOWjxwqRTOEoyfA6BMjb8eILiLL
fnz7d2Xv8PXzljhFu5kRmFeMQmu8L2BMMzDD0CAwXsiQBIC4k4S4S6te1gHcSTTMsb6evh5F8Qjl
06+eNv5jYHycPijej6LTLVkNwcF4iYBo06g1K6USIhrLmjILkJ6IQqZfvchcGJBRbKtusJa8m4Wi
OXmA/dhtS/m2P+XieKApgbA9DOzVzsFjRITHpwhNW9xE11rnl16Tc0kV8NNedPdHd4yEuX1ho8HF
MF9wYT6APoIKkUtawCoDHlDElqmgRbeLiCNwPEN259ZInxZ899CpWknUI08M4ri+qoVtinV+ZX7w
gtpL9kYPRCVJKHUGmMr1mUXzsBpG0gu57GVtzsZG8RtiG0Jvc+9paFMiMzcV+oJvGvWoBrqlNQdy
8Fo4RLctQ2amRoYDbZse5Mp2Baq6qmbzcng1PcBEEHftk5fIc87Ig3OMaZHsw5Pq9Cl+EJ2cnDa+
I1dHXphX1jrnQQvmFQyoGgXo4URO0S5hwDubUS4/DEueHwTzTN6ajPwAkEvlAmi/KQRTUA5zXZ2E
14Y1+ApTW5tUQLfF430VB5DCGFrkkHQvOKOII2pyA7asFlOrNsc2sCuwAibtyGNGj8xKC24CXv2L
ivDf15zsc5Ic5qF5pY66zszikPaCSAhNTAFt2znM8Ret4YKbACtlsGcHUEN4E8tW5g/ulLKiNumd
IgIHRAFnsIhiQ7gRzKikkzWDNglDW2JgWEV1QAGdEHE5PhSpBBFRcTkFjFq9SkOzhhhUpsxHVCJT
od9TVnMa6jWSRMTeuSkDYHaarRtsWM3AXsnaH1OoXh7227D35MY5s2lpUn/ZPA8u5zpRmRZnGzs4
QIsw4ey3PHNbs16dcqAFqhTch0ZmDQ0JpO4YFwAyNtAqMVahiHSAoYKH2Zo94J7ADAU3bLfYGFoE
LEAzIJgFoLH217HAWIIc+DDNIlyko+hkNBC9GeMMB+5uF62zHSQpjzLLjPM4MQGIlEIFVJt42cSZ
Co3iCMwHIAymi8PltNYCB76j/HKXR3Bmt834Oe4HXlANrxcj3uGuaQsBCcX2axLEKToaGrXdo9Er
50uAM3IHCoj6ZN71nt2qt1gF7Ae3NHUobd8BsQgIDpgif3fLX8GjpfCndeCx8ZQtxTv0khfuBj0a
iHkhazPsCZlt1gL4rbQ35BchFgN0sAdPJUxhI0qV9Z+tvwBT1sr8EeuPeUWVQaE/InopiloRpJwE
aF5czxln4pThWJKtHNtpVjrf61umR2C+Dl+LhIK5JeFafHSJtYXQ332QpfNdJm1UJ1WkT5MHcjwm
XgfSKKK2dLezUrMxfKuR5ZJJJIZuyKMMNQmJaIAdRkvrMBwIoa9WaxlEQa1rx8V+lWDGrPXv8oQB
dRhXAOAdKTY6XRqwKhUMwF6el1pomdolBTdBOwEvK5L04RVJivSXWg7AsZCRwRRlg6e9DSQQiOb5
QsF3EdEWEfoW/4cVelroBQsr3AOZgWMQwAaDXFLEnaPkW5WwOtSScMeF6bDioQTh9VuYHuqlR4OR
OhA76lCyMyB6Yluo1s9rSrs18HhJW1v6vbiyOfG8ai4DSycrjeTwcwvRt0Mm7eZ3QeTIPkZZOre2
T72PS1NgcdDTq4qxv3o5lN5UkYdvYVUgltgVssU+CxKYxBxwCSAZ4nvbi2tiBOImDwk1u50C7bWq
L3OLGnCWE/G7LyEWiP+LuSKcKEg08t5IAA==


--===============0602995359==--