From: Jorgen Loland
Date: January 11 2011 8:26am
Subject: bzr commit into mysql-next-mr-bugfixing branch (jorgen.loland:3248)
List-Archive: http://lists.mysql.com/commits/128391
Message-Id: <20110111082646.F2CED207@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0803814058423142355=="

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

#At file:///export/home/jl208045/mysql/wl4800/mysql-next-mr-opt-backporting-wl4800/ based on revid:jorgen.loland@stripped

 3248 Jorgen Loland	2011-01-11
      WL4800 - review comment
      
      enum variable does not need a typename

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-01-10 14:55:06 +0000
+++ b/sql/sql_select.cc	2011-01-11 08:26:43 +0000
@@ -817,8 +817,7 @@ bool resolve_subquery(THD *thd, JOIN *jo
 {
   DBUG_ENTER("resolve_subquery");
 
-  enum subquery_type {SQ_NONE, SQ_SEMIJOIN, SQ_MATERIALIZATION};
-  subquery_type sq_choice= SQ_NONE;
+  enum {SQ_NONE, SQ_SEMIJOIN, SQ_MATERIALIZATION} sq_choice= SQ_NONE;
   bool types_problem= false; // if types prevented subq materialization
   SELECT_LEX *select_lex= join->select_lex;
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@stripped\
#   od2k4jhic0r0xwpo
# target_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\
#   mr-opt-backporting-wl4800/
# testament_sha1: e9567fbfb9981e89c83d95c7b760e43363026321
# timestamp: 2011-01-11 09:26:46 +0100
# source_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\
#   mr-opt-backporting-wl4800/
# base_revision_id: jorgen.loland@stripped\
#   6ib4dh41t6vdz85m
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfNpuGgAAX3fgAAQUGf//3I3
vJC////6UAOV7rtmuFI5rtwlEQT0JkU/TJkTNKPaTU9R4Cm0yg81TTIJQoJlPyaNTTFHqAA0D1AA
AACSgCmJpqPTSaaNGmIaNAAAABzTEwEaYEYRgAAACYRgJKEanoNU/KMU2mgyp5QAAAHpGgQwLvE5
l9r7IpbDB6Bc10l8rYLRTnyZRV8u5K5Z1pZWGLxgqzq27nkXr7PzX/HhuhT4U69yeymmizLSjFQx
WcdrXEgjuzDDQ4tKOvQWO/f+Drg+pZpFiRNlTsL4PXaxc2P0lqbEgREMSWQ3GlxqawJNFYXog5Ml
eTmPxiwFEVvJ5qEelgNPa0WRuzpEqBME6h7oZduirJgu+KY3ZX2ycBEfNTDOxUYBGtzhBWLnMNII
z6mBirYELbhbbr4q1XGbYuskcU8OSggNw2xKSDcBYyGgVixoJsCQy6j47qClcA7zvvFG9FFlswrs
Dbc8yKmtvDzF0Q3EXGwrFfjVCY8gQvJzmhhTqzzxCjfCJoTdoY1x+2mrCtUq0RIEcz0jU5LRGmoQ
/Qqrtpjt2OmjQcrKW2rHURMueVpCVd1ivsi62tj2IqYnmIsCvF4IIV17ijyyxM86UZXz2PIh69ro
SRRS/uG9/Hi93btj1Xd6f7LA4aLdMPShBBD8KOI4fYOdeXEhx360eI2hbuPLTv3v+nTb0RCaZgP4
CZuAE4OQ9/NOT5zJ4wnOXYjo6PDWnGlub7hIkYnDGVlZIeifiH1fyt1SsUEhRDSX1IqDDsnn9BWP
V9Ka5MSJyPnJgZm8nCzMOIkswV55R469dFhDbBNUtrL94NUY1HnSsxxSqp2tHp4MCuuYZkmBKpNZ
jRUzZK6scTpskZEgzDCj1Bbnw4mfN8qzmYtJfvDB82lY2JojYCsnltDgN2hX/RO/JJYqNpoHgFvd
r08aZDPWMLk4wuDsd/Mb6MAqDNg3pkJ4dTuGNq3HMVfIvCjM9ZwDjIJOChbwWJ0hUkMHrgu160il
pQkb651IZs3Ujd6RplEnmbOuTEhizNkPBiQ58XjHap1ExRYi4aqsaK6BTddo87UjEhRBsvDvdELQ
7bEQmSUeT604fklNSqjTg/ZQaBNkme86dVQo5Y6xbqkks8EWUZ2kAT46HKrThffjFDMpDA6dHmKt
sgs6bjzTpWynGRhw5DNGuyT+imQTyymdbIGndDHpviuCIGKlDlMtGh8h1sIZAYk+oUHC8imcTg5C
ktDDTWGFxCJIn9v+LuSKcKEh5tNw0A==


--===============0803814058423142355==--