From: Oystein Grovlen Date: September 14 2010 9:26am Subject: bzr commit into mysql-next-mr-bugfixing branch (oystein.grovlen:3242) Bug#48213 List-Archive: http://lists.mysql.com/commits/118157 X-Bug: 48213 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1579567823==" --===============1579567823== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/og136792/mysql/mysql-next-mr-opt-backporting/ based on revid:epotemkin@stripped 3242 Oystein Grovlen 2010-09-14 Bug#48213 - Materialized subselect crashes if using GEOMETRY type (Addendum #2) Removed part of comment for Item_in_subselect::setup_engine() since it is no longer true after fix for Bug#48213. @ sql/item_subselect.cc Removed comment that is invalid after Bug#48213 was fixed. modified: sql/item_subselect.cc === modified file 'sql/item_subselect.cc' --- a/sql/item_subselect.cc 2010-09-07 19:07:18 +0000 +++ b/sql/item_subselect.cc 2010-09-14 09:26:55 +0000 @@ -1836,12 +1836,6 @@ bool Item_in_subselect::fix_fields(THD * of this Item's execution. The method creates a new engine for materialized execution, and initializes the engine. - If this initialization fails - - either because it wasn't possible to create the needed temporary table - and its index, - - or because of a memory allocation error, - then we revert back to execution via the IN=>EXISTS tranformation. - The initialization of the new engine is divided in two parts - a permanent one that lives across prepared statements, and one that is repeated for each execution. --===============1579567823== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/oystein.grovlen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: oystein.grovlen@stripped\ # pxt555zo12wmv74x # target_branch: file:///home/og136792/mysql/mysql-next-mr-opt-\ # backporting/ # testament_sha1: 5fbe6f40b9dd12dfc5ba5d35de1b22a5da6a871f # timestamp: 2010-09-14 11:27:04 +0200 # base_revision_id: epotemkin@stripped\ # utqtj6oz8ont3sjc # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW3RAWwAAaZfgEAQWGP/93Ki lCC////wUAQN46NluttQABoUyp5T9MiZG0mk0xqPTT0kGTINMA0p6U9J6hsmRpGgaNAGgAAAaE0a JPVPKfpTyajahoA09TQeoAaBgAAAAAAAAAAEkgIBNNGkzRoFPUZRtGSPIynokHZRw6A63+FIfObW isyFT0WxJpBwZJRtymZjjvHJUc6WHYpo3yM0THzvzSbn/Wpff9VjUNx3KsnQMGYc7PRp35bNj9D+ 8cws9av4P3dc30rgI/UtWTVYJ0fzj3iwWW5wPdNFVCqS7ngaIOpjjEUuPJWKDlqUEJkhoJy5DJy0 xwXQriIggoXWXhGGBYjlUoiJYEs2dioR3IZQCcThtSUQLsSPMT3R1TIJeBEczCgaxdp5lO6rSUUA RSti3LlariNIsId+DgorcLFk3d+qS+BnI2+yqLoOK99CvpqK5beCox6qNVKsVrIHNa42pxhqyo07 VXuUHleD3Y7zH3pFUKVKrZcVVp/6ThaxRoFLbldWo3JgoXVVh4rwgTWhcAWmJRsnMxVEcpWsWJUe xiGt2ilu4EYxFLJKqSyZWBItocKA+F5UpDws2Sm1K4QhkCWmGQz4/xMSqQEHQAlCmtfC8qhNHU87 YSwSzXUtVCbzDmyehJKTzgbgYVb2eUEY8HBHVANE8hqnvMey4rs8lSPrVNMzeumwh+fZ692lL4ah /x96rMHXMHp5wIIi8OGdQusEt+8iidjEwUBhtE2JTivaC7KppOxaYemRjBD4X6iPis/ulxCjcybe rDLv80O2+RyK6nw36mYChI4mhqiKooIBsPIU5rbzVrxWSP2xJaPLKym0V7sOs36xLGcVsnmWhAeM Xyake0VrGTPqduF6OEoF2bcoig05eNLKLUj7M34xvQUy6Nr9nfJKSDxNKDR/Np4mtMvRdlSZUdzx unyt0uJbQHyEq2POT8wur2WiMYulUDwL2oCAROLGUBFHwTPExZ8wJ/PY1IOpdmtNxFVLDanc/HoD Sw5GlDx9KD6Kdzg6W1Qo9KduE5BA+QN40r163k8DYrk9dw0gwB/4UhawkFDl8aeZQkyglpQZrVx1 1O7JExcFPSWFY7VJTXFxOZRswWoUP2rKGqtcA4ZPAc7Q1bBBvrGt4Oh3qE87oqSYJsmC9/Nv6E/U +YU9wlQE8eq8lMurNSWYOX0HJlbcTQcjmNt6NYpcwxWWMmZM0T3sz7aKVTOieoW5lmtauFWq9asp Gm1bJ6Rw3xRbzwJnyoV/lWrI2+3MC2qongnKEOZHUPwS0n2TYtdTq2VhDsqrDwbjxauzgDppyBwb qhc36N+92jm/JvOSHJwsXzhA7mZB/KUblkY0XnZzurpaLxuqsC5b01MXK3ZCMksp+qvfC9p7ly6C tvGVoOQSsXUX2L2TNLITKKtqD3qSMclUvIVP/i7kinChINuiAtg= --===============1579567823==--